angstrom 2008: prefer a newer glib and gtk+

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 7dd416b..fd74d75 100644 (file)
--- 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 2ebb06d..e52a8dd 100644 (file)
--- 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"