Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev

12 files changed, 17 insertions, 5 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 9d66ce7ef5..7fb1d41e29 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -7866,6 +7866,10 @@ sha256=af1456e075954c122bda008736437b048d5336d0b426847c627e607eb35e59e5
 md5=05188e560dbd8bddd568e24ce10dd003
 sha256=6fb4269a187bee6f7825c358fd6f0e0e99e6ad71f7f995ddcbfe9466ec8f6631
 
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-2.20.4.tar.bz2]
+md5=346916673c0eab72191cf44b4afe535f
+sha256=af709f0eabfbbfa5c59a02764ca1dd5e6509bbe7fb67a474b2c448bda7b06fb9
+
 [ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.6.tar.bz2]
 md5=a45db7d82480da431f6cd00ea041a534
 sha256=d2ca79bac06a625d9276b48492c2c1caccf7f8962f9b331b39796391013e72f2
@@ -10038,6 +10042,10 @@ sha256=efc277e87e3b7e0315eb3c2837fad6a06aab92b38e08fec6f30beb53e7e56e09
 md5=139528802794287427fd4d18875b5cf5
 sha256=ff25cbf43dd5c5f8cddc1b2094505c1d079a576b873a6d3d6b62d95da1bdd1d7
 
+[http://download.gnome.org/sources/gtk+/2.16/gtk+-2.16.4.tar.bz2]
+md5=d666f9f5a544e9d4d45804d88b1b5c4d
+sha256=afcdc5b67974054b111a4c283641303647d1ffa5677ffb8c4ce8621f12e17f88
+
 [http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2]
 md5=c6697665e06cad01e87c2cf8d0913725
 sha256=2a768a45adea587c4a7d6e3c3567ad7961bf7509e118ae62ce32f5369b1aeeb0
@@ -18674,6 +18682,10 @@ sha256=75fa65f965c8b9b80b1a0a270ad5dfbe71eaa980451790a0c86fdd19f55cd150
 md5=7bc6c884d847cabc613e4c6d663771f5
 sha256=f3617f8f32c45c57f19c0aa1d7334e1dc979b9b54e5bb4e78fba8ec80193c23c
 
+[http://ftp.gnome.org/pub/GNOME/sources/pango/1.24/pango-1.24.4.tar.bz2]
+md5=f2eeaf183930e00ed28fca3a6ed1deb0
+sha256=adbd11f182ec63939d6364cbb59e86991a48582e7d3641cda80529b40b399559
+
 [ftp://ftp.gtk.org/pub/gtk/v2.4/pango-1.4.1.tar.bz2]
 md5=39868e0da250fd4c00b2970e4eb84389
 sha256=4f35ba6d3537c9386d6262bfe601a418bf34fe0be3bb0139ec2d3bd9435d4d3f
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 28de7667d5..5bf5b30d4c 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.20.0"
+PREFERRED_VERSION_glib-2.0 	= "2.20.4"
 PREFERRED_VERSION_glib-2.0-native = "2.18.0"
 PREFERRED_VERSION_glibmm = "2.18.0"
-PREFERRED_VERSION_glproto	= "1.4.9"      
+PREFERRED_VERSION_glproto	= "1.4.9"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
-PREFERRED_VERSION_gtk+		= "2.16.0"
+PREFERRED_VERSION_gtk+		= "2.16.4"
 PREFERRED_VERSION_gtkmm		= "2.14.1"
 PREFERRED_VERSION_hal		= "0.5.12"
 PREFERRED_VERSION_libgemwidget	= "1.0"
@@ -23,7 +23,7 @@ PREFERRED_VERSION_libtool-cross	= "2.2.4"
 PREFERRED_VERSION_libtool-sdk	= "2.2.4"
 PREFERRED_VERSION_libx11 = "1.2"
 PREFERRED_VERSION_mesa = "7.2"
-PREFERRED_VERSION_pango 	= "1.24.2"
+PREFERRED_VERSION_pango 	= "1.24.4"
 PREFERRED_VERSION_pixman	= "0.13.2"
 PREFERRED_VERSION_pkgconfig	= "0.23"
 PREFERRED_VERSION_pkgconfig-native = "0.23"
diff --git a/recipes/glib-2.0/glib-2.0-2.20.0/atomic-thumb.patch b/recipes/glib-2.0/glib-2.0-2.20.4/atomic-thumb.patch
index d7aa08821f..d7aa08821f 100644
--- a/recipes/glib-2.0/glib-2.0-2.20.0/atomic-thumb.patch
+++ b/recipes/glib-2.0/glib-2.0-2.20.4/atomic-thumb.patch
diff --git a/recipes/glib-2.0/glib-2.0-2.20.0/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.20.4/configure-libtool.patch
index 3ba79b8986..3ba79b8986 100644
--- a/recipes/glib-2.0/glib-2.0-2.20.0/configure-libtool.patch
+++ b/recipes/glib-2.0/glib-2.0-2.20.4/configure-libtool.patch
diff --git a/recipes/glib-2.0/glib-2.0_2.20.0.bb b/recipes/glib-2.0/glib-2.0_2.20.4.bb
index e0afd218f7..e0afd218f7 100644
--- a/recipes/glib-2.0/glib-2.0_2.20.0.bb
+++ b/recipes/glib-2.0/glib-2.0_2.20.4.bb
diff --git a/recipes/gtk+/gtk+-2.16.0/hardcoded_libtool.patch b/recipes/gtk+/gtk+-2.16.4/hardcoded_libtool.patch
index 82fbbac8d7..82fbbac8d7 100644
--- a/recipes/gtk+/gtk+-2.16.0/hardcoded_libtool.patch
+++ b/recipes/gtk+/gtk+-2.16.4/hardcoded_libtool.patch
diff --git a/recipes/gtk+/gtk+-2.16.0/no-demos.patch b/recipes/gtk+/gtk+-2.16.4/no-demos.patch
index 0fc4c48d1a..0fc4c48d1a 100644
--- a/recipes/gtk+/gtk+-2.16.0/no-demos.patch
+++ b/recipes/gtk+/gtk+-2.16.4/no-demos.patch
diff --git a/recipes/gtk+/gtk+-2.16.0/run-iconcache.patch b/recipes/gtk+/gtk+-2.16.4/run-iconcache.patch
index ac15e9ab24..ac15e9ab24 100644
--- a/recipes/gtk+/gtk+-2.16.0/run-iconcache.patch
+++ b/recipes/gtk+/gtk+-2.16.4/run-iconcache.patch
diff --git a/recipes/gtk+/gtk+-2.16.0/toggle-font.diff b/recipes/gtk+/gtk+-2.16.4/toggle-font.diff
index 59ad150b2f..59ad150b2f 100644
--- a/recipes/gtk+/gtk+-2.16.0/toggle-font.diff
+++ b/recipes/gtk+/gtk+-2.16.4/toggle-font.diff
diff --git a/recipes/gtk+/gtk+_2.16.0.bb b/recipes/gtk+/gtk+_2.16.4.bb
index 0b4e24eea7..4fde9b6825 100644
--- a/recipes/gtk+/gtk+_2.16.0.bb
+++ b/recipes/gtk+/gtk+_2.16.4.bb
@@ -1,7 +1,7 @@
 require gtk+.inc
 
 DEPENDS += "cairo jasper"
-PR = "r2"
+PR = "r0"
 
 # disabled per default - this uses as little patches as possible
 DEFAULT_PREFERENCE = "-1" 
diff --git a/recipes/pango/pango-1.24.2/no-tests.patch b/recipes/pango/pango-1.24.4/no-tests.patch
index dafcb20c3b..dafcb20c3b 100644
--- a/recipes/pango/pango-1.24.2/no-tests.patch
+++ b/recipes/pango/pango-1.24.4/no-tests.patch
diff --git a/recipes/pango/pango_1.24.2.bb b/recipes/pango/pango_1.24.4.bb
index ce81d89263..ce81d89263 100644
--- a/recipes/pango/pango_1.24.2.bb
+++ b/recipes/pango/pango_1.24.4.bb