gtk+: Update to 2.22.1

Remove disable-gio-png-sniff-test.diff as it alreay in upstream. gdk-pixbuf in
gtk+ is separated as another stand-alone package, so remove it.

In future need only pick up stable version(even number like 2.20.x, 2.22.x).

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>

1 files changed, 2 insertions, 14 deletions

diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index f04b29ca6e..94a8fe618d 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -11,12 +11,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc-native libxrandr \
-           libgcrypt libxdamage libxrender libxcomposite cairo"
+           libgcrypt libxdamage libxrender libxcomposite cairo gdk-pixbuf"
 
 inherit autotools pkgconfig
 
-FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
-	${bindir}/gtk-update-icon-cache \
+FILES_${PN} = "${bindir}/gtk-update-icon-cache \
 	${bindir}/gtk-query-immodules-2.0 \
 	${libdir}/lib*${SOLIBS} \
 	${datadir}/themes ${sysconfdir} \
@@ -28,7 +27,6 @@ FILES_${PN}-dev += " \
 	${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
 	${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
 	${libdir}/gtk-2.0/${LIBV}/engines/*.la \
-	${bindir}/gdk-pixbuf-csource \
 	${bindir}/gtk-builder-convert"
 
 FILES_${PN}-dbg += " \
@@ -75,13 +73,3 @@ if [ "x$D" != "x" ]; then
 fi
 
 }
-
-postinst_pixbufloader() {
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
-
-test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache  -q ${datadir}/icons/hicolor
-}