summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-16 10:13:39 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-16 10:13:39 +0000
commita59f67fdb9077c84f80577aeab5b4cce37539d0d (patch)
tree870f7ecbcdbe4b55b9421278e4e1089953db1c89
parent67fa7a1c60eebc2eb664fd9eea46febb8af694d6 (diff)
downloadpoky-a59f67fdb9077c84f80577aeab5b4cce37539d0d.tar.gz
gtk-icon-cache.bbclass: Fix hardcoded PKGDEST reference and operate on directories other than hicolor (from OE.dev)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/classes/gtk-icon-cache.bbclass15
1 files changed, 12 insertions, 3 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 4a59b74754..d1aeee5f89 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -11,19 +11,28 @@ fi
11# Update the pixbuf loaders in case they haven't been registered yet 11# Update the pixbuf loaders in case they haven't been registered yet
12gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders 12gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
13 13
14gtk-update-icon-cache -q /usr/share/icons/hicolor 14for icondir in /usr/share/icons/* ; do
15 if [ -d $icondir ] ; then
16 gtk-update-icon-cache -qt $icondir
17 fi
18done
15} 19}
16 20
17gtk_icon_cache_postrm() { 21gtk_icon_cache_postrm() {
18gtk-update-icon-cache -q /usr/share/icons/hicolor 22for icondir in /usr/share/icons/* ; do
23 if [ -d $icondir ] ; then
24 gtk-update-icon-cache -qt $icondir
25 fi
26done
19} 27}
20 28
21python populate_packages_append () { 29python populate_packages_append () {
22 packages = bb.data.getVar('PACKAGES', d, 1).split() 30 packages = bb.data.getVar('PACKAGES', d, 1).split()
31 pkgdest = bb.data.getVar('PKGDEST', d, 1)
23 workdir = bb.data.getVar('WORKDIR', d, 1) 32 workdir = bb.data.getVar('WORKDIR', d, 1)
24 33
25 for pkg in packages: 34 for pkg in packages:
26 icon_dir = '%s/install/%s/%s/icons/hicolor' % (workdir, pkg, bb.data.getVar('datadir', d, 1)) 35 icon_dir = '%s/%s/%s/%s/icons' % (workdir, pkgdest, pkg, bb.data.getVar('datadir', d, 1))
27 if not os.path.exists(icon_dir): 36 if not os.path.exists(icon_dir):
28 continue 37 continue
29 38