Package upgrades

similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.20/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch

similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.20/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch

similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.20/cellrenderer-cairo.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.22/cellrenderer-cairo.patch

similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.20/configure-nm.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.22/configure-nm.patch

similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.20/configurefix.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.22/configurefix.patch

similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.20/doc-fixes.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.22/doc-fixes.patch

similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.20/entry-cairo.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.22/entry-cairo.patch

similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.20/hardcoded_libtool.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.22/hardcoded_libtool.patch

similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.20/no-demos.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.22/no-demos.patch

similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.20/run-iconcache.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.22/run-iconcache.patch

similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.20/toggle-font.diff
rename to meta/recipes-gnome/gtk+/gtk+-2.24.22/toggle-font.diff

similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.20/xsettings.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.22/xsettings.patch

similarity index 93%
rename from meta/recipes-gnome/gtk+/gtk+_2.24.20.bb
rename to meta/recipes-gnome/gtk+/gtk+_2.24.22.bb
index ad3b4e9..98c65a5 100644
@@ -28,8 +28,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
 #        file://combo-arrow-size.patch;striplevel=0
 #            file://configurefix.patch
 
-SRC_URI[md5sum] = "9d7833331d7accd80668e29d7f567ce5"
-SRC_URI[sha256sum] = "cc66bcbf9239a7d9861175c681ba95894b55c70dc0b37aad8345c46ecfda0da3"
+SRC_URI[md5sum] = "5fbbfb7637bbd571a572a2dae0e736d2"
+SRC_URI[sha256sum] = "b114b6e9fb389bf3aa8a6d09576538f58dce740779653084046852fb4140ae7f"
 
 EXTRA_OECONF = "--enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
 

deleted file mode 100644
index bf00332..0000000
@@ -1,52 +0,0 @@
-libpng 1.6 is stricter in various ways, which can trip up the PNG loader as it
-considers all warnings fatal.
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-
-From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001
-From: Chris Wilson <[email protected]>
-Date: Tue, 16 Apr 2013 10:58:56 +0100
-Subject: [PATCH] png: Avoid marking the surface as in error after a png
- warning
-
-It turns out that libpng will continue to load an image after throwing a
-warning, and that libpng16 now throws warnings for images that libpng15
-and earlier loaded without error. As we were happily loading those
-images into cairo surfaces before, we are therefore being overzealous
-in throwing an error now - so just squelch the warning.
-
-Signed-off-by: Chris Wilson <[email protected]>
----
- src/cairo-png.c |   14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/cairo-png.c b/src/cairo-png.c
-index e74a4a8..068617d 100644
---- a/src/cairo-png.c
-+++ b/src/cairo-png.c
-@@ -149,13 +149,13 @@ static void
- png_simple_warning_callback (png_structp png,
- 	                     png_const_charp error_msg)
- {
--    cairo_status_t *error = png_get_error_ptr (png);
--
--    /* default to the most likely error */
--    if (*error == CAIRO_STATUS_SUCCESS)
--	*error = _cairo_error (CAIRO_STATUS_NO_MEMORY);
--
--    /* png does not expect to abort and will try to tidy up after a warning */
-+    /* png does not expect to abort and will try to tidy up and continue
-+     * loading the image after a warning. So we also want to return the
-+     * (incorrect?) surface.
-+     *
-+     * We use our own warning callback to squelch any attempts by libpng
-+     * to write to stderr as we may not be in control of that output.
-+     */
- }
- 
- 
--- 
-1.7.10.4
-

similarity index 87%
rename from meta/recipes-graphics/cairo/cairo_1.12.14.bb
rename to meta/recipes-graphics/cairo/cairo_1.12.16.bb
index 40aa169..246bd0b 100644
@@ -2,13 +2,10 @@ require cairo.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
 
-PR = "r0"
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz"
 
-SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \
-           file://png.patch"
-
-SRC_URI[md5sum] = "27b634113d0f52152d60ae8e2ec7daa7"
-SRC_URI[sha256sum] = "96d0d1e3f9b74d2ca3469ff187c5e5f25649b1ad35cf06f4f3a83847dff4ac13"
+SRC_URI[md5sum] = "a1304edcdc99282f478b995ee5f8f854"
+SRC_URI[sha256sum] = "2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846"
 
 PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils"
 

similarity index 70%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_0.9.19.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_0.9.22.bb
index daf7273..e315f78 100644
@@ -3,12 +3,9 @@ DESCRIPTION = "HarfBuzz is an OpenType text shaping engine."
 HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz"
 BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz"
 
-LICENSE = "MIT & ICU"
+LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \
                     file://src/hb-ucdn/COPYING;md5=994ba0f1295f15b4bda4999a5bbeddef \
-                    file://src/hb-icu-le/COPYING;md5=0ac60acf068e2cc9facdf86169a9c13e \
-                    file://src/hb-icu-le/license.html;md5=9136737088bbfbbf86d9a714da49fb89 \
-                    file://src/hb-old/COPYING;md5=6e8442c12d498ce55cfe39fc60f97981 \
 "
 
 SECTION = "libs"

@@ -16,8 +13,8 @@ SECTION = "libs"
 SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${PV}.tar.bz2 \
 "
 
-SRC_URI[md5sum] = "9782581ee6ef972554772e84ca448131"
-SRC_URI[sha256sum] = "d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35"
+SRC_URI[md5sum] = "d3c1bcd7073cbca29fea37fab50ded7d"
+SRC_URI[sha256sum] = "989680807e76197418338e44f226e02f155f33031efd9aff14dbc4dc14af71da"
 
 inherit autotools pkgconfig