gtk-icon-cache/pixbufcache: don't set GDK_PIXBUF_MODULEDIR

In normal use gdk-pixbuf knows where to find its own loaders and explicitly
stating this will cause work in the future if the ABI version changes.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index b005ab220b9e0bcda2083f18766225c513379aa2..6195fa4526f9fa2026c3830a82b75edd62f31b5a 100644 (file)
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -11,7 +11,7 @@ if [ "x$D" != "x" ]; then
 else
 
        # Update the pixbuf loaders in case they haven't been registered yet
-       GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders ${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
+       ${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
 
        for icondir in /usr/share/icons/* ; do
                if [ -d $icondir ] ; then

diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass
index 18fd9fa68db4d828fff381033d83b34aa18a5227..dbe11e12da9f565a0a172ea53989742e78ffd17a 100644 (file)
--- a/meta/classes/pixbufcache.bbclass
+++ b/meta/classes/pixbufcache.bbclass
@@ -15,7 +15,7 @@ if [ "x$D" != "x" ]; then
 else
 
        # Update the pixbuf loaders in case they haven't been registered yet
-       GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders ${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
+       ${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
 
        if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then
                for icondir in /usr/share/icons/*; do