[oe-commits] Koen Kooi : angstrom: switch to gtk 2.18 + glib 2.22

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 7497b15e9a0a7ad889c46e6f2269887efeb04f32
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7497b15e9a0a7ad889c46e6f2269887efeb04f32

Author: Koen Kooi <koen at openembedded.org>
Date:   Fri Sep 25 08:49:29 2009 +0200

angstrom: switch to gtk 2.18 + glib 2.22

---

 conf/checksums.ini                                 |   16 ++++++++++++----
 .../include/angstrom-2008-preferred-versions.inc   |    6 +++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index ed3f12e..41e099d 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2530,14 +2530,14 @@ sha256=0e3649531c3a5675743980ecf5ff5fcbca2801afe4dca7fb4b250aae7ac3b782
 md5=e240c34f979b64bcb83c5f6567110bb1
 sha256=46d427fd5b1509ec7dd980c07efd88634fde61cf07ab221dcbde9e1021bd2817
 
-[http://downloads.open-mesh.net/batman/stable/sources/batman/batman-0.3.tar.gz]
-md5=54812e81f70a4155edcce88f0c7aeb02
-sha256=846f34019c6f30bbb88790088a0e205c7a4e7ee0ab656a5ea3b4b624a0a028cb
-
 [http://downloads.open-mesh.net/batman/stable/sources/batman/batman-0.3.2.tar.gz]
 md5=3f2f6b408828d34c5c2f1445e744e6ac
 sha256=2b0f22efc1bda016649db8d6e1214e381d034befa9c9835c3a6a75d5f95cf931
 
+[http://downloads.open-mesh.net/batman/stable/sources/batman/batman-0.3.tar.gz]
+md5=54812e81f70a4155edcce88f0c7aeb02
+sha256=846f34019c6f30bbb88790088a0e205c7a4e7ee0ab656a5ea3b4b624a0a028cb
+
 [http://bazaar.canonical.com/releases/src/bazaar_1.2.tar.gz]
 md5=1fdb0aa41d7db06bf3429118d0136c8a
 sha256=d1b657f52dea785ce1b1a8b5acfdee4492c5d779422f9b58e145162e2d33c241
@@ -8202,6 +8202,10 @@ sha256=b772e4bdf1b28dd23cdb4c4d7f1d219ddb748226d0207e57c75992bf0100182d
 md5=3b0452fbd877db53dafabdc074600cb8
 sha256=8b4750523a07102c90c7eecf1743f852ce2aadcb7a43284a9e06baf70beb9b8a
 
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.22/glib-2.22.0.tar.bz2]
+md5=e0bc5b08d467cc3763550923087772d3
+sha256=f77cda95fa7cea5e7ad189ac18a165bb3886a66bc5f97c6398a9e5dc16c8a671
+
 [ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.6.tar.bz2]
 md5=a45db7d82480da431f6cd00ea041a534
 sha256=d2ca79bac06a625d9276b48492c2c1caccf7f8962f9b331b39796391013e72f2
@@ -10450,6 +10454,10 @@ sha256=afcdc5b67974054b111a4c283641303647d1ffa5677ffb8c4ce8621f12e17f88
 md5=416412b336d9f3b6b78ca887395d1726
 sha256=18e0f9792028e6cc5108447678f17d396f9a2cdfec1e6ab5dca98cb844f954af
 
+[http://download.gnome.org/sources/gtk+/2.18/gtk+-2.18.0.tar.bz2]
+md5=bb7ef5463a74a80454ced2c1d47a0192
+sha256=05fce9327dbe78a74ad4cd45383d541f96f19d40d3c03076cdf6908ad28ad241
+
 [http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2]
 md5=c6697665e06cad01e87c2cf8d0913725
 sha256=2a768a45adea587c4a7d6e3c3567ad7961bf7509e118ae62ce32f5369b1aeeb0
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index cff296f..03e5c8e 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -6,12 +6,12 @@ PREFERRED_VERSION_cairo		= "1.8.0"
 PREFERRED_VERSION_dbus 		= "1.2.1"
 PREFERRED_VERSION_dropbear      = "0.51"
 PREFERRED_VERSION_fontconfig	= "2.6.0"
-PREFERRED_VERSION_glib-2.0 	= "2.21.6"
-PREFERRED_VERSION_glib-2.0-native = "2.21.6"
+PREFERRED_VERSION_glib-2.0 	= "2.22.0"
+PREFERRED_VERSION_glib-2.0-native = "2.22.0"
 PREFERRED_VERSION_glibmm = "2.18.0"
 PREFERRED_VERSION_glproto	= "1.4.9"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
-PREFERRED_VERSION_gtk+		= "2.16.6"
+PREFERRED_VERSION_gtk+		= "2.18.0"
 PREFERRED_VERSION_gtkmm		= "2.14.1"
 PREFERRED_VERSION_hal		= "0.5.13"
 PREFERRED_VERSION_libgemwidget	= "1.0"