diff options
author | Koen Kooi <koen@openembedded.org> | 2011-08-01 11:56:48 +0200 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2011-08-01 15:53:37 +0200 |
commit | 0b521d7bcfbb6f26bb2d3ad55add6a3f677a199d (patch) | |
tree | 1680848c0a1319edb27fca0653cc42f458ca6e2e /classes | |
parent | eaf7e8181db3e80a7ff5974a35d611515e890db8 (diff) | |
download | openembedded-0b521d7bcfbb6f26bb2d3ad55add6a3f677a199d.tar.gz |
gtk-icon-cache bbclass: only add runtime dependencies on hicolor-icon-theme when installing icons
Also import a fix from OE-core for setting the loader dir.
Tested with gnome-icon-theme and libsoup recipes on angstrom.
Signed-off-by: Koen Kooi <koen@openembedded.org>
Acked-by: Steffen Sledz <sledz@dresearch-fe.de>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/gtk-icon-cache.bbclass | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass index 2449e954ce..d9b5d1bdd6 100644 --- a/classes/gtk-icon-cache.bbclass +++ b/classes/gtk-icon-cache.bbclass @@ -1,6 +1,4 @@ FILES_${PN} += "${datadir}/icons/hicolor" -# Only add runtime dependency on hicolor-icon-theme for target recipes -RDEPENDS_${PN} += "${@['', 'hicolor-icon-theme']['${PN}' == '${BPN}']}" # This could run on the host as icon cache files are architecture independent, # but there is no gtk-update-icon-cache built natively. @@ -10,7 +8,7 @@ if [ "x$D" != "x" ]; then fi # Update the pixbuf loaders in case they haven't been registered yet -gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders +GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache for icondir in /usr/share/icons/* ; do if [ -d $icondir ] ; then @@ -35,7 +33,12 @@ python populate_packages_append () { icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, bb.data.getVar('datadir', d, 1)) if not os.path.exists(icon_dir): continue - + + bb.note("adding hicolor-icon-theme dependency to %s" % pkg) + rdepends = bb.data.getVar('RDEPENDS', d, 1) + rdepends += "hicolor-icon-theme" + bb.data.setVar('RDEPENDS', rdepends, d) + bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg) postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1) |