From 8a12632e975d0efe71346b56202d19fe3f83ff08 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 25 Sep 2015 23:25:12 +0100 Subject: 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 Signed-off-by: Richard Purdie --- scripts/postinst-intercepts/update_icon_cache | 3 ++- scripts/postinst-intercepts/update_pixbuf_cache | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'scripts/postinst-intercepts') diff --git a/scripts/postinst-intercepts/update_icon_cache b/scripts/postinst-intercepts/update_icon_cache index 8e17a6ac0c..c02273d52a 100644 --- a/scripts/postinst-intercepts/update_icon_cache +++ b/scripts/postinst-intercepts/update_icon_cache @@ -1,8 +1,9 @@ #!/bin/sh set -e + # update native pixbuf loaders -gdk-pixbuf-query-loaders --update-cache +${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache for icondir in $D/usr/share/icons/*/ ; do if [ -d $icondir ] ; then diff --git a/scripts/postinst-intercepts/update_pixbuf_cache b/scripts/postinst-intercepts/update_pixbuf_cache index 95bf4f90a3..a8b4001069 100644 --- a/scripts/postinst-intercepts/update_pixbuf_cache +++ b/scripts/postinst-intercepts/update_pixbuf_cache @@ -4,8 +4,6 @@ export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders export GDK_PIXBUF_FATAL_LOADER=1 PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ - $D${bindir}/gdk-pixbuf-query-loaders \ + $D${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ >$GDK_PIXBUF_MODULEDIR/../loaders.cache && \ sed -i -e "s:$D::g" $GDK_PIXBUF_MODULEDIR/../loaders.cache - - -- cgit v1.2.3-54-g00ecf