summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-01-08 16:02:24 +0000
committerRoss Burton <ross@openedhand.com>2008-01-08 16:02:24 +0000
commitb10aaea287bb87c2116f7a891f50b1b25ce5fa66 (patch)
treefffa16ec7f813f74044a3d201381c27e56f73381 /meta
parent666535e42f2bd98c73c6e2dd478a0b126a7a5335 (diff)
downloadpoky-b10aaea287bb87c2116f7a891f50b1b25ce5fa66.tar.gz
glib: upgrade from 2.14.4 to 2.14.5
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3432 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.5/configure-libtool.patch (renamed from meta/packages/glib-2.0/glib-2.0-2.14.4/configure-libtool.patch)0
-rw-r--r--meta/packages/glib-2.0/glib-2.0_2.14.5.bb (renamed from meta/packages/glib-2.0/glib-2.0_2.14.4.bb)0
3 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 517dc72a8d..0454281924 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -191,7 +191,7 @@ PREFERRED_VERSION_gtk-sato-engine ?= "0.1"
191PREFERRED_VERSION_matchbox-theme-sato ?= "0.1" 191PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
192PREFERRED_VERSION_sato-icon-theme ?= "0.1" 192PREFERRED_VERSION_sato-icon-theme ?= "0.1"
193 193
194PREFERRED_VERSION_glib-2.0 ?= "2.14.4" 194PREFERRED_VERSION_glib-2.0 ?= "2.14.5"
195PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" 195PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
196PREFERRED_VERSION_atk ?= "1.20.0" 196PREFERRED_VERSION_atk ?= "1.20.0"
197PREFERRED_VERSION_cairo ?= "1.4.10" 197PREFERRED_VERSION_cairo ?= "1.4.10"
diff --git a/meta/packages/glib-2.0/glib-2.0-2.14.4/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.14.5/configure-libtool.patch
index a52327c8c9..a52327c8c9 100644
--- a/meta/packages/glib-2.0/glib-2.0-2.14.4/configure-libtool.patch
+++ b/meta/packages/glib-2.0/glib-2.0-2.14.5/configure-libtool.patch
diff --git a/meta/packages/glib-2.0/glib-2.0_2.14.4.bb b/meta/packages/glib-2.0/glib-2.0_2.14.5.bb
index 59d393e9a1..59d393e9a1 100644
--- a/meta/packages/glib-2.0/glib-2.0_2.14.4.bb
+++ b/meta/packages/glib-2.0/glib-2.0_2.14.5.bb