summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-08-07 10:12:33 +0000
committerKoen Kooi <koen@openembedded.org>2008-08-07 10:12:33 +0000
commit9f997656350dbc5b26da39118689f89cea683f89 (patch)
tree65cf8d55a22d7f6e0fa6cc7694f14c925628a6b7
parent91e0c7d309f35cbec7a739064e7eb4a799ce52f4 (diff)
angstrom 2008: prefer a newer glib and gtk+
-rw-r--r--conf/distro/angstrom-2008.1.conf4
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc3
2 files changed, 2 insertions, 5 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 7dd416b102..fd74d7581c 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -75,10 +75,6 @@ PREFERRED_VERSION_glibc-initial ?= "2.6.1"
PREFERRED_VERSION_uclibc ?= "0.9.29"
PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
-#Prefer a newer GTK+ and friends
-PREFERRED_VERSION_gtk+ ?= "2.12.3"
-PREFERRED_VERSION_glib-2.0 ?= "2.14.4"
-
PREFERRED_PROVIDER_avahi = "avahi"
#Small machines prefer kdrive, but we might ship full Xorg in other images
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 2ebb06d5c0..e52a8ddb68 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -4,8 +4,9 @@ PREFERRED_VERSION_cairo = "1.6.4"
PREFERRED_VERSION_dbus = "1.2.1"
PREFERRED_VERSION_dropbear = "0.51"
PREFERRED_VERSION_fontconfig = "2.4.1"
-PREFERRED_VERSION_glib-2.0 = "2.16.3"
+PREFERRED_VERSION_glib-2.0 = "2.16.4"
PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_gtk+ = "2.12.11"
PREFERRED_VERSION_libsdl-x11 = "1.2.11"
PREFERRED_VERSION_libtool = "2.2.4"
PREFERRED_VERSION_libtool-native = "2.2.4"