From ddd34d37c45b591fcb2161053b54d5387c0331f1 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Wed, 21 Mar 2007 10:28:59 +0000
Subject: Upgrade Cairo

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1375 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/conf/distro/poky-bleeding.conf | 2 +-
 meta/packages/cairo/cairo_1.4.0.bb  | 9 ---------
 meta/packages/cairo/cairo_1.4.2.bb  | 9 +++++++++
 3 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 meta/packages/cairo/cairo_1.4.0.bb
 create mode 100644 meta/packages/cairo/cairo_1.4.2.bb

(limited to 'meta')

diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 4396d4287..38488d816 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,7 +1,7 @@
 PREFERRED_VERSION_glib-2.0 ?= "2.12.11"
 PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
 
-PREFERRED_VERSION_cairo ?= "1.4.0"
+PREFERRED_VERSION_cairo ?= "1.4.2"
 PREFERRED_VERSION_pango ?= "1.16.1"
 PREFERRED_VERSION_gtk+ ?= "2.10.10"
 
diff --git a/meta/packages/cairo/cairo_1.4.0.bb b/meta/packages/cairo/cairo_1.4.0.bb
deleted file mode 100644
index 42ff9ddef..000000000
--- a/meta/packages/cairo/cairo_1.4.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-#This is a development snapshot, so lets hint OE to use the releases
-DEFAULT_PREFERENCE = "-1"
-
-require cairo.inc
-
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
-           file://cairo-surface-cache-3.patch;patch=1"
-
-PR = "r0"
diff --git a/meta/packages/cairo/cairo_1.4.2.bb b/meta/packages/cairo/cairo_1.4.2.bb
new file mode 100644
index 000000000..42ff9ddef
--- /dev/null
+++ b/meta/packages/cairo/cairo_1.4.2.bb
@@ -0,0 +1,9 @@
+#This is a development snapshot, so lets hint OE to use the releases
+DEFAULT_PREFERENCE = "-1"
+
+require cairo.inc
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
+           file://cairo-surface-cache-3.patch;patch=1"
+
+PR = "r0"
-- 
cgit v1.2.3