summaryrefslogtreecommitdiff
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.14.6/configure-libtool.patch (renamed from meta/packages/glib-2.0/glib-2.0-2.14.5/configure-libtool.patch)0
-rw-r--r--meta/packages/glib-2.0/glib-2.0-native-2.14.6/configure-libtool.patch (renamed from meta/packages/glib-2.0/glib-2.0-native-2.14.5/configure-libtool.patch)0
-rw-r--r--meta/packages/glib-2.0/glib-2.0-native-2.14.6/glib-gettextize-dir.patch (renamed from meta/packages/glib-2.0/glib-2.0-native-2.14.5/glib-gettextize-dir.patch)0
-rw-r--r--meta/packages/glib-2.0/glib-2.0-native_2.14.6.bb (renamed from meta/packages/glib-2.0/glib-2.0-native_2.14.5.bb)0
-rw-r--r--meta/packages/glib-2.0/glib-2.0_2.14.6.bb (renamed from meta/packages/glib-2.0/glib-2.0_2.14.5.bb)0
6 files changed, 2 insertions, 2 deletions
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
index a52327c8c9..a52327c8c9 100644
--- 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
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
index a52327c8c9..a52327c8c9 100644
--- 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
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
index efe3325578..efe3325578 100644
--- 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
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
index 194c744bc2..194c744bc2 100644
--- 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
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
index 59d393e9a1..59d393e9a1 100644
--- 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