summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-08-01 13:08:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-04 15:04:31 +0100
commit20ee0c715db14b3861c29bf3ddeab87fbae8ef89 (patch)
tree6fe015b7917e14d63284e26de315c8b5cd4019f6
parent0b4b8d89a3df057ce9dd872994714cb6d5541256 (diff)
downloadpoky-20ee0c715db14b3861c29bf3ddeab87fbae8ef89.tar.gz
gtk-icon-cache bbclass: only add runtime dependencies on hicolor-icon-theme when installing icons
Tested with gnome-icon-theme and libsoup recipes on angstrom. (From OE-Core rev: 229ba02322ce49d13e2d64eff6bb637f23f1f16b) Signed-off-by: Koen Kooi <koen@openembedded.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/gtk-icon-cache.bbclass8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index dcabaf5442..d9b5d1bdd6 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -1,5 +1,4 @@
1FILES_${PN} += "${datadir}/icons/hicolor" 1FILES_${PN} += "${datadir}/icons/hicolor"
2RDEPENDS += "hicolor-icon-theme"
3 2
4# This could run on the host as icon cache files are architecture independent, 3# This could run on the host as icon cache files are architecture independent,
5# but there is no gtk-update-icon-cache built natively. 4# but there is no gtk-update-icon-cache built natively.
@@ -34,7 +33,12 @@ python populate_packages_append () {
34 icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, bb.data.getVar('datadir', d, 1)) 33 icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, bb.data.getVar('datadir', d, 1))
35 if not os.path.exists(icon_dir): 34 if not os.path.exists(icon_dir):
36 continue 35 continue
37 36
37 bb.note("adding hicolor-icon-theme dependency to %s" % pkg)
38 rdepends = bb.data.getVar('RDEPENDS', d, 1)
39 rdepends += "hicolor-icon-theme"
40 bb.data.setVar('RDEPENDS', rdepends, d)
41
38 bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg) 42 bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg)
39 43
40 postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1) 44 postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)