From e4ff2458d2db9ca89761e6b5da91993d44abd65e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 6 Mar 2007 11:23:34 +0000 Subject: Upgrade to cairo 1.4.0 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1332 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/poky-bleeding.conf | 2 +- meta/packages/cairo/cairo_1.3.14.bb | 10 ---------- meta/packages/cairo/cairo_1.4.0.bb | 9 +++++++++ 3 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 meta/packages/cairo/cairo_1.3.14.bb create mode 100644 meta/packages/cairo/cairo_1.4.0.bb 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 @@ PREFERRED_VERSION_glib-2.0 ?= "2.12.6" PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" -PREFERRED_VERSION_cairo ?= "1.3.14" +PREFERRED_VERSION_cairo ?= "1.4.0" PREFERRED_VERSION_pango ?= "1.16.0" PREFERRED_VERSION_gtk+ ?= "2.10.9" diff --git a/meta/packages/cairo/cairo_1.3.14.bb b/meta/packages/cairo/cairo_1.3.14.bb deleted file mode 100644 index 6bc0cb37f7..0000000000 --- a/meta/packages/cairo/cairo_1.3.14.bb +++ /dev/null @@ -1,10 +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/snapshots/cairo-${PV}.tar.gz \ - file://cairo-surface-cache-3.patch;patch=1" - -PR = "r0" - diff --git a/meta/packages/cairo/cairo_1.4.0.bb b/meta/packages/cairo/cairo_1.4.0.bb new file mode 100644 index 0000000000..42ff9ddef8 --- /dev/null +++ b/meta/packages/cairo/cairo_1.4.0.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