diff --git a/COPKG/.buildinfo b/COPKG/.buildinfo index 1bb9906e1..ec805d9f1 100644 --- a/COPKG/.buildinfo +++ b/COPKG/.buildinfo @@ -18,7 +18,6 @@ x86 { requires: { "pixman-dev[vc10]-${pixman-dep-version}-x86-${pixman-dep-publickeytoken}", "libpng-dev[vc10]-${libpng-dep-version}-x86-${libpng-dep-publickeytoken}", - "glib-dev[vc10]-${glib-dep-version}-x86-${glib-dep-publickeytoken}", }; platform: x86; diff --git a/COPKG/cairo-dev-common.autopkg b/COPKG/cairo-dev-common.autopkg index 1a3655c2c..a1ba6ae1e 100644 --- a/COPKG/cairo-dev-common.autopkg +++ b/COPKG/cairo-dev-common.autopkg @@ -43,8 +43,7 @@ developer-library[cairo] { headers: { headers, featuresheader, - versionheader, - glibheader + versionheader }; } @@ -80,12 +79,3 @@ files[versionheader] { trim-path:all; } - -files[glibheader] { - root: @"..\util\cairo-gobject"; - include: { - "cairo-gobject.h", - }; - - trim-path:all; -} diff --git a/COPKG/cairo-dev.autopkg b/COPKG/cairo-dev.autopkg index b37abe730..331799bb5 100644 --- a/COPKG/cairo-dev.autopkg +++ b/COPKG/cairo-dev.autopkg @@ -35,7 +35,6 @@ license[LGPL21] { requires { package: "cairo[${flavor}]-${package-version}-x86-${Package.PublicKeyToken}"; package: "cairo-dev-common-${package-version}-any-${Package.PublicKeyToken}"; - package: "glib-dev[${flavor}]-${glib-dep-version}-x86-${glib-dep-publickeytoken}"; } metadata { diff --git a/COPKG/cairo.autopkg b/COPKG/cairo.autopkg index bdbe4e4ca..ccfd3e2a2 100644 --- a/COPKG/cairo.autopkg +++ b/COPKG/cairo.autopkg @@ -35,7 +35,6 @@ license[LGPL21] { requires { package: "pixman[${flavor}]-${pixman-dep-version}-x86-${pixman-dep-publickeytoken}"; package: "libpng[${flavor}]-${libpng-dep-version}-x86-${libpng-dep-publickeytoken}"; - package: "glib[${flavor}]-${glib-dep-version}-x86-${glib-dep-publickeytoken}"; } metadata { @@ -70,7 +69,6 @@ manifest[cairodeps] { assembly : { "pixman[${flavor}]", "libpng[${flavor}]", - "glib[${flavor}]", }; // The 'include' section lists files (or sets of files) which will need to diff --git a/COPKG/common.inc b/COPKG/common.inc index ab5495ea0..a2a336069 100644 --- a/COPKG/common.inc +++ b/COPKG/common.inc @@ -9,7 +9,3 @@ #define { libpng-dep-version: "1.5.4"; } #define { libpng-dep-publickeytoken: "${deps-publickeytoken}"; } - -#define { glib-dep-version: "2.32.3"; } - -#define { glib-dep-publickeytoken: "${deps-publickeytoken}"; } diff --git a/COPKG/version.inc b/COPKG/version.inc index 9505aede9..8799e3c12 100644 --- a/COPKG/version.inc +++ b/COPKG/version.inc @@ -1 +1 @@ -#define { package-version: 1.12.4.4; } +#define { package-version: 1.12.4.5; }