webkit-gtk: add unstage task till Holger fixes qmake

diff --git a/packages/webkit/files/WebKit.pri b/packages/webkit/files/WebKit.pri
index 350c95d311072e4ec08f461519efe16cb38f0926..0c47afe7fdd4b32648de98feb2285f114b0ae13f 100644 (file)
--- a/packages/webkit/files/WebKit.pri
+++ b/packages/webkit/files/WebKit.pri
@@ -25,7 +25,7 @@ CONFIG(release) {
 
 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 \

diff --git a/packages/webkit/files/WebKit.pro b/packages/webkit/files/WebKit.pro
index 8536c415157baa32a7b104565c0478dccacf5265..dca261410919f2e31d21a3c260b78bf4cdccaf5c 100644 (file)
--- a/packages/webkit/files/WebKit.pro
+++ b/packages/webkit/files/WebKit.pro
@@ -1,15 +1,15 @@
 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 += \

diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb
index 35ab38a167b5c92c391d7b59f28d9854ca42f423..7ee08bf5abcd732ba96573adfc0c4fe7c05c3a2b 100644 (file)
--- a/packages/webkit/webkit-gtk_svn.bb
+++ b/packages/webkit/webkit-gtk_svn.bb
@@ -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"