summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-03-06 11:23:34 +0000
committerRoss Burton <ross@openedhand.com>2007-03-06 11:23:34 +0000
commite4ff2458d2db9ca89761e6b5da91993d44abd65e (patch)
treebc8aba82c586530b1030d7cae36e16429910097f
parentc54a22bf0ccd47689c11c4f05bd2bb47e57b2edc (diff)
downloadpoky-e4ff2458d2db9ca89761e6b5da91993d44abd65e.tar.gz
Upgrade to cairo 1.4.0
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1332 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/distro/poky-bleeding.conf2
-rw-r--r--meta/packages/cairo/cairo_1.4.0.bb (renamed from meta/packages/cairo/cairo_1.3.14.bb)3
2 files changed, 2 insertions, 3 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 9b942d01e3..9aaa7e4f03 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,7 +1,7 @@
1PREFERRED_VERSION_glib-2.0 ?= "2.12.6" 1PREFERRED_VERSION_glib-2.0 ?= "2.12.6"
2PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" 2PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
3 3
4PREFERRED_VERSION_cairo ?= "1.3.14" 4PREFERRED_VERSION_cairo ?= "1.4.0"
5PREFERRED_VERSION_pango ?= "1.16.0" 5PREFERRED_VERSION_pango ?= "1.16.0"
6PREFERRED_VERSION_gtk+ ?= "2.10.9" 6PREFERRED_VERSION_gtk+ ?= "2.10.9"
7 7
diff --git a/meta/packages/cairo/cairo_1.3.14.bb b/meta/packages/cairo/cairo_1.4.0.bb
index 6bc0cb37f7..42ff9ddef8 100644
--- a/meta/packages/cairo/cairo_1.3.14.bb
+++ b/meta/packages/cairo/cairo_1.4.0.bb
@@ -3,8 +3,7 @@ DEFAULT_PREFERENCE = "-1"
3 3
4require cairo.inc 4require cairo.inc
5 5
6SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz \ 6SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
7 file://cairo-surface-cache-3.patch;patch=1" 7 file://cairo-surface-cache-3.patch;patch=1"
8 8
9PR = "r0" 9PR = "r0"
10