From: Ross Burton <ross@openedhand.com>
Date: Wed, 1 Aug 2007 15:57:48 +0000 (+0000)
Subject: Upgrade cairo to 1.4.10
X-Git-Tag: 2011-1~11119
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f90f6b05791657c2dca5f0be5c7728b37254d88f;p=openembedded-core.git

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 799dbffd8c..5f2e7fd9bb 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 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"
 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