summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-05-17 09:54:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-24 14:06:58 +0100
commit3a7625c23b3fbd163dcd4036767b194438ec238d (patch)
tree1f77d01ff33c66c361bc3d30c3b276ed10b06f17 /meta/recipes-gnome
parent7cbde5d8f2b88ec4e79cb0d564ee0f3c9baa7c2d (diff)
downloadopenembedded-core-3a7625c23b3fbd163dcd4036767b194438ec238d.tar.gz
openembedded-core-3a7625c23b3fbd163dcd4036767b194438ec238d.tar.bz2
openembedded-core-3a7625c23b3fbd163dcd4036767b194438ec238d.zip
gdk-pixbuf: remove native loader cache generation, use the class
We assumed that the only relevant gdk-pixbuf loaders in the native environment were the ones in gdk-pixbuf itself, as the icon cache is only for PNG files. However, glib-compile-resources can transform SVG files to raw image data, and done natively this requires the SVG loader to be registered. The current implementation relies on this assumption by generating the cache based on the staging directory during install, so if gdk-pixbuf-native is re-installed to the sysroot after librsvg-native it will overwrite the loader cache. So, remove the code in do_install that updated the cache, and rely on the new logic in pixbufcache.bbclass that updates the cache when it's installed into the sysroot itself. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb3
1 files changed, 0 insertions, 3 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb
index b35f7c666a..b85bbaf58c 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb
@@ -69,9 +69,6 @@ python populate_packages_prepend () {
}
do_install_append_class-native() {
-#Use wrapper script rather than binary as required libtool library is not installed now
- GDK_PIXBUF_MODULEDIR=${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders ${B}/gdk-pixbuf/gdk-pixbuf-query-loaders > ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
- sed -i -e 's#${D}##g' ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
create_wrapper ${D}/${bindir}/gdk-pixbuf-csource \