Update drivers

[vuplus_openembedded] / classes / gtk-icon-cache.bbclass

diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass
index 855a72a..524c2f0 100644 (file)
--- a/classes/gtk-icon-cache.bbclass
+++ b/classes/gtk-icon-cache.bbclass
@@ -1,24 +1,37 @@
 FILES_${PN} += "${datadir}/icons/hicolor"
-RDEPENDS += " hicolor-icon-theme "
+RDEPENDS += "hicolor-icon-theme"
 
-gtk-icon-cache_postinst() {
+# This could run on the host as icon cache files are architecture independent,
+# but there is no gtk-update-icon-cache built natively.
+gtk_icon_cache_postinst() {
 if [ "x$D" != "x" ]; then
         exit 1
 fi
-gtk-update-icon-cache -q /usr/share/icons/hicolor
+
+# Update the pixbuf loaders in case they haven't been registered yet
+gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+
+for icondir in /usr/share/icons/* ; do
+    if [ -d $icondir ] ; then
+        gtk-update-icon-cache -qt  $icondir
+    fi
+done
 }
 
-gtk-icon-cache_postrm() {
-gtk-update-icon-cache -q /usr/share/icons/hicolor
+gtk_icon_cache_postrm() {
+for icondir in /usr/share/icons/* ; do
+    if [ -d $icondir ] ; then
+        gtk-update-icon-cache -qt  $icondir
+    fi
+done
 }
 
 python populate_packages_append () {
-       import os.path
        packages = bb.data.getVar('PACKAGES', d, 1).split()
-       workdir = bb.data.getVar('WORKDIR', d, 1)
+       pkgdest =  bb.data.getVar('PKGDEST', d, 1)
        
        for pkg in packages:
-               icon_dir = '%s/install/%s/%s/icons/hicolor' % (workdir, pkg, bb.data.getVar('datadir', d, 1))
+               icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, bb.data.getVar('datadir', d, 1))
                if not os.path.exists(icon_dir):
                        continue
                
@@ -27,13 +40,13 @@ python populate_packages_append () {
                postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
                if not postinst:
                        postinst = '#!/bin/sh\n'
-               postinst += bb.data.getVar('gtk-icon-cache_postinst', d, 1)
+               postinst += bb.data.getVar('gtk_icon_cache_postinst', d, 1)
                bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
 
                postrm = bb.data.getVar('pkg_postrm_%s' % pkg, d, 1) or bb.data.getVar('pkg_postrm', d, 1)
                if not postrm:
                        postrm = '#!/bin/sh\n'
-               postrm += bb.data.getVar('gtk-icon-cache_postrm', d, 1)
+               postrm += bb.data.getVar('gtk_icon_cache_postrm', d, 1)
                bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d)
 }