summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-03-09 07:36:51 +0000
committerRoss Burton <ross@openedhand.com>2007-03-09 07:36:51 +0000
commit1bb2b83636abe0422be50d63cabcc5d5b6296866 (patch)
treeae90e011d6c6ac6abef05d9c25301ca49d0b8b64
parentf39c891bb648b6be7de8bc8b0c4345a073742656 (diff)
downloadopenembedded-core-1bb2b83636abe0422be50d63cabcc5d5b6296866.tar.gz
openembedded-core-1bb2b83636abe0422be50d63cabcc5d5b6296866.tar.bz2
openembedded-core-1bb2b83636abe0422be50d63cabcc5d5b6296866.tar.xz
openembedded-core-1bb2b83636abe0422be50d63cabcc5d5b6296866.zip
Upgrade to new GLib
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1335 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/distro/poky-bleeding.conf2
-rw-r--r--meta/packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch (renamed from meta/packages/glib-2.0/glib-2.0-2.12.10/configure-libtool.patch)0
-rw-r--r--meta/packages/glib-2.0/glib-2.0_2.12.11.bb (renamed from meta/packages/glib-2.0/glib-2.0_2.12.10.bb)0
3 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 93c5b54ef..1f88b548a 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,4 +1,4 @@
-PREFERRED_VERSION_glib-2.0 ?= "2.12.10"
+PREFERRED_VERSION_glib-2.0 ?= "2.12.11"
PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
PREFERRED_VERSION_cairo ?= "1.4.0"
diff --git a/meta/packages/glib-2.0/glib-2.0-2.12.10/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch
index bfec12eec..bfec12eec 100644
--- a/meta/packages/glib-2.0/glib-2.0-2.12.10/configure-libtool.patch
+++ b/meta/packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch
diff --git a/meta/packages/glib-2.0/glib-2.0_2.12.10.bb b/meta/packages/glib-2.0/glib-2.0_2.12.11.bb
index 4d8e59b35..4d8e59b35 100644
--- a/meta/packages/glib-2.0/glib-2.0_2.12.10.bb
+++ b/meta/packages/glib-2.0/glib-2.0_2.12.11.bb