summaryrefslogtreecommitdiff
path: root/packages/webkit
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-12-12 19:31:56 +0000
committerKoen Kooi <koen@openembedded.org>2007-12-12 19:31:56 +0000
commit7d3280d01628b7f8f814b80e6d19ed76fc198b99 (patch)
treeaa8ebd257f49ec7fabe87567d4ad4c8ec457ceeb /packages/webkit
parent95eea93a5dcaebe465be4ed2b7211c990d1053b8 (diff)
webkit update: update webkit srcrevs, add midori 0.13, bump openmoko-feedreader2 and openmoko-browser2
Diffstat (limited to 'packages/webkit')
-rw-r--r--packages/webkit/files/WebKit.pri47
-rw-r--r--packages/webkit/files/WebKit.pro14
-rw-r--r--packages/webkit/webkit-gtk_svn.bb3
-rw-r--r--packages/webkit/webkit.inc8
4 files changed, 61 insertions, 11 deletions
diff --git a/packages/webkit/files/WebKit.pri b/packages/webkit/files/WebKit.pri
index f672790d26..640fa34174 100644
--- a/packages/webkit/files/WebKit.pri
+++ b/packages/webkit/files/WebKit.pri
@@ -11,12 +11,47 @@ qt-port:DEFINES += BUILDING_QT__=1
qt-port:!building-libs {
QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
LIBS += -lQtWebKit
+ DEPENDPATH += $$PWD/WebKit/qt/Api
+}
+
+gtk-port:!building-libs {
+ QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
+ LIBS += -lWebKitGtk
+ DEPENDPATH += $$PWD/WebKit/gtk/WebView $$PWD/WebKit/gtk/WebCoreSupport
+}
+
+gtk-port {
+ CONFIG += link_pkgconfig
+
+ DEFINES += BUILDING_CAIRO__=1 BUILDING_GTK__=1
+
+ # We use FreeType directly with Cairo
+ PKGCONFIG += cairo-ft
+
+ directfb: PKGCONFIG += cairo-directfb gtk+-directfb-2.0
+ else: PKGCONFIG += cairo gtk+-2.0
+
+ # Set a CONFIG flag for the GTK+ target (x11, quartz, win32, directfb)
+ CONFIG += $$system(pkg-config --variable=target $$PKGCONFIG)
+
+ # We use the curl http backend on all platforms
+ PKGCONFIG += libcurl
+
+ LIBS += -lWebKitGtk -ljpeg -lpng
+
+ QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
+ QMAKE_LIBS += $$system(icu-config --ldflags)
+
+ # This set of warnings is borrowed from the Mac build
+ QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef
+
+ # These flags are based on optimization experience from the Mac port:
+ # Helps code size significantly and speed a little
+ QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
+
+ DEPENDPATH += $$PWD/JavaScriptCore/API
+ INCLUDEPATH += $$PWD
}
-gtk-port:CONFIG += link_pkgconfig
-gtk-port:PKGCONFIG += cairo cairo-ft gdk-2.0 gtk+-2.0 libcurl
-gtk-port:DEFINES += BUILDING_GTK__=1 BUILDING_CAIRO__
-gtk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGtk $$system(icu-config --ldflags) -ljpeg -lpng
-gtk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags) -fno-exceptions -fno-rtti
DEFINES += USE_SYSTEM_MALLOC
CONFIG(release) {
@@ -32,7 +67,7 @@ gtk-port:INCLUDEPATH += \
$$BASE_DIR/WebCore/platform/graphics/cairo \
$$BASE_DIR/WebCore/loader/gtk \
$$BASE_DIR/WebCore/page/gtk \
- $$BASE_DIR/WebKit/gtk/Api \
+ $$BASE_DIR/WebKit/gtk/WebView \
$$BASE_DIR/WebKit/gtk/WebCoreSupport
INCLUDEPATH += \
$$BASE_DIR/JavaScriptCore/ \
diff --git a/packages/webkit/files/WebKit.pro b/packages/webkit/files/WebKit.pro
index aab0209a93..027017bd8d 100644
--- a/packages/webkit/files/WebKit.pro
+++ b/packages/webkit/files/WebKit.pro
@@ -3,9 +3,15 @@ CONFIG += ordered
!gtk-port:CONFIG += qt-port
qt-port:!win32-*:SUBDIRS += WebKit/qt/Plugins
SUBDIRS += \
- WebCore
+ WebCore \
+ JavaScriptCore/kjs/testkjs.pro
+
+qt-port {
+ SUBDIRS += WebKit/qt/QtLauncher
+
+ !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
+}
-qt-port:SUBDIRS += \
- WebKit/qt/QtLauncher
gtk-port:SUBDIRS += \
- WebKitTools/GtkLauncher
+ WebKitTools/GtkLauncher \
+ WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro
diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb
index 608a4d2a5c..c726020d1a 100644
--- a/packages/webkit/webkit-gtk_svn.bb
+++ b/packages/webkit/webkit-gtk_svn.bb
@@ -1,5 +1,8 @@
DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+"
+# If you activate HTML5 media support (ENABLE_VIDEO=1) you'll need:
+# DEPENDS += " gstreamer gst-plugins-base gnome-vfs "
+
WEBKIT_PORT = "gtk-port"
WEBKIT_EXTRA_OPTIONS = "CONFIG-=qt"
diff --git a/packages/webkit/webkit.inc b/packages/webkit/webkit.inc
index 2ff61091c3..81c2d91bf8 100644
--- a/packages/webkit/webkit.inc
+++ b/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
}