[oe-commits] org.oe.dev webkit: first attempt at fixing the dftables problem (http://bugs.webkit.org/show_bug.cgi?id=14744)

[koen commit]

webkit: first attempt at fixing the dftables problem (http://bugs.webkit.org/show_bug.cgi?id=14744)

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 49620a480a3c8deee05068287aa90bf723508c27
ViewMTN: http://monotone.openembedded.org/revision.psp?id=49620a480a3c8deee05068287aa90bf723508c27
Files:
1
packages/webkit/webkit/WebKit.pri
packages/webkit/webkit/WebKit.pro
packages/webkit/webkit_svn.bb
Diffs:

#
# mt diff -rc52428092b0739e47ca366526bbc7fb05db0b368 -r49620a480a3c8deee05068287aa90bf723508c27
#
# 
# 
# patch "packages/webkit/webkit/WebKit.pri"
#  from [94510fbc949e86f0ce4710c19900c4a6a8c163a9]
#    to [8dbdde1c26386f94aaaad0b70b380b22fe554a69]
# 
# patch "packages/webkit/webkit/WebKit.pro"
#  from [63fd1bd947de2d3abe6a011685e6173bf0a804e1]
#    to [c4db9377c267835f4ec934a4d53207e26c25b99c]
# 
# patch "packages/webkit/webkit_svn.bb"
#  from [a579828b28b3be2c2c2b36f20643de557f0778dc]
#    to [124f784a2e32f48ff79dc926a9bb0db2d47fcf66]
# 
============================================================
--- packages/webkit/webkit/WebKit.pri	94510fbc949e86f0ce4710c19900c4a6a8c163a9
+++ packages/webkit/webkit/WebKit.pri	8dbdde1c26386f94aaaad0b70b380b22fe554a69
@@ -28,7 +28,9 @@ gdk-port:INCLUDEPATH += \
     $$BASE_DIR/WebCore/platform/network/curl \
     $$BASE_DIR/WebCore/platform/graphics/cairo \
     $$BASE_DIR/WebCore/loader/gdk \
-    $$BASE_DIR/WebCore/page/gdk
+    $$BASE_DIR/WebCore/page/gdk \
+    $$BASE_DIR/WebKit/gtk/Api \
+    $$BASE_DIR/WebKit/gtk/WebCoreSupport
 INCLUDEPATH += \
     $$BASE_DIR/JavaScriptCore/ \
     $$BASE_DIR/JavaScriptCore/kjs \
============================================================
--- packages/webkit/webkit/WebKit.pro	63fd1bd947de2d3abe6a011685e6173bf0a804e1
+++ packages/webkit/webkit/WebKit.pro	c4db9377c267835f4ec934a4d53207e26c25b99c
@@ -1,9 +1,8 @@ SUBDIRS += \
 TEMPLATE = subdirs
 CONFIG += ordered
 !gdk-port:CONFIG += qt-port
 qt-port:SUBDIRS += WebKitQt/Plugins
 SUBDIRS += \
-        JavaScriptCore/pcre/dftables.pro \
         WebCore \
         JavaScriptCore/kjs/testkjs.pro
 
============================================================
--- packages/webkit/webkit_svn.bb	a579828b28b3be2c2c2b36f20643de557f0778dc
+++ packages/webkit/webkit_svn.bb	124f784a2e32f48ff79dc926a9bb0db2d47fcf66
@@ -1,4 +1,4 @@
-DEPENDS = "flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
+DEPENDS = "libpcre flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
 
 # Yes, this is wrong...
 PV = "0.0+svn${SRCDATE}"
@@ -31,7 +31,9 @@ do_compile_prepend() {
 }
 
 do_compile_prepend() {
-        cd ${S}/WebKitBuilds/Debug
+         mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+	 cp ${STAGING_BINDIR_NATIVE}/dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+         cd ${S}/WebKitBuilds/Debug
 }
 
 do_install() {