[oe-commits] org.oe.dev webkit update: update webkit srcrevs, add midori 0.13, bump openmoko-feedreader2 and openmoko-browser2

koen commit openembedded-commits at lists.openembedded.org
Wed Dec 12 19:45:01 UTC 2007 

webkit update: update webkit srcrevs, add midori 0.13, bump openmoko-feedreader2 and openmoko-browser2

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 676667f842616031c72d72d4fb59ca7629da63ba
ViewMTN: http://monotone.openembedded.org/revision/info/676667f842616031c72d72d4fb59ca7629da63ba
Files:
1
packages/gtk-webcore/midori_0.0.13.bb
conf/distro/include/sane-srcrevs.inc
packages/webkit/files/WebKit.pri
packages/webkit/files/WebKit.pro
packages/webkit/webkit-gtk_svn.bb
packages/webkit/webkit.inc
Diffs:

#
# mt diff -ra5273f9ba29f4a35736114e9e3071b6c816eade1 -r676667f842616031c72d72d4fb59ca7629da63ba
#
# 
# 
# add_file "packages/gtk-webcore/midori_0.0.13.bb"
#  content [248eb3a40d4c7bdb50c581812cdbeaeb356a89fd]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [8cad7fba1595a9a46320eb14f7b63799769241ec]
#    to [07b627e17e9ef591c5ada94c502a4e67b77e885c]
# 
# patch "packages/webkit/files/WebKit.pri"
#  from [726a1ee310aab248d05af53c1fa7555aa715373b]
#    to [0e5c15ab2a6b4b986f311f4e0c55573ebf80191e]
# 
# patch "packages/webkit/files/WebKit.pro"
#  from [dd444c86e92aeb8c404efbd945a61ec54293c346]
#    to [ecf886ef5178fc86bdf74101c5bb563cb326002b]
# 
# patch "packages/webkit/webkit-gtk_svn.bb"
#  from [c0ce29031b9ded3d0204821c21fb86c02d56aa73]
#    to [2b24d6f59232655003cc23519603a66cec5aca93]
# 
# patch "packages/webkit/webkit.inc"
#  from [a9b135977d33b8fecb08b3e6b9ca8bae313ed7e2]
#    to [1b435431285f60a2f3bb6f118ed12807b76bee80]
# 
============================================================
--- packages/gtk-webcore/midori_0.0.13.bb	248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
+++ packages/gtk-webcore/midori_0.0.13.bb	248eb3a40d4c7bdb50c581812cdbeaeb356a89fd
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ 
+          "
+
+
============================================================
--- conf/distro/include/sane-srcrevs.inc	8cad7fba1595a9a46320eb14f7b63799769241ec
+++ conf/distro/include/sane-srcrevs.inc	07b627e17e9ef591c5ada94c502a4e67b77e885c
@@ -62,7 +62,7 @@ SRCREV_pn-openmoko-appmanager2 ?= "3442"
 SRCREV_pn-openmoko-appearance ?= "3239"
 SRCREV_pn-openmoko-appmanager ?= "1851"
 SRCREV_pn-openmoko-appmanager2 ?= "3442"
-SRCREV_pn-openmoko-browser2 ?= "3249"
+SRCREV_pn-openmoko-browser2 ?= "3646"
 SRCREV_pn-openmoko-calculator ?= "2404"
 SRCREV_pn-openmoko-calculator2 ?= "3235"
 SRCREV_pn-openmoko-common ?= "397"
@@ -73,7 +73,7 @@ SRCREV_pn-openmoko-dialer2 ?= "3522"
 SRCREV_pn-openmoko-dates2 ?= "661"
 SRCREV_pn-openmoko-dialer ?= "2811"
 SRCREV_pn-openmoko-dialer2 ?= "3522"
-SRCREV_pn-openmoko-feedreader2 ?= "3080"
+SRCREV_pn-openmoko-feedreader2 ?= "3645"
 SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "3158"
 SRCREV_pn-openmoko-footer ?= "2354"
@@ -121,9 +121,9 @@ SRCREV_pn-tmut ?= "60"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
 SRCREV_pn-tmut ?= "60"
-SRCREV_pn-webkit-gtk ?= "27222"
-SRCREV_pn-webkit-qt ?= "27222"
-SRCREV_pn-webkit-qtopia ?= "27222"
+SRCREV_pn-webkit-gtk ?= "28656"
+SRCREV_pn-webkit-qt ?= "28656"
+SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
 SRCREV_pn-xoo ?= "1623"
 SRCREV_pn-mplayer ?= "24587"
============================================================
--- packages/webkit/files/WebKit.pri	726a1ee310aab248d05af53c1fa7555aa715373b
+++ packages/webkit/files/WebKit.pri	0e5c15ab2a6b4b986f311f4e0c55573ebf80191e
@@ -11,13 +11,48 @@ qt-port:!building-libs {
 qt-port:!building-libs {
     QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
     LIBS += -lQtWebKit
+    DEPENDPATH += $$PWD/WebKit/qt/Api
 }
-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 
 
+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
+}
+
 DEFINES += USE_SYSTEM_MALLOC
 CONFIG(release) {
     DEFINES += NDEBUG
@@ -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/ \
============================================================
--- packages/webkit/files/WebKit.pro	dd444c86e92aeb8c404efbd945a61ec54293c346
+++ packages/webkit/files/WebKit.pro	ecf886ef5178fc86bdf74101c5bb563cb326002b
@@ -1,11 +1,17 @@ SUBDIRS += \
 TEMPLATE = subdirs
 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
+qt-port {
+    SUBDIRS += WebKit/qt/QtLauncher
+
+    !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
+}
+
 gtk-port:SUBDIRS += \
+        WebKitTools/GtkLauncher \
+        WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro
-        WebKitTools/GtkLauncher
============================================================
--- packages/webkit/webkit-gtk_svn.bb	c0ce29031b9ded3d0204821c21fb86c02d56aa73
+++ packages/webkit/webkit-gtk_svn.bb	2b24d6f59232655003cc23519603a66cec5aca93
@@ -1,6 +1,9 @@ DEPENDS = "curl icu libxml2 cairo libxsl
 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"
 
============================================================
--- packages/webkit/webkit.inc	a9b135977d33b8fecb08b3e6b9ca8bae313ed7e2
+++ packages/webkit/webkit.inc	1b435431285f60a2f3bb6f118ed12807b76bee80
@@ -34,7 +34,13 @@ do_compile_prepend() {
 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
 }

More information about the Openembedded-commits mailing list