From 90d3853872298e0b2a997e9a4fc8fb7b549f90d5 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Tue, 15 Jan 2008 09:15:06 +0000
Subject: cairo: upgrade from 1.4.10 to 1.4.14

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

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 546bf52b8..a046d1fb5 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -194,7 +194,7 @@ PREFERRED_VERSION_sato-icon-theme ?= "0.1"
 PREFERRED_VERSION_glib-2.0 ?= "2.14.5"
 PREFERRED_VERSION_glib-2.0-native ?= "2.14.5"
 PREFERRED_VERSION_atk ?= "1.20.0"
-PREFERRED_VERSION_cairo ?= "1.4.10"
+PREFERRED_VERSION_cairo ?= "1.4.14"
 PREFERRED_VERSION_pango ?= "1.18.3"
 PREFERRED_VERSION_gtk+ ?= "2.12.5"
 
diff --git a/meta/packages/cairo/cairo_1.4.10.bb b/meta/packages/cairo/cairo_1.4.10.bb
deleted file mode 100644
index 845e14fc2..000000000
--- a/meta/packages/cairo/cairo_1.4.10.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require cairo.inc
-
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
-
-PR = "r0"
-
diff --git a/meta/packages/cairo/cairo_1.4.14.bb b/meta/packages/cairo/cairo_1.4.14.bb
new file mode 100644
index 000000000..845e14fc2
--- /dev/null
+++ b/meta/packages/cairo/cairo_1.4.14.bb
@@ -0,0 +1,6 @@
+require cairo.inc
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
+
+PR = "r0"
+
-- 
cgit v1.2.3