gdk-pixbuf: move gdk-pixbuf-query-loaders to $libdir for multilib safety

If for example gdk-pixbuf and lib32-gdk-pixbuf are in an image then only one
${bindir}/gdk-pixbuf-query-loaders will be installed, so only one variant will
actually be usable.

Solve this by moving gdk-pixbuf-query-loaders into ${libdir} as it's intimately
tied to the library and rarely directly invoked by the user, and update the
callers to use the right path.

(From OE-Core rev: 69df75f268e2b3d5874f05e2b5a6125f6d990a03)

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

1 files changed, 9 insertions, 5 deletions

diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 12358e3aed..b005ab220b 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -4,12 +4,14 @@ DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk
 
 gtk_icon_cache_postinst() {
 if [ "x$D" != "x" ]; then
-        $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} mlprefix=${MLPREFIX} libdir=${libdir} \
-                base_libdir=${base_libdir}
+        $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \
+                mlprefix=${MLPREFIX} \
+                libdir=${libdir} \
+                STAGING_LIBDIR_NATIVE=${STAGING_LIBDIR_NATIVE}
 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 gdk-pixbuf-query-loaders --update-cache
+        GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders ${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
 
         for icondir in /usr/share/icons/* ; do
                 if [ -d $icondir ] ; then
@@ -21,8 +23,10 @@ fi
 
 gtk_icon_cache_postrm() {
 if [ "x$D" != "x" ]; then
-        $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} mlprefix=${MLPREFIX} libdir=${libdir} \
-                base_libdir=${base_libdir}
+        $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \
+                mlprefix=${MLPREFIX} \
+                libdir=${libdir} \
+                STAGING_LIBDIR_NATIVE=${STAGING_LIBDIR_NATIVE}
 else
         for icondir in /usr/share/icons/* ; do
                 if [ -d $icondir ] ; then