glib: upgrade from 2.14.6 to 2.16.1

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

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index dca40432a90775e7a797e93ed573fecdcb1b6780..29fdf6e23d10edc37dabc1f03ee1d02ff3b1ea0f 100644 (file)
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -200,8 +200,8 @@ PREFERRED_VERSION_gtk-sato-engine ?= "0.3.1"
 PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
 PREFERRED_VERSION_sato-icon-theme ?= "0.4.1"
 
-PREFERRED_VERSION_glib-2.0 ?= "2.14.6"
-PREFERRED_VERSION_glib-2.0-native ?= "2.14.6"
+PREFERRED_VERSION_glib-2.0 ?= "2.16.1"
+PREFERRED_VERSION_glib-2.0-native ?= "2.16.1"
 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.6/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.16.1/configure-libtool.patch
similarity index 100%
rename from meta/packages/glib-2.0/glib-2.0-2.14.6/configure-libtool.patch
rename to meta/packages/glib-2.0/glib-2.0-2.16.1/configure-libtool.patch

diff --git a/meta/packages/glib-2.0/glib-2.0-2.14.6/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-2.16.1/glib-gettextize-dir.patch
similarity index 100%
rename from meta/packages/glib-2.0/glib-2.0-2.14.6/glib-gettextize-dir.patch
rename to meta/packages/glib-2.0/glib-2.0-2.16.1/glib-gettextize-dir.patch

diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.14.6.bb b/meta/packages/glib-2.0/glib-2.0-native_2.16.1.bb
similarity index 96%
rename from meta/packages/glib-2.0/glib-2.0-native_2.14.6.bb
rename to meta/packages/glib-2.0/glib-2.0-native_2.16.1.bb
index 0921cb847333134ac6115cbf0d31ce64c2664dfb..b26480dd011805b5e6d97ef02aee8a365de76dd3 100644 (file)
--- a/meta/packages/glib-2.0/glib-2.0-native_2.14.6.bb
+++ b/meta/packages/glib-2.0/glib-2.0-native_2.16.1.bb
@@ -9,7 +9,7 @@ PRIORITY = "optional"
 DEPENDS += "gtk-doc-native"
 PR="r2"
 
-SRC_URI = "http://download.gnome.org/sources/glib/2.14/glib-${PV}.tar.bz2 \
+SRC_URI = "http://download.gnome.org/sources/glib/2.16/glib-${PV}.tar.bz2 \
            file://glib-gettextize-dir.patch;patch=1 \
            file://configure-libtool.patch;patch=1 \
            file://glibconfig-sysdefs.h"

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