summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/poky-bleeding.conf1
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/packages/pango/pango-1.18.1/no-tests.patch (renamed from meta/packages/pango/pango-1.17.5/no-tests.patch)0
-rw-r--r--meta/packages/pango/pango_1.18.1.bb (renamed from meta/packages/pango/pango_1.17.5.bb)0
4 files changed, 1 insertions, 2 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 0b59df5823..921545f288 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,4 +1,3 @@
1PREFERRED_VERSION_pango ?= "1.17.5"
2PREFERRED_VERSION_gtk+ ?= "2.11.6" 1PREFERRED_VERSION_gtk+ ?= "2.11.6"
3 2
4require conf/distro/poky.conf 3require conf/distro/poky.conf
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 4c3a0c3074..4daeaee23f 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -159,7 +159,7 @@ PREFERRED_VERSION_glib-2.0 ?= "2.14.0"
159PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" 159PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
160PREFERRED_VERSION_atk ?= "1.18.0" 160PREFERRED_VERSION_atk ?= "1.18.0"
161PREFERRED_VERSION_cairo ?= "1.4.10" 161PREFERRED_VERSION_cairo ?= "1.4.10"
162PREFERRED_VERSION_pango ?= "1.16.5" 162PREFERRED_VERSION_pango ?= "1.18.1"
163PREFERRED_VERSION_gtk+ ?= "2.10.14" 163PREFERRED_VERSION_gtk+ ?= "2.10.14"
164 164
165PREFERRED_VERSION_dbus ?= "1.0.2" 165PREFERRED_VERSION_dbus ?= "1.0.2"
diff --git a/meta/packages/pango/pango-1.17.5/no-tests.patch b/meta/packages/pango/pango-1.18.1/no-tests.patch
index dafcb20c3b..dafcb20c3b 100644
--- a/meta/packages/pango/pango-1.17.5/no-tests.patch
+++ b/meta/packages/pango/pango-1.18.1/no-tests.patch
diff --git a/meta/packages/pango/pango_1.17.5.bb b/meta/packages/pango/pango_1.18.1.bb
index 8e3e8e7d3a..8e3e8e7d3a 100644
--- a/meta/packages/pango/pango_1.17.5.bb
+++ b/meta/packages/pango/pango_1.18.1.bb