webkit-gtk: update SRCREV

The layout of the repository has changed, so we need to account for that:

* fixed license checksums
* fixed SRC_URI
* fixed SRCREV_FORMAT

PCRE is gone, so no need for the dftables hack anymore

But most importantly, this fixes the crash issues when using javascript (e.g. github.com)

Tested on:

* usrp-e1xx/angstrom-2011.07

(From OE-Core rev: 7df4f5f3d64f1f60814cea60d83270be7bfa4f2c)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 21 insertions, 32 deletions

diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index af43ae896c..5eb9b2efc7 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -3,27 +3,23 @@ HOMEPAGE = "http://www.webkitgtk.org/"
 BUGTRACKER = "http://bugs.webkit.org/"
 
 LICENSE = "BSD & LGPLv2+"
-LIC_FILES_CHKSUM = "file://WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \
-                    file://WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
-                    file://JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90"
+LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \
+                    file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
+                    file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90"
 
 DEPENDS = "enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3"
 DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3"
 
-SRCREV_FORMAT = "webcore-rwebkit"
+SRCREV_FORMAT = "source"
 
-SRCREV = "72836"
-PV = "1.3.7+svnr${SRCPV}"
-PR = "r2"
+SRCREV = "90727"
+PV = "1.5.1+svnr${SRCPV}"
+PR = "r0"
 
 SRC_URI = "\
-  svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
-  svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \
-  svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http;name=webcore \
-  svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \
+  svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \
   svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \
-  svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \
-  svn://svn.webkit.org/repository/webkit/trunk/;module=autotools;proto=http \
+  svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;proto=http \
   file://Makefile \
   file://Makefile.shared \
   file://autogen.sh \
@@ -41,36 +37,29 @@ EXTRA_OECONF = "\
                 --enable-debug=no \
                 --enable-svg \
                 --enable-icon-database=yes \
-                --disable-fast-malloc \
+                --enable-fullscreen-api \
+                --enable-image-resizer \
+                --enable-link-prefetch \
+                UNICODE_CFLAGS=-D_REENTRANT \
                "
 
-EXTRA_AUTORECONF = " -I autotools "
+EXTRA_AUTORECONF = " -I Source/autotools "
 
-do_compile_prepend() {
-        mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
-        mkdir -p ${S}/Programs/
-        cd ${S}/JavaScriptCore/pcre
-        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/
-        cp dftables ${S}/Programs/        
-        cd ${S}
+do_configure_append() {
+        # somethings wrong with icu, fix it up manually
+        for makefile in $(find ${S} -name "GNUmakefile") ; do
+                sed -i s:-I/usr/include::g $makefile
+        done
 }
 
 do_install_prepend() {
-        cp ${S}/Programs/.libs/jsc ${S}/Programs/jsc-1 || true
+        cp ${S}/Programs/.libs/jsc ${S}/Programs/jsc-1 || true
 }
 
-
 PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore"
 FILES_${PN}launcher = "${bindir}/GtkLauncher"
 FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher"
-FILES_libjavascriptcore = "${libdir}/libJavaScriptCore.so.*"
+FILES_libjavascriptcore = "${libdir}/libjavascriptcoregtk-1.0.so.*"
 FILES_${PN}-webinspector = "${datadir}/webkitgtk-*/webinspector/"
 FILES_${PN} += "${datadir}/webkit-*/resources/error.html \
                 ${datadir}/webkitgtk-*/images \