]> code.ossystems Code Review - openembedded-core.git/commitdiff
gdk-pixbuf: export XDG_DATA_DIRS in wrappers
authorMing Liu <liu.ming50@gmail.com>
Sun, 3 Mar 2019 09:08:41 +0000 (10:08 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 4 Mar 2019 14:26:41 +0000 (14:26 +0000)
We need export XDG_DATA_DIRS to be ${STAGING_DATADIR} for gdk-pixbuf*
wrappers or else they will try to load mime from /usr/share/mime of the
host machine.

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb

index 448e8ab40e6f3b2c9f1245204e4741bc8202ef65..c5de7a92a5d44c4ce25e12bfff71aa8787d87a53 100644 (file)
@@ -112,19 +112,24 @@ do_install_append_class-native() {
        find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
 
        create_wrapper ${D}/${bindir}/gdk-pixbuf-csource \
+               XDG_DATA_DIRS=${STAGING_DATADIR} \
                GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
 
        create_wrapper ${D}/${bindir}/gdk-pixbuf-pixdata \
+               XDG_DATA_DIRS=${STAGING_DATADIR} \
                GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
 
        create_wrapper ${D}/${bindir}/gdk-pixbuf-print-mime-types \
+               XDG_DATA_DIRS=${STAGING_DATADIR} \
                GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
 
        create_wrapper ${D}/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \
+               XDG_DATA_DIRS=${STAGING_DATADIR} \
                GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \
                GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders
 
        create_wrapper ${D}/${bindir}/gdk-pixbuf-query-loaders \
+               XDG_DATA_DIRS=${STAGING_DATADIR} \
                GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \
                GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders
 }