From 48bc6e67b38a64f6a6c065ec15f02d042fea8c45 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 21 Oct 2007 12:56:09 +0000
Subject: packages/webkit: Build the Qt/Qtopia port of WebKit as well.    
 Unifiy the WebKit recipe and allow to build the Gtk+, Qt     and Qtopia port.
 Add classes/qtopia4core.bbclass to assist     building for Qtopia. Change the
 WebKit.pro to currently not     build the testkjs and DumpRenderTree test
 utilities.

---
 packages/webkit/webkit-gtk_svn.bb | 60 ++++++---------------------------------
 1 file changed, 8 insertions(+), 52 deletions(-)

(limited to 'packages/webkit/webkit-gtk_svn.bb')

diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb
index 208ec25719..4722999949 100644
--- a/packages/webkit/webkit-gtk_svn.bb
+++ b/packages/webkit/webkit-gtk_svn.bb
@@ -1,42 +1,13 @@
-DEPENDS = "flex-native gperf-native gperf perl-native curl icu libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
-SRCREV_FORMAT = "webcore-rwebkit"
+DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+"
 
-# Yes, this is wrong...
-PV = "0.0+svnr${SRCREV}"
-PR = "r1"
-
-inherit qmake2 pkgconfig
-
-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=WebKitLibraries;proto=http \
-#  svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitQt;proto=http \
-  svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \
-  file://Makefile \
-  file://Makefile.shared \
-  file://WebKit.pri \
-  file://WebKit.pro \
-"
-S = "${WORKDIR}/"
+WEBKIT_PORT = "gtk-port"
+WEBKIT_EXTRA_OPTIONS = "CONFIG-=qt"
+PACKAGES =+ "webkit-gtklauncher-dbg webkit-gtklauncher"
 
-do_configure() {
-	qmake2 -spec ${QMAKESPEC} CONFIG+=gtk-port CONFIG-=qt CONFIG-=release CONFIG+=debug
-	mkdir -p WebKitBuilds/Debug
-	cd WebKitBuilds/Debug
-	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gtk-port $PWD/../../WebKit.pro \
-      WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir}
-}
+FILES_webkit-gtklauncher = "${bindir}/GtkLauncher"
+FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher"
 
-do_compile_prepend() {
-	mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
-	cd ${S}/JavaScriptCore/pcre 
-	${BUILD_CC} dftables.c -o dftables -I. -I../wtf
-	cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
-	cd ${S}/WebKitBuilds/Debug
-}
+require webkit.inc
 
 do_install() {
 	install -d ${D}${bindir}
@@ -45,22 +16,7 @@ do_install() {
 
 	install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GtkLauncher/GtkLauncher ${D}${bindir}
 	cd ${S}/WebKitBuilds/Debug
-	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gtk-port $PWD/../../WebKit.pro \
-      WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir}
+	PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir} $PWD/../../WebKit.pro
 	oe_runmake install
 }
 
-do_stage() {
-	install -d ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}
-	cd ${S}/WebKitBuilds/Debug
-	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gtk-port $PWD/../../WebKit.pro \
-      WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR}
-	oe_runmake install
-}
-
-
-PACKAGES =+ "webkit-gtklauncher-dbg webkit-gtklauncher"
-
-FILES_webkit-gtklauncher = "${bindir}/GtkLauncher"
-FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher"
-- 
cgit v1.2.3