summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-11-08 10:54:40 +0000
committerRoss Burton <ross@openedhand.com>2007-11-08 10:54:40 +0000
commit431fae127e30ccc2e06baeeb9a96f39e0d4ac237 (patch)
tree612254c0b989cd9cc6349171d8d0ac5dd900a6d3 /meta
parent55751d25652b540c2aa522db1fceed8b96d9a458 (diff)
downloadpoky-431fae127e30ccc2e06baeeb9a96f39e0d4ac237.tar.gz
glib-2.0: upgrade to 2.14.3
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3106 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/packages/glib-2.0/glib-2.0-2.14.3/configure-libtool.patch (renamed from meta/packages/glib-2.0/glib-2.0-2.14.2/configure-libtool.patch)0
-rw-r--r--meta/packages/glib-2.0/glib-2.0_2.14.3.bb (renamed from meta/packages/glib-2.0/glib-2.0_2.14.2.bb)0
3 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index ffb84883d0..f6946bf4af 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -170,7 +170,7 @@ PREFERRED_VERSION_gtk-sato-engine ?= "0.1"
170PREFERRED_VERSION_matchbox-theme-sato ?= "0.1" 170PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
171PREFERRED_VERSION_sato-icon-theme ?= "0.1" 171PREFERRED_VERSION_sato-icon-theme ?= "0.1"
172 172
173PREFERRED_VERSION_glib-2.0 ?= "2.14.2" 173PREFERRED_VERSION_glib-2.0 ?= "2.14.3"
174PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" 174PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
175PREFERRED_VERSION_atk ?= "1.18.0" 175PREFERRED_VERSION_atk ?= "1.18.0"
176PREFERRED_VERSION_cairo ?= "1.4.10" 176PREFERRED_VERSION_cairo ?= "1.4.10"
diff --git a/meta/packages/glib-2.0/glib-2.0-2.14.2/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.14.3/configure-libtool.patch
index a52327c8c9..a52327c8c9 100644
--- a/meta/packages/glib-2.0/glib-2.0-2.14.2/configure-libtool.patch
+++ b/meta/packages/glib-2.0/glib-2.0-2.14.3/configure-libtool.patch
diff --git a/meta/packages/glib-2.0/glib-2.0_2.14.2.bb b/meta/packages/glib-2.0/glib-2.0_2.14.3.bb
index 995efbd119..995efbd119 100644
--- a/meta/packages/glib-2.0/glib-2.0_2.14.2.bb
+++ b/meta/packages/glib-2.0/glib-2.0_2.14.3.bb