From 48bc6e67b38a64f6a6c065ec15f02d042fea8c45 Mon Sep 17 00:00:00 2001 From: Holger Freyther 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.inc | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 packages/webkit/webkit.inc (limited to 'packages/webkit/webkit.inc') diff --git a/packages/webkit/webkit.inc b/packages/webkit/webkit.inc new file mode 100644 index 0000000000..c20fc57c93 --- /dev/null +++ b/packages/webkit/webkit.inc @@ -0,0 +1,48 @@ +DEPENDS += "flex-native gperf-native perl-native sqlite3" +SRCREV_FORMAT = "webcore-rwebkit" + +# 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=WebKitTools;proto=http \ + file://Makefile \ + file://Makefile.shared \ + file://WebKit.pri \ + file://WebKit.pro \ +" +S = "${WORKDIR}/" + +WEBKIT_QMAKE = "qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ ${WEBKIT_EXTRA_OPTIONS} CONFIG+=${WEBKIT_PORT}" + +do_configure() { + qmake2 -spec ${QMAKESPEC} CONFIG+=${WEBKIT_PORT} ${WEBKIT_EXTRA_OPTIONS} CONFIG-=release CONFIG+=debug + mkdir -p WebKitBuilds/Debug + cd WebKitBuilds/Debug + PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir} $PWD/../../WebKit.pro +} + +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 +} + +do_stage() { + install -d ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR} + cd ${S}/WebKitBuilds/Debug + PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR} $PWD/../../WebKit.pro + oe_runmake install +} + -- cgit v1.2.3 From 1f9d1e13d95e330d7bd47183eeb4ce7d098431aa Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 23 Oct 2007 15:02:18 +0000 Subject: packages/webkit: The API/ABI of WebKit/Gtk+ has changed, update the PV -Also update the openmoko recipes depending on WebKit/Gtk+, this doesn't add versioned DEPENDS because it is not obvious how they should work with SRCREV. -This should cure some symptoms from http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=943 --- packages/webkit/webkit.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/webkit/webkit.inc') diff --git a/packages/webkit/webkit.inc b/packages/webkit/webkit.inc index c20fc57c93..a80813f072 100644 --- a/packages/webkit/webkit.inc +++ b/packages/webkit/webkit.inc @@ -2,7 +2,7 @@ DEPENDS += "flex-native gperf-native perl-native sqlite3" SRCREV_FORMAT = "webcore-rwebkit" # Yes, this is wrong... -PV = "0.0+svnr${SRCREV}" +PV = "0.1+svnr${SRCREV}" PR = "r1" inherit qmake2 pkgconfig -- cgit v1.2.3 From 279d19cb2b497fd1168adfc5fa5008e11e10a538 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Thu, 25 Oct 2007 22:45:56 +0000 Subject: packages/webkit: Build and package naming fixes (when using debian renaming) We do not want the package to be named libwebkitgtk-launcher but want to keep the webkit-gtklauncher names. The same applies to Qt and Qtopia. Use my Gtk+ API defines for the WebKit/Qt port as well. --- packages/webkit/webkit.inc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'packages/webkit/webkit.inc') diff --git a/packages/webkit/webkit.inc b/packages/webkit/webkit.inc index a80813f072..a04b565973 100644 --- a/packages/webkit/webkit.inc +++ b/packages/webkit/webkit.inc @@ -1,9 +1,10 @@ DEPENDS += "flex-native gperf-native perl-native sqlite3" SRCREV_FORMAT = "webcore-rwebkit" +PACKAGES =+ "${PN}launcher-dbg ${PN}launcher" + # Yes, this is wrong... PV = "0.1+svnr${SRCREV}" -PR = "r1" inherit qmake2 pkgconfig @@ -46,3 +47,11 @@ do_stage() { oe_runmake install } +python populate_packages_prepend() { + print "foooo" + print bb.data.getVar("DEBIAN_NAMES", d, True) + if bb.data.getVar("DEBIAN_NAMES", d, True): + base = bb.data.expand("${PN}launcher", d, True) + bb.data.setVar("PKG_%s" % base, base, d) + bb.data.setVar("PKG_%s-dbg" % base, "%s-dbg" % base, d) +} -- cgit v1.2.3 From 6bb9ce24b353f50be7196ea15240a1ae7d8c2813 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 29 Oct 2007 14:07:28 +0000 Subject: packages/webkit/webkit.inc: Allow debian package renaming again -Remove the code that disabled debian package renaming as of koen's mail. -Don't bump the PR as the libraries have not changed, and webkit-gtklauncher and libwebkitgtklauncher have nothing in common but the same files ;) --- packages/webkit/webkit.inc | 8 -------- 1 file changed, 8 deletions(-) (limited to 'packages/webkit/webkit.inc') diff --git a/packages/webkit/webkit.inc b/packages/webkit/webkit.inc index a04b565973..2ff61091c3 100644 --- a/packages/webkit/webkit.inc +++ b/packages/webkit/webkit.inc @@ -47,11 +47,3 @@ do_stage() { oe_runmake install } -python populate_packages_prepend() { - print "foooo" - print bb.data.getVar("DEBIAN_NAMES", d, True) - if bb.data.getVar("DEBIAN_NAMES", d, True): - base = bb.data.expand("${PN}launcher", d, True) - bb.data.setVar("PKG_%s" % base, base, d) - bb.data.setVar("PKG_%s-dbg" % base, "%s-dbg" % base, d) -} -- cgit v1.2.3