From 86822c3ae68dad2d25f4429221e76eb92dc0cdfe Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 1 Oct 2010 09:59:43 -0700 Subject: [PATCH] gtk+-native: generate wrappers for relocation [v2] Generate wrapper scripts for the gdk-pixbuf tools, to ensure they are using the correct paths into the sysroot. Signed-off-by: Chris Larson --- recipes/gtk+/gtk+.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc index bb74d785de..e25016c5e1 100644 --- a/recipes/gtk+/gtk+.inc +++ b/recipes/gtk+/gtk+.inc @@ -16,7 +16,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.bz2; file://xsettings.patch \ " -INC_PR = "r8" +INC_PR = "r10" inherit autotools pkgconfig @@ -79,8 +79,12 @@ do_install_virtclass-native () { install -d ${D}${sysconfdir}/gtk-2.0 rm -f ${D}${libdir}/gtk-2.0/*/*.la ${D}${libdir}/gtk-2.0/${LIBV}/*/*.la - mkdir -p "${D}${sysconfdir}/gtk-2.0" - ${B}/gdk-pixbuf/gdk-pixbuf-query-loaders ${B}/gdk-pixbuf/.libs/*.so | sed 's:${B}/gdk-pixbuf/.libs:${STAGING_LIBDIR}/gtk-2.0/${LIBV}/loaders:' > "${D}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders" + create_wrapper ${D}${bindir}/gdk-pixbuf-query-loaders \ + '"GDK_PIXBUF_MODULEDIR=${libdir}/gtk-2.0/${LIBV}/loaders"' + ${D}${bindir}/gdk-pixbuf-query-loaders > \ + "${D}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders" + create_wrapper ${D}${bindir}/gdk-pixbuf-csource \ + '"GDK_PIXBUF_MODULE_FILE=${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders"' } postinst_prologue() { -- 2.39.5