From 4627103ba7615711eaa0072f5f7fd7481fb66797 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 7 Feb 2008 09:59:06 +0000 Subject: [PATCH] glib: update to 2.14.6 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3693 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/poky.conf | 4 ++-- .../configure-libtool.patch | 0 .../configure-libtool.patch | 0 .../glib-gettextize-dir.patch | 0 .../{glib-2.0-native_2.14.5.bb => glib-2.0-native_2.14.6.bb} | 0 .../glib-2.0/{glib-2.0_2.14.5.bb => glib-2.0_2.14.6.bb} | 0 6 files changed, 2 insertions(+), 2 deletions(-) rename meta/packages/glib-2.0/{glib-2.0-2.14.5 => glib-2.0-2.14.6}/configure-libtool.patch (100%) rename meta/packages/glib-2.0/{glib-2.0-native-2.14.5 => glib-2.0-native-2.14.6}/configure-libtool.patch (100%) rename meta/packages/glib-2.0/{glib-2.0-native-2.14.5 => glib-2.0-native-2.14.6}/glib-gettextize-dir.patch (100%) rename meta/packages/glib-2.0/{glib-2.0-native_2.14.5.bb => glib-2.0-native_2.14.6.bb} (100%) rename meta/packages/glib-2.0/{glib-2.0_2.14.5.bb => glib-2.0_2.14.6.bb} (100%) diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index bc5c72386d..c22b7b9b1c 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -192,8 +192,8 @@ PREFERRED_VERSION_gtk-sato-engine ?= "0.1" PREFERRED_VERSION_matchbox-theme-sato ?= "0.1" PREFERRED_VERSION_sato-icon-theme ?= "0.3.1" -PREFERRED_VERSION_glib-2.0 ?= "2.14.5" -PREFERRED_VERSION_glib-2.0-native ?= "2.14.5" +PREFERRED_VERSION_glib-2.0 ?= "2.14.6" +PREFERRED_VERSION_glib-2.0-native ?= "2.14.6" PREFERRED_VERSION_atk ?= "1.20.0" PREFERRED_VERSION_cairo ?= "1.4.14" PREFERRED_VERSION_pango ?= "1.18.3" diff --git a/meta/packages/glib-2.0/glib-2.0-2.14.5/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.14.6/configure-libtool.patch similarity index 100% rename from meta/packages/glib-2.0/glib-2.0-2.14.5/configure-libtool.patch rename to meta/packages/glib-2.0/glib-2.0-2.14.6/configure-libtool.patch diff --git a/meta/packages/glib-2.0/glib-2.0-native-2.14.5/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-native-2.14.6/configure-libtool.patch similarity index 100% rename from meta/packages/glib-2.0/glib-2.0-native-2.14.5/configure-libtool.patch rename to meta/packages/glib-2.0/glib-2.0-native-2.14.6/configure-libtool.patch diff --git a/meta/packages/glib-2.0/glib-2.0-native-2.14.5/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-native-2.14.6/glib-gettextize-dir.patch similarity index 100% rename from meta/packages/glib-2.0/glib-2.0-native-2.14.5/glib-gettextize-dir.patch rename to meta/packages/glib-2.0/glib-2.0-native-2.14.6/glib-gettextize-dir.patch diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.14.5.bb b/meta/packages/glib-2.0/glib-2.0-native_2.14.6.bb similarity index 100% rename from meta/packages/glib-2.0/glib-2.0-native_2.14.5.bb rename to meta/packages/glib-2.0/glib-2.0-native_2.14.6.bb diff --git a/meta/packages/glib-2.0/glib-2.0_2.14.5.bb b/meta/packages/glib-2.0/glib-2.0_2.14.6.bb similarity index 100% rename from meta/packages/glib-2.0/glib-2.0_2.14.5.bb rename to meta/packages/glib-2.0/glib-2.0_2.14.6.bb -- 2.40.1