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 | poky-7c9c78bebd074d72270adaa8baed860bf554ad82.tar.gz |
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" | |||
11 | SECTION = "libs" | 11 | SECTION = "libs" |
12 | PRIORITY = "optional" | 12 | PRIORITY = "optional" |
13 | DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc-native libxrandr \ | 13 | DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc-native libxrandr \ |
14 | libgcrypt libxdamage libxrender libxcomposite cairo" | 14 | libgcrypt libxdamage libxrender libxcomposite cairo gdk-pixbuf" |
15 | 15 | ||
16 | inherit autotools pkgconfig | 16 | inherit autotools pkgconfig |
17 | 17 | ||
18 | FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ | 18 | FILES_${PN} = "${bindir}/gtk-update-icon-cache \ |
19 | ${bindir}/gtk-update-icon-cache \ | ||
20 | ${bindir}/gtk-query-immodules-2.0 \ | 19 | ${bindir}/gtk-query-immodules-2.0 \ |
21 | ${libdir}/lib*${SOLIBS} \ | 20 | ${libdir}/lib*${SOLIBS} \ |
22 | ${datadir}/themes ${sysconfdir} \ | 21 | ${datadir}/themes ${sysconfdir} \ |
@@ -28,7 +27,6 @@ FILES_${PN}-dev += " \ | |||
28 | ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \ | 27 | ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \ |
29 | ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \ | 28 | ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \ |
30 | ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ | 29 | ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ |
31 | ${bindir}/gdk-pixbuf-csource \ | ||
32 | ${bindir}/gtk-builder-convert" | 30 | ${bindir}/gtk-builder-convert" |
33 | 31 | ||
34 | FILES_${PN}-dbg += " \ | 32 | FILES_${PN}-dbg += " \ |
@@ -75,13 +73,3 @@ if [ "x$D" != "x" ]; then | |||
75 | fi | 73 | fi |
76 | 74 | ||
77 | } | 75 | } |
78 | |||
79 | postinst_pixbufloader() { | ||
80 | if [ "x$D" != "x" ]; then | ||
81 | exit 1 | ||
82 | fi | ||
83 | |||
84 | gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders | ||
85 | |||
86 | test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor | ||
87 | } | ||