summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/poky.conf4
-rw-r--r--meta/packages/glib-2.0/glib-2.0-2.16.1/configure-libtool.patch (renamed from meta/packages/glib-2.0/glib-2.0-2.14.6/configure-libtool.patch)0
-rw-r--r--meta/packages/glib-2.0/glib-2.0-2.16.1/glib-gettextize-dir.patch (renamed from meta/packages/glib-2.0/glib-2.0-2.14.6/glib-gettextize-dir.patch)0
-rw-r--r--meta/packages/glib-2.0/glib-2.0-native_2.16.1.bb (renamed from meta/packages/glib-2.0/glib-2.0-native_2.14.6.bb)2
-rw-r--r--meta/packages/glib-2.0/glib-2.0_2.16.1.bb (renamed from meta/packages/glib-2.0/glib-2.0_2.14.6.bb)2
5 files changed, 4 insertions, 4 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index dca40432a9..29fdf6e23d 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -200,8 +200,8 @@ PREFERRED_VERSION_gtk-sato-engine ?= "0.3.1"
200PREFERRED_VERSION_matchbox-theme-sato ?= "0.1" 200PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
201PREFERRED_VERSION_sato-icon-theme ?= "0.4.1" 201PREFERRED_VERSION_sato-icon-theme ?= "0.4.1"
202 202
203PREFERRED_VERSION_glib-2.0 ?= "2.14.6" 203PREFERRED_VERSION_glib-2.0 ?= "2.16.1"
204PREFERRED_VERSION_glib-2.0-native ?= "2.14.6" 204PREFERRED_VERSION_glib-2.0-native ?= "2.16.1"
205PREFERRED_VERSION_atk ?= "1.20.0" 205PREFERRED_VERSION_atk ?= "1.20.0"
206PREFERRED_VERSION_cairo ?= "1.4.14" 206PREFERRED_VERSION_cairo ?= "1.4.14"
207PREFERRED_VERSION_pango ?= "1.18.3" 207PREFERRED_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
index a52327c8c9..a52327c8c9 100644
--- 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
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
index efe3325578..efe3325578 100644
--- 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
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
index 0921cb8473..b26480dd01 100644
--- 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"
9DEPENDS += "gtk-doc-native" 9DEPENDS += "gtk-doc-native"
10PR="r2" 10PR="r2"
11 11
12SRC_URI = "http://download.gnome.org/sources/glib/2.14/glib-${PV}.tar.bz2 \ 12SRC_URI = "http://download.gnome.org/sources/glib/2.16/glib-${PV}.tar.bz2 \
13 file://glib-gettextize-dir.patch;patch=1 \ 13 file://glib-gettextize-dir.patch;patch=1 \
14 file://configure-libtool.patch;patch=1 \ 14 file://configure-libtool.patch;patch=1 \
15 file://glibconfig-sysdefs.h" 15 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
index 59d393e9a1..7ac48e14ff 100644
--- 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
2 2
3PR = "r1" 3PR = "r1"
4 4
5SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \ 5SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
6 file://glibconfig-sysdefs.h \ 6 file://glibconfig-sysdefs.h \
7 file://configure-libtool.patch;patch=1" 7 file://configure-libtool.patch;patch=1"