Upgrade cairo to 1.4.10

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2298 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 799dbffd8c5a7b482cfbce82e31241a7a37a81ef..5f2e7fd9bb5ab5514ed7717194cca57386575a5a 100644 (file)
--- 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 889e6a9bfd2caae8d420688c2e95abd4e353cde7..9a49d778e1cdf938ed75715608e92267df185e6a 100644 (file)
--- 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
similarity index 100%
rename from meta/packages/cairo/cairo_1.4.8.bb
rename to meta/packages/cairo/cairo_1.4.10.bb