webkit: fixes to get r28485 built

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3320 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/webkit/files/WebKit.pri b/meta/packages/webkit/files/WebKit.pri
index 0c47afe7fdd4b32648de98feb2285f114b0ae13f..514023de570e350fef16631ad1260dea8401afe6 100644 (file)
--- a/meta/packages/webkit/files/WebKit.pri
+++ b/meta/packages/webkit/files/WebKit.pri
@@ -33,7 +33,10 @@ gtk-port:INCLUDEPATH += \
     $$BASE_DIR/WebCore/loader/gtk \
     $$BASE_DIR/WebCore/page/gtk \
     $$BASE_DIR/WebKit/gtk/Api \
-    $$BASE_DIR/WebKit/gtk/WebCoreSupport
+    $$BASE_DIR/WebKit/gtk/WebView \
+    $$BASE_DIR/WebKit/gtk/WebCoreSupport \
+    $$BASE_DIR/JavaScriptCore/ForwardingHeaders \
+    $$BASE_DIR
 INCLUDEPATH += \
     $$BASE_DIR/JavaScriptCore/ \
     $$BASE_DIR/JavaScriptCore/kjs \

diff --git a/meta/packages/webkit/webkit.inc b/meta/packages/webkit/webkit.inc
index 2ff61091c3ffb3ccd332bc2e202969eb6b7916e0..81c2d91bf829b3d68f5ee51bb55d0afb54b69dbb 100644 (file)
--- a/meta/packages/webkit/webkit.inc
+++ b/meta/packages/webkit/webkit.inc
@@ -34,7 +34,13 @@ do_configure() {
 do_compile_prepend() {
        mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
        cd ${S}/JavaScriptCore/pcre 
-       ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
+       if test -e dftables.c
+       then
+           ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
+       elif test -e dftables.cpp
+       then
+           ${BUILD_CXX} dftables.cpp -o dftables -I. -I../wtf
+       fi
        cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
        cd ${S}/WebKitBuilds/Debug
 }