summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-09-25 23:43:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-28 12:00:17 +0100
commitc356961f155063200dc2be73cd416f62945c2972 (patch)
tree39d1678c4ac0c71f2fd59674446d2e272b02e86f /meta
parent4a36842f7f39f63c0e6e3623164161987c71f788 (diff)
downloadpoky-c356961f155063200dc2be73cd416f62945c2972.tar.gz
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. (From OE-Core rev: 87eea290a799be0e852d8b3c357879680abedb77) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/gtk-icon-cache.bbclass2
-rw-r--r--meta/classes/pixbufcache.bbclass2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index b005ab220b..6195fa4526 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -11,7 +11,7 @@ if [ "x$D" != "x" ]; then
11else 11else
12 12
13 # Update the pixbuf loaders in case they haven't been registered yet 13 # Update the pixbuf loaders in case they haven't been registered yet
14 GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders ${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache 14 ${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
15 15
16 for icondir in /usr/share/icons/* ; do 16 for icondir in /usr/share/icons/* ; do
17 if [ -d $icondir ] ; then 17 if [ -d $icondir ] ; then
diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass
index 18fd9fa68d..dbe11e12da 100644
--- a/meta/classes/pixbufcache.bbclass
+++ b/meta/classes/pixbufcache.bbclass
@@ -15,7 +15,7 @@ if [ "x$D" != "x" ]; then
15else 15else
16 16
17 # Update the pixbuf loaders in case they haven't been registered yet 17 # Update the pixbuf loaders in case they haven't been registered yet
18 GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders ${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache 18 ${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
19 19
20 if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then 20 if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then
21 for icondir in /usr/share/icons/*; do 21 for icondir in /usr/share/icons/*; do