summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-03-21 10:28:59 +0000
committerRoss Burton <ross@openedhand.com>2007-03-21 10:28:59 +0000
commitddd34d37c45b591fcb2161053b54d5387c0331f1 (patch)
tree5f0536de29f3fede8902970918ac9ed4f32bfcf1 /meta
parent968b14a1213395b5afe7a585877a78821bc09178 (diff)
downloadopenembedded-core-ddd34d37c45b591fcb2161053b54d5387c0331f1.tar.gz
openembedded-core-ddd34d37c45b591fcb2161053b54d5387c0331f1.tar.bz2
openembedded-core-ddd34d37c45b591fcb2161053b54d5387c0331f1.tar.xz
openembedded-core-ddd34d37c45b591fcb2161053b54d5387c0331f1.zip
Upgrade Cairo
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1375 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/poky-bleeding.conf2
-rw-r--r--meta/packages/cairo/cairo_1.4.2.bb (renamed from meta/packages/cairo/cairo_1.4.0.bb)0
2 files changed, 1 insertions, 1 deletions
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.2.bb
index 42ff9ddef..42ff9ddef 100644
--- a/meta/packages/cairo/cairo_1.4.0.bb
+++ b/meta/packages/cairo/cairo_1.4.2.bb