aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-10-03 14:14:28 -0700
committerChris Larson <chris_larson@mentor.com>2010-10-03 14:15:00 -0700
commitb2cecaa5bc3bc14803eb0ab71dd09c05225da6fb (patch)
tree93462da95916517463ab6e5c733ecf5e46c4f983
parent973c9d103c3b9737cc0121c3188644fa36f28e48 (diff)
downloadopenembedded-b2cecaa5bc3bc14803eb0ab71dd09c05225da6fb.tar.gz
openembedded-b2cecaa5bc3bc14803eb0ab71dd09c05225da6fb.tar.bz2
openembedded-b2cecaa5bc3bc14803eb0ab71dd09c05225da6fb.zip
Revert "gtk+-native: generate wrappers for relocation [v2]"
I give up.
-rw-r--r--recipes/gtk+/gtk+.inc10
1 files changed, 3 insertions, 7 deletions
diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc
index e25016c5e1..bb74d785de 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 = "r10"
+INC_PR = "r8"
inherit autotools pkgconfig
@@ -79,12 +79,8 @@ 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
- 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"'
+ 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"
}
postinst_prologue() {