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