summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/cellrenderer-cairo.patch (renamed from meta/packages/gtk+/gtk+-2.12.5/cellrenderer-cairo.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/combo-arrow-size.patch (renamed from meta/packages/gtk+/gtk+-2.12.5/combo-arrow-size.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/disable-print.patch (renamed from meta/packages/gtk+/gtk+-2.12.5/disable-print.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/entry-cairo.patch (renamed from meta/packages/gtk+/gtk+-2.12.5/entry-cairo.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/filechooser-default.patch (renamed from meta/packages/gtk+/gtk+-2.12.5/filechooser-default.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/filechooser-utils.patch (renamed from meta/packages/gtk+/gtk+-2.12.5/filechooser-utils.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/filechooser.patch (renamed from meta/packages/gtk+/gtk+-2.12.5/filechooser.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/filesystem-volumes.patch (renamed from meta/packages/gtk+/gtk+-2.12.5/filesystem-volumes.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/gtklabel-resize-patch (renamed from meta/packages/gtk+/gtk+-2.12.5/gtklabel-resize-patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/hardcoded_libtool.patch (renamed from meta/packages/gtk+/gtk+-2.12.5/hardcoded_libtool.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/menu-deactivate.patch (renamed from meta/packages/gtk+/gtk+-2.12.5/menu-deactivate.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/no-demos.patch (renamed from meta/packages/gtk+/gtk+-2.12.5/no-demos.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/pangoxft2.10.6.diff (renamed from meta/packages/gtk+/gtk+-2.12.5/pangoxft2.10.6.diff)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/range-no-redraw.patch (renamed from meta/packages/gtk+/gtk+-2.12.5/range-no-redraw.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/run-iconcache.patch (renamed from meta/packages/gtk+/gtk+-2.12.5/run-iconcache.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/scrolled-placement.patch (renamed from meta/packages/gtk+/gtk+-2.12.5/scrolled-placement.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/toggle-font.diff (renamed from meta/packages/gtk+/gtk+-2.12.5/toggle-font.diff)0
-rw-r--r--meta/packages/gtk+/gtk+-2.12.6/xsettings.patch (renamed from meta/packages/gtk+/gtk+-2.12.5/xsettings.patch)0
-rw-r--r--meta/packages/gtk+/gtk+_2.12.6.bb (renamed from meta/packages/gtk+/gtk+_2.12.5.bb)0
20 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 88ef86bee..ffd347d4a 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
index 4439e69fb..4439e69fb 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/cellrenderer-cairo.patch
+++ b/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
index d44c454ce..d44c454ce 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/combo-arrow-size.patch
+++ b/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
index 13cbd91d7..13cbd91d7 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/disable-print.patch
+++ b/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
index 3313e7f13..3313e7f13 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/entry-cairo.patch
+++ b/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
index 34a86b2bf..34a86b2bf 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/filechooser-default.patch
+++ b/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
index 45cfd4fd6..45cfd4fd6 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/filechooser-utils.patch
+++ b/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
index c422f60d4..c422f60d4 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/filechooser.patch
+++ b/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
index 826fd6bee..826fd6bee 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/filesystem-volumes.patch
+++ b/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
index df2965634..df2965634 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/gtklabel-resize-patch
+++ b/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
index 6adb0cfef..6adb0cfef 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/hardcoded_libtool.patch
+++ b/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
index cfb8849e9..cfb8849e9 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/menu-deactivate.patch
+++ b/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
index 0fc4c48d1..0fc4c48d1 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/no-demos.patch
+++ b/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
index 63828cec6..63828cec6 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/pangoxft2.10.6.diff
+++ b/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
index 14387b8a2..14387b8a2 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/range-no-redraw.patch
+++ b/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
index ac15e9ab2..ac15e9ab2 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/run-iconcache.patch
+++ b/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
index a0b50c8ca..a0b50c8ca 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/scrolled-placement.patch
+++ b/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
index 59ad150b2..59ad150b2 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/toggle-font.diff
+++ b/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
index b63e262d3..b63e262d3 100644
--- a/meta/packages/gtk+/gtk+-2.12.5/xsettings.patch
+++ b/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
index 79784dd02..79784dd02 100644
--- a/meta/packages/gtk+/gtk+_2.12.5.bb
+++ b/meta/packages/gtk+/gtk+_2.12.6.bb