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/cairo/cairo_1.4.10.bb (renamed from meta/packages/cairo/cairo_1.4.8.bb)0
3 files changed, 1 insertions, 2 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 799dbffd8c..5f2e7fd9bb 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,7 +1,6 @@
1PREFERRED_VERSION_glib-2.0 ?= "2.13.7" 1PREFERRED_VERSION_glib-2.0 ?= "2.13.7"
2PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" 2PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
3 3
4PREFERRED_VERSION_cairo ?= "1.4.8"
5PREFERRED_VERSION_pango ?= "1.17.5" 4PREFERRED_VERSION_pango ?= "1.17.5"
6PREFERRED_VERSION_gtk+ ?= "2.10.14" 5PREFERRED_VERSION_gtk+ ?= "2.10.14"
7PREFERRED_VERSION_gtk-engines ?= "2.10.0" 6PREFERRED_VERSION_gtk-engines ?= "2.10.0"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 889e6a9bfd..9a49d778e1 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -144,7 +144,7 @@ PREFERRED_VERSION_sato-icon-theme = "0.1"
144PREFERRED_VERSION_glib-2.0 ?= "2.12.13" 144PREFERRED_VERSION_glib-2.0 ?= "2.12.13"
145PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" 145PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
146PREFERRED_VERSION_atk ?= "1.10.3" 146PREFERRED_VERSION_atk ?= "1.10.3"
147PREFERRED_VERSION_cairo ?= "1.4.8" 147PREFERRED_VERSION_cairo ?= "1.4.10"
148PREFERRED_VERSION_pango ?= "1.16.5" 148PREFERRED_VERSION_pango ?= "1.16.5"
149PREFERRED_VERSION_gtk+ ?= "2.10.14" 149PREFERRED_VERSION_gtk+ ?= "2.10.14"
150 150
diff --git a/meta/packages/cairo/cairo_1.4.8.bb b/meta/packages/cairo/cairo_1.4.10.bb
index 845e14fc29..845e14fc29 100644
--- a/meta/packages/cairo/cairo_1.4.8.bb
+++ b/meta/packages/cairo/cairo_1.4.10.bb