From f90f6b05791657c2dca5f0be5c7728b37254d88f Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Wed, 1 Aug 2007 15:57:48 +0000
Subject: Upgrade cairo to 1.4.10
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2298 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
meta/conf/distro/poky-bleeding.conf | 1 -
meta/conf/distro/poky.conf | 2 +-
meta/packages/cairo/cairo_1.4.10.bb | 6 ++++++
meta/packages/cairo/cairo_1.4.8.bb | 6 ------
4 files changed, 7 insertions(+), 8 deletions(-)
create mode 100644 meta/packages/cairo/cairo_1.4.10.bb
delete mode 100644 meta/packages/cairo/cairo_1.4.8.bb
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.10.bb b/meta/packages/cairo/cairo_1.4.10.bb
new file mode 100644
index 000000000..845e14fc2
--- /dev/null
+++ b/meta/packages/cairo/cairo_1.4.10.bb
@@ -0,0 +1,6 @@
+require cairo.inc
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
+
+PR = "r0"
+
diff --git a/meta/packages/cairo/cairo_1.4.8.bb b/meta/packages/cairo/cairo_1.4.8.bb
deleted file mode 100644
index 845e14fc2..000000000
--- a/meta/packages/cairo/cairo_1.4.8.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require cairo.inc
-
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
-
-PR = "r0"
-
--
cgit v1.2.3