diff options
author | Ming Liu <liu.ming50@gmail.com> | 2019-03-03 10:08:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-04 14:27:06 +0000 |
commit | 8293060f8e0436733d41f34754ae44ecb6c100ae (patch) | |
tree | 895f297775ce5f713df107d1c4e0840e8e68323a /meta/recipes-gnome/gdk-pixbuf | |
parent | d3c7d1a0366c12e576bc015449928ac96c78ca18 (diff) | |
download | poky-8293060f8e0436733d41f34754ae44ecb6c100ae.tar.gz |
gdk-pixbuf: export XDG_DATA_DIRS in wrappers
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.
(From OE-Core rev: de2848be1b04cf1ff1e0147114f5214be8225877)
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf')
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb index 448e8ab40e..c5de7a92a5 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb | |||
@@ -112,19 +112,24 @@ do_install_append_class-native() { | |||
112 | find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \; | 112 | find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \; |
113 | 113 | ||
114 | create_wrapper ${D}/${bindir}/gdk-pixbuf-csource \ | 114 | create_wrapper ${D}/${bindir}/gdk-pixbuf-csource \ |
115 | XDG_DATA_DIRS=${STAGING_DATADIR} \ | ||
115 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache | 116 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache |
116 | 117 | ||
117 | create_wrapper ${D}/${bindir}/gdk-pixbuf-pixdata \ | 118 | create_wrapper ${D}/${bindir}/gdk-pixbuf-pixdata \ |
119 | XDG_DATA_DIRS=${STAGING_DATADIR} \ | ||
118 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache | 120 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache |
119 | 121 | ||
120 | create_wrapper ${D}/${bindir}/gdk-pixbuf-print-mime-types \ | 122 | create_wrapper ${D}/${bindir}/gdk-pixbuf-print-mime-types \ |
123 | XDG_DATA_DIRS=${STAGING_DATADIR} \ | ||
121 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache | 124 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache |
122 | 125 | ||
123 | create_wrapper ${D}/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ | 126 | create_wrapper ${D}/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ |
127 | XDG_DATA_DIRS=${STAGING_DATADIR} \ | ||
124 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \ | 128 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \ |
125 | GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders | 129 | GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders |
126 | 130 | ||
127 | create_wrapper ${D}/${bindir}/gdk-pixbuf-query-loaders \ | 131 | create_wrapper ${D}/${bindir}/gdk-pixbuf-query-loaders \ |
132 | XDG_DATA_DIRS=${STAGING_DATADIR} \ | ||
128 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \ | 133 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \ |
129 | GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders | 134 | GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders |
130 | } | 135 | } |