summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/poky-bleeding.conf4
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/automake-lossage.patch (renamed from meta/packages/gtk+/gtk+-2.10.9/automake-lossage.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/cellrenderer-cairo.patch (renamed from meta/packages/gtk+/gtk+-2.10.9/cellrenderer-cairo.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/disable-print.patch (renamed from meta/packages/gtk+/gtk+-2.10.9/disable-print.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/disable-tooltips.patch (renamed from meta/packages/gtk+/gtk+-2.10.9/disable-tooltips.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/entry-cairo.patch (renamed from meta/packages/gtk+/gtk+-2.10.9/entry-cairo.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/gtk+-handhelds.patch (renamed from meta/packages/gtk+/gtk+-2.10.9/gtk+-handhelds.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/gtklabel-resize-patch (renamed from meta/packages/gtk+/gtk+-2.10.9/gtklabel-resize-patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/hardcoded_libtool.patch (renamed from meta/packages/gtk+/gtk+-2.10.9/hardcoded_libtool.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/menu-deactivate.patch (renamed from meta/packages/gtk+/gtk+-2.10.9/menu-deactivate.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/migration.patch (renamed from meta/packages/gtk+/gtk+-2.10.9/migration.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/no-demos.patch (renamed from meta/packages/gtk+/gtk+-2.10.9/no-demos.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/no-xwc.patch (renamed from meta/packages/gtk+/gtk+-2.10.9/no-xwc.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/pangoxft2.10.6.diff (renamed from meta/packages/gtk+/gtk+-2.10.9/pangoxft2.10.6.diff)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/run-iconcache.patch (renamed from meta/packages/gtk+/gtk+-2.10.9/run-iconcache.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/scroll-timings.patch (renamed from meta/packages/gtk+/gtk+-2.10.9/scroll-timings.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/single-click.patch (renamed from meta/packages/gtk+/gtk+-2.10.9/single-click.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/small-gtkfilesel.patch (renamed from meta/packages/gtk+/gtk+-2.10.9/small-gtkfilesel.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/spinbutton.patch (renamed from meta/packages/gtk+/gtk+-2.10.9/spinbutton.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.10/xsettings.patch (renamed from meta/packages/gtk+/gtk+-2.10.9/xsettings.patch)0
-rw-r--r--meta/packages/gtk+/gtk+_2.10.10.bb (renamed from meta/packages/gtk+/gtk+_2.10.9.bb)0
-rw-r--r--meta/packages/pango/pango-1.16.1/no-tests.patch (renamed from meta/packages/pango/pango-1.16.0/no-tests.patch)0
-rw-r--r--meta/packages/pango/pango_1.16.1.bb (renamed from meta/packages/pango/pango_1.16.0.bb)0
23 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 1f88b548af..4396d4287d 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -2,7 +2,7 @@ PREFERRED_VERSION_glib-2.0 ?= "2.12.11"
PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
PREFERRED_VERSION_cairo ?= "1.4.0"
-PREFERRED_VERSION_pango ?= "1.16.0"
-PREFERRED_VERSION_gtk+ ?= "2.10.9"
+PREFERRED_VERSION_pango ?= "1.16.1"
+PREFERRED_VERSION_gtk+ ?= "2.10.10"
require conf/distro/poky.conf
diff --git a/meta/packages/gtk+/gtk+-2.10.9/automake-lossage.patch b/meta/packages/gtk+/gtk+-2.10.10/automake-lossage.patch
index 0d423ddbb9..0d423ddbb9 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/automake-lossage.patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/automake-lossage.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.9/cellrenderer-cairo.patch b/meta/packages/gtk+/gtk+-2.10.10/cellrenderer-cairo.patch
index 4439e69fb6..4439e69fb6 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/cellrenderer-cairo.patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/cellrenderer-cairo.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.9/disable-print.patch b/meta/packages/gtk+/gtk+-2.10.10/disable-print.patch
index 1067773f12..1067773f12 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/disable-print.patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/disable-print.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.9/disable-tooltips.patch b/meta/packages/gtk+/gtk+-2.10.10/disable-tooltips.patch
index d71d839c3c..d71d839c3c 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/disable-tooltips.patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/disable-tooltips.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.9/entry-cairo.patch b/meta/packages/gtk+/gtk+-2.10.10/entry-cairo.patch
index 3313e7f132..3313e7f132 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/entry-cairo.patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/entry-cairo.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.9/gtk+-handhelds.patch b/meta/packages/gtk+/gtk+-2.10.10/gtk+-handhelds.patch
index 1ea86ce6b2..1ea86ce6b2 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/gtk+-handhelds.patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/gtk+-handhelds.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.9/gtklabel-resize-patch b/meta/packages/gtk+/gtk+-2.10.10/gtklabel-resize-patch
index df29656343..df29656343 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/gtklabel-resize-patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/gtklabel-resize-patch
diff --git a/meta/packages/gtk+/gtk+-2.10.9/hardcoded_libtool.patch b/meta/packages/gtk+/gtk+-2.10.10/hardcoded_libtool.patch
index 6adb0cfef6..6adb0cfef6 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/hardcoded_libtool.patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/hardcoded_libtool.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.9/menu-deactivate.patch b/meta/packages/gtk+/gtk+-2.10.10/menu-deactivate.patch
index cfb8849e9f..cfb8849e9f 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/menu-deactivate.patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/menu-deactivate.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.9/migration.patch b/meta/packages/gtk+/gtk+-2.10.10/migration.patch
index 4ee786e688..4ee786e688 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/migration.patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/migration.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.9/no-demos.patch b/meta/packages/gtk+/gtk+-2.10.10/no-demos.patch
index 0fc4c48d1a..0fc4c48d1a 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/no-demos.patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/no-demos.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.9/no-xwc.patch b/meta/packages/gtk+/gtk+-2.10.10/no-xwc.patch
index affb4a303e..affb4a303e 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/no-xwc.patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/no-xwc.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.9/pangoxft2.10.6.diff b/meta/packages/gtk+/gtk+-2.10.10/pangoxft2.10.6.diff
index 63828cec63..63828cec63 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/pangoxft2.10.6.diff
+++ b/meta/packages/gtk+/gtk+-2.10.10/pangoxft2.10.6.diff
diff --git a/meta/packages/gtk+/gtk+-2.10.9/run-iconcache.patch b/meta/packages/gtk+/gtk+-2.10.10/run-iconcache.patch
index ac15e9ab24..ac15e9ab24 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/run-iconcache.patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/run-iconcache.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.9/scroll-timings.patch b/meta/packages/gtk+/gtk+-2.10.10/scroll-timings.patch
index 3f823a7880..3f823a7880 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/scroll-timings.patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/scroll-timings.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.9/single-click.patch b/meta/packages/gtk+/gtk+-2.10.10/single-click.patch
index 250f1629f5..250f1629f5 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/single-click.patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/single-click.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.9/small-gtkfilesel.patch b/meta/packages/gtk+/gtk+-2.10.10/small-gtkfilesel.patch
index 20bf4cf366..20bf4cf366 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/small-gtkfilesel.patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/small-gtkfilesel.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.9/spinbutton.patch b/meta/packages/gtk+/gtk+-2.10.10/spinbutton.patch
index c26dc6d93c..c26dc6d93c 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/spinbutton.patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/spinbutton.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.9/xsettings.patch b/meta/packages/gtk+/gtk+-2.10.10/xsettings.patch
index b63e262d34..b63e262d34 100644
--- a/meta/packages/gtk+/gtk+-2.10.9/xsettings.patch
+++ b/meta/packages/gtk+/gtk+-2.10.10/xsettings.patch
diff --git a/meta/packages/gtk+/gtk+_2.10.9.bb b/meta/packages/gtk+/gtk+_2.10.10.bb
index dc762d41cf..dc762d41cf 100644
--- a/meta/packages/gtk+/gtk+_2.10.9.bb
+++ b/meta/packages/gtk+/gtk+_2.10.10.bb
diff --git a/meta/packages/pango/pango-1.16.0/no-tests.patch b/meta/packages/pango/pango-1.16.1/no-tests.patch
index dafcb20c3b..dafcb20c3b 100644
--- a/meta/packages/pango/pango-1.16.0/no-tests.patch
+++ b/meta/packages/pango/pango-1.16.1/no-tests.patch
diff --git a/meta/packages/pango/pango_1.16.0.bb b/meta/packages/pango/pango_1.16.1.bb
index 8e3e8e7d3a..8e3e8e7d3a 100644
--- a/meta/packages/pango/pango_1.16.0.bb
+++ b/meta/packages/pango/pango_1.16.1.bb