diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 88ef86bee1..ffd347d4a1 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -196,7 +196,7 @@ PREFERRED_VERSION_glib-2.0-native ?= "2.14.5" PREFERRED_VERSION_atk ?= "1.20.0" PREFERRED_VERSION_cairo ?= "1.4.14" PREFERRED_VERSION_pango ?= "1.18.3" -PREFERRED_VERSION_gtk+ ?= "2.12.5" +PREFERRED_VERSION_gtk+ ?= "2.12.6" PREFERRED_VERSION_dbus ?= "1.0.2" PREFERRED_VERSION_dbus-native ?= "1.0.2" diff --git a/meta/packages/gtk+/gtk+-2.12.5/cellrenderer-cairo.patch b/meta/packages/gtk+/gtk+-2.12.6/cellrenderer-cairo.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/cellrenderer-cairo.patch rename to meta/packages/gtk+/gtk+-2.12.6/cellrenderer-cairo.patch diff --git a/meta/packages/gtk+/gtk+-2.12.5/combo-arrow-size.patch b/meta/packages/gtk+/gtk+-2.12.6/combo-arrow-size.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/combo-arrow-size.patch rename to meta/packages/gtk+/gtk+-2.12.6/combo-arrow-size.patch diff --git a/meta/packages/gtk+/gtk+-2.12.5/disable-print.patch b/meta/packages/gtk+/gtk+-2.12.6/disable-print.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/disable-print.patch rename to meta/packages/gtk+/gtk+-2.12.6/disable-print.patch diff --git a/meta/packages/gtk+/gtk+-2.12.5/entry-cairo.patch b/meta/packages/gtk+/gtk+-2.12.6/entry-cairo.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/entry-cairo.patch rename to meta/packages/gtk+/gtk+-2.12.6/entry-cairo.patch diff --git a/meta/packages/gtk+/gtk+-2.12.5/filechooser-default.patch b/meta/packages/gtk+/gtk+-2.12.6/filechooser-default.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/filechooser-default.patch rename to meta/packages/gtk+/gtk+-2.12.6/filechooser-default.patch diff --git a/meta/packages/gtk+/gtk+-2.12.5/filechooser-utils.patch b/meta/packages/gtk+/gtk+-2.12.6/filechooser-utils.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/filechooser-utils.patch rename to meta/packages/gtk+/gtk+-2.12.6/filechooser-utils.patch diff --git a/meta/packages/gtk+/gtk+-2.12.5/filechooser.patch b/meta/packages/gtk+/gtk+-2.12.6/filechooser.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/filechooser.patch rename to meta/packages/gtk+/gtk+-2.12.6/filechooser.patch diff --git a/meta/packages/gtk+/gtk+-2.12.5/filesystem-volumes.patch b/meta/packages/gtk+/gtk+-2.12.6/filesystem-volumes.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/filesystem-volumes.patch rename to meta/packages/gtk+/gtk+-2.12.6/filesystem-volumes.patch diff --git a/meta/packages/gtk+/gtk+-2.12.5/gtklabel-resize-patch b/meta/packages/gtk+/gtk+-2.12.6/gtklabel-resize-patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/gtklabel-resize-patch rename to meta/packages/gtk+/gtk+-2.12.6/gtklabel-resize-patch diff --git a/meta/packages/gtk+/gtk+-2.12.5/hardcoded_libtool.patch b/meta/packages/gtk+/gtk+-2.12.6/hardcoded_libtool.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/hardcoded_libtool.patch rename to meta/packages/gtk+/gtk+-2.12.6/hardcoded_libtool.patch diff --git a/meta/packages/gtk+/gtk+-2.12.5/menu-deactivate.patch b/meta/packages/gtk+/gtk+-2.12.6/menu-deactivate.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/menu-deactivate.patch rename to meta/packages/gtk+/gtk+-2.12.6/menu-deactivate.patch diff --git a/meta/packages/gtk+/gtk+-2.12.5/no-demos.patch b/meta/packages/gtk+/gtk+-2.12.6/no-demos.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/no-demos.patch rename to meta/packages/gtk+/gtk+-2.12.6/no-demos.patch diff --git a/meta/packages/gtk+/gtk+-2.12.5/pangoxft2.10.6.diff b/meta/packages/gtk+/gtk+-2.12.6/pangoxft2.10.6.diff similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/pangoxft2.10.6.diff rename to meta/packages/gtk+/gtk+-2.12.6/pangoxft2.10.6.diff diff --git a/meta/packages/gtk+/gtk+-2.12.5/range-no-redraw.patch b/meta/packages/gtk+/gtk+-2.12.6/range-no-redraw.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/range-no-redraw.patch rename to meta/packages/gtk+/gtk+-2.12.6/range-no-redraw.patch diff --git a/meta/packages/gtk+/gtk+-2.12.5/run-iconcache.patch b/meta/packages/gtk+/gtk+-2.12.6/run-iconcache.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/run-iconcache.patch rename to meta/packages/gtk+/gtk+-2.12.6/run-iconcache.patch diff --git a/meta/packages/gtk+/gtk+-2.12.5/scrolled-placement.patch b/meta/packages/gtk+/gtk+-2.12.6/scrolled-placement.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/scrolled-placement.patch rename to meta/packages/gtk+/gtk+-2.12.6/scrolled-placement.patch diff --git a/meta/packages/gtk+/gtk+-2.12.5/toggle-font.diff b/meta/packages/gtk+/gtk+-2.12.6/toggle-font.diff similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/toggle-font.diff rename to meta/packages/gtk+/gtk+-2.12.6/toggle-font.diff diff --git a/meta/packages/gtk+/gtk+-2.12.5/xsettings.patch b/meta/packages/gtk+/gtk+-2.12.6/xsettings.patch similarity index 100% rename from meta/packages/gtk+/gtk+-2.12.5/xsettings.patch rename to meta/packages/gtk+/gtk+-2.12.6/xsettings.patch diff --git a/meta/packages/gtk+/gtk+_2.12.5.bb b/meta/packages/gtk+/gtk+_2.12.6.bb similarity index 100% rename from meta/packages/gtk+/gtk+_2.12.5.bb rename to meta/packages/gtk+/gtk+_2.12.6.bb