Update glib-2.0 to 2.14.2

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2891 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index dcf30830dde11233eaf8d0622e0285895a243098..b59beeee39ca97c8e482cd42d0ca32a1c8ff146e 100644 (file)
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -163,7 +163,7 @@ PREFERRED_VERSION_gtk-sato-engine ?= "0.1"
 PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
 PREFERRED_VERSION_sato-icon-theme ?= "0.1"
 
-PREFERRED_VERSION_glib-2.0 ?= "2.14.1"
+PREFERRED_VERSION_glib-2.0 ?= "2.14.2"
 PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
 PREFERRED_VERSION_atk ?= "1.18.0"
 PREFERRED_VERSION_cairo ?= "1.4.10"

diff --git a/meta/packages/glib-2.0/glib-2.0-2.14.1/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.14.2/configure-libtool.patch
similarity index 100%
rename from meta/packages/glib-2.0/glib-2.0-2.14.1/configure-libtool.patch
rename to meta/packages/glib-2.0/glib-2.0-2.14.2/configure-libtool.patch

diff --git a/meta/packages/glib-2.0/glib-2.0_2.14.1.bb b/meta/packages/glib-2.0/glib-2.0_2.14.2.bb
similarity index 94%
rename from meta/packages/glib-2.0/glib-2.0_2.14.1.bb
rename to meta/packages/glib-2.0/glib-2.0_2.14.2.bb
index 59d393e9a1ff5240216f338cc45d3fe3a964478b..995efbd1190aea936733af1d23dc9d36d301a884 100644 (file)
--- a/meta/packages/glib-2.0/glib-2.0_2.14.1.bb
+++ b/meta/packages/glib-2.0/glib-2.0_2.14.2.bb
@@ -1,7 +1,5 @@
 require glib.inc
 
-PR = "r1"
-
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1"