[oe-commits] Richard Purdie : gdk-pixbuf: Only apply native cleaning in normal task, not setscene

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 2565cd67611573eff981005a5c520b6514a2c290
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2565cd67611573eff981005a5c520b6514a2c290

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Sat Sep 26 18:12:17 2015 +0100

gdk-pixbuf: Only apply native cleaning in normal task, not setscene

The previous fix works well for normal tasks since the ordering is always
correct and gdk-pixbuf-native comes first. Setscene ordering is reversed
so we can't rely on this there. Remove the fix in that case since
it breaks more than it solves.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb
index 2f0ca49..68f3850 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb
@@ -106,7 +106,7 @@ SSTATEPREINSTFUNCS_append_class-native = " gdkpixbuf_sstate_preinst"
 SYSROOT_PREPROCESS_FUNCS_append_class-native = " gdkpixbuf_sstate_preinst"
 
 gdkpixbuf_sstate_preinst() {
-	if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]; then
+	if [ "${BB_CURRENTTASK}" = "populate_sysroot" ]; then
 		rm -rf ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/*
 	fi
 }