summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-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 799dbffd8..5f2e7fd9b 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,7 +1,6 @@
PREFERRED_VERSION_glib-2.0 ?= "2.13.7"
PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
-PREFERRED_VERSION_cairo ?= "1.4.8"
PREFERRED_VERSION_pango ?= "1.17.5"
PREFERRED_VERSION_gtk+ ?= "2.10.14"
PREFERRED_VERSION_gtk-engines ?= "2.10.0"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 889e6a9bf..9a49d778e 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -144,7 +144,7 @@ PREFERRED_VERSION_sato-icon-theme = "0.1"
PREFERRED_VERSION_glib-2.0 ?= "2.12.13"
PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
PREFERRED_VERSION_atk ?= "1.10.3"
-PREFERRED_VERSION_cairo ?= "1.4.8"
+PREFERRED_VERSION_cairo ?= "1.4.10"
PREFERRED_VERSION_pango ?= "1.16.5"
PREFERRED_VERSION_gtk+ ?= "2.10.14"
diff --git a/meta/packages/cairo/cairo_1.4.8.bb b/meta/packages/cairo/cairo_1.4.10.bb
index 845e14fc2..845e14fc2 100644
--- a/meta/packages/cairo/cairo_1.4.8.bb
+++ b/meta/packages/cairo/cairo_1.4.10.bb