[oe-commits] org.oe.dev webkit-gtk: add unstage task till Holger fixes qmake

[koen commit]

webkit-gtk: add unstage task till Holger fixes qmake

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: af07f0d92402bfd1398dd1c0226d4bd0739aa07d
ViewMTN: http://monotone.openembedded.org/revision/info/af07f0d92402bfd1398dd1c0226d4bd0739aa07d
Files:
1
packages/webkit/files/WebKit.pri
packages/webkit/files/WebKit.pro
packages/webkit/webkit-gtk_svn.bb
Diffs:

#
# mt diff -r19b66854768981b0022f496f53032a111dbcf182 -raf07f0d92402bfd1398dd1c0226d4bd0739aa07d
#
# 
# 
# patch "packages/webkit/files/WebKit.pri"
#  from [d4f18e0823c66401beee4dbbcd1fc56aff2946b9]
#    to [076f1c82b227a8d1472f9fa12e2fee65bd0c833c]
# 
# patch "packages/webkit/files/WebKit.pro"
#  from [7fde7771b08345471dc5a3ad308348efcc505e0f]
#    to [3fcda9c52630ed394b0c75da8bd0ab4d43099125]
# 
# patch "packages/webkit/webkit-gtk_svn.bb"
#  from [a62c3f3db6387db3b0fc192bcde946966eca90f5]
#    to [a5d1816993bda7f08a6373ea5b6a96c9f018f11a]
# 
============================================================
--- packages/webkit/files/WebKit.pri	d4f18e0823c66401beee4dbbcd1fc56aff2946b9
+++ packages/webkit/files/WebKit.pri	076f1c82b227a8d1472f9fa12e2fee65bd0c833c
@@ -25,7 +25,7 @@ qt-port:INCLUDEPATH += \
 
 BASE_DIR = $$PWD
 qt-port:INCLUDEPATH += \
-    $$PWD/WebKitQt/Api
+    $$PWD/WebKit/qt/Api
 gtk-port:INCLUDEPATH += \
     $$BASE_DIR/WebCore/platform/gtk \
     $$BASE_DIR/WebCore/platform/network/curl \
============================================================
--- packages/webkit/files/WebKit.pro	7fde7771b08345471dc5a3ad308348efcc505e0f
+++ packages/webkit/files/WebKit.pro	3fcda9c52630ed394b0c75da8bd0ab4d43099125
@@ -1,15 +1,15 @@ CONFIG += ordered
 TEMPLATE = subdirs
 CONFIG += ordered
 !gtk-port:CONFIG += qt-port
-qt-port:!win32-*:SUBDIRS += WebKitQt/Plugins
+qt-port:!win32-*:SUBDIRS += WebKit/qt/Plugins
 SUBDIRS += \
         WebCore \
         JavaScriptCore/kjs/testkjs.pro
 
 qt-port {
-    SUBDIRS += WebKitQt/QtLauncher
+    SUBDIRS += WebKit/qt/QtLauncher
 
-    !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
+    !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
 }
 
 gtk-port:SUBDIRS += \
============================================================
--- packages/webkit/webkit-gtk_svn.bb	a62c3f3db6387db3b0fc192bcde946966eca90f5
+++ packages/webkit/webkit-gtk_svn.bb	a5d1816993bda7f08a6373ea5b6a96c9f018f11a
@@ -59,6 +59,14 @@ do_stage() {
 	oe_runmake install
 }
 
+
+# Noooooooooooooooooooooooooooooooooooooooooooo...
+do_unstage() {
+        rm ${STAGING_LIBDIR}/libWebKitG* || true
+}
+
+addtask unstage before do_configure
+
 PACKAGES =+ "webkit-gtklauncher-dbg webkit-gtklauncher"
 
 FILES_webkit-gtklauncher = "${bindir}/GtkLauncher"