summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2006-12-12 19:36:07 +0000
committerRoss Burton <ross@openedhand.com>2006-12-12 19:36:07 +0000
commitc258b1b71d1b6cc780dbee82cb93d408c80b3c18 (patch)
treeaf17f59b97b6a43448d1a125c4b9ee5eacb323cd
parentcb244e3883be9939a9b88f840b89dd878d59871e (diff)
downloadopenembedded-core-c258b1b71d1b6cc780dbee82cb93d408c80b3c18.tar.gz
openembedded-core-c258b1b71d1b6cc780dbee82cb93d408c80b3c18.tar.bz2
openembedded-core-c258b1b71d1b6cc780dbee82cb93d408c80b3c18.zip
Optionally set cairo version so it doesn't overwrite the poky-bleeding version
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1026 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/distro/poky.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 2864894b31..f93f0af01f 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -140,7 +140,7 @@ PREFERRED_VERSION_libmatchbox ?= "1.9"
PREFERRED_VERSION_glib-2.0 ?= "2.10.3"
PREFERRED_VERSION_glib-2.0-native ?= "2.10.3"
PREFERRED_VERSION_atk ?= "1.10.3"
-PREFERRED_VERSION_cairo = "1.0.4"
+PREFERRED_VERSION_cairo ?= "1.0.4"
PREFERRED_VERSION_gtk+ ?= "2.6.8"
#PREFERRED_VERSION_gtk+ ?= "2.8.16"
PREFERRED_VERSION_pango ?= "1.10.2"