diff options
| author | Zhai Edwin <edwin.zhai@intel.com> | 2010-11-22 14:26:56 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-27 21:52:01 +0000 |
| commit | 7c9c78bebd074d72270adaa8baed860bf554ad82 (patch) | |
| tree | e28a5c7033d9ee973c96674e733c592f9724be0a /meta/recipes-gnome/gtk+/gtk+.inc | |
| parent | 8a6e8623b43a5b38546e0a8c96f473dba9b31eee (diff) | |
| download | openembedded-core-7c9c78bebd074d72270adaa8baed860bf554ad82.tar.gz openembedded-core-7c9c78bebd074d72270adaa8baed860bf554ad82.tar.bz2 openembedded-core-7c9c78bebd074d72270adaa8baed860bf554ad82.zip | |
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>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+.inc')
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+.inc | 16 |
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 -} |