summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/include/sane-srcrevs.inc2
-rw-r--r--recipes/webkit/webkit-gtk/GNUmakefile.am22
-rw-r--r--recipes/webkit/webkit-gtk/WebKit.pri28
-rw-r--r--recipes/webkit/webkit-gtk/WebKit.pro7
-rw-r--r--recipes/webkit/webkit-gtk/acinclude.m40
-rw-r--r--recipes/webkit/webkit-gtk/configure.ac68
-rw-r--r--recipes/webkit/webkit-gtk/symbols.filter5
-rw-r--r--recipes/webkit/webkit-gtk/unicode-fixes.diff22
-rw-r--r--recipes/webkit/webkit-gtk/update-webkit.sh2
-rw-r--r--recipes/webkit/webkit-gtk_svn.bb6
10 files changed, 97 insertions, 65 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index faa8c4d2a8..e16ab3eb8b 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -254,7 +254,7 @@ SRCREV_pn-usbpath-native ?= "3172"
SRCREV-pn-vala-dbus-binding-tool-native ?= "55a6bc5dd032731d89c238d274b2898ef02d12f8"
SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
-SRCREV_pn-webkit-gtk ?= "44532"
+SRCREV_pn-webkit-gtk ?= "45825"
SRCREV_pn-wlan-ng-modules ?= "1859"
SRCREV_pn-wlan-ng-utils ?= "1859"
SRCREV_pn-wmiconfig ?= "4522"
diff --git a/recipes/webkit/webkit-gtk/GNUmakefile.am b/recipes/webkit/webkit-gtk/GNUmakefile.am
index c87ee49c14..c80d6493fa 100644
--- a/recipes/webkit/webkit-gtk/GNUmakefile.am
+++ b/recipes/webkit/webkit-gtk/GNUmakefile.am
@@ -84,6 +84,7 @@ corekit_cflags += \
-fno-strict-aliasing \
$(COVERAGE_CFLAGS) \
$(ENCHANT_CFLAGS) \
+ $(GAIL_CFLAGS) \
$(GEOCLUE_CFLAGS) \
$(GLIB_CFLAGS) \
$(GNOMEKEYRING_CFLAGS) \
@@ -243,6 +244,7 @@ libwebkit_1_0_la_LIBADD = \
$(COVERAGE_LDFLAGS) \
$(ENCHANT_LIBS) \
$(FREETYPE_LIBS) \
+ $(GAIL_LIBS) \
$(GEOCLUE_LIBS) \
$(GLIB_LIBS) \
$(GNOMEKEYRING_LIBS) \
@@ -524,11 +526,14 @@ webkit_tests_ldflags = \
-no-fast-install
TEST_PROGS += Programs/unittests/testhttpbackend \
+ Programs/unittests/testloading \
+ Programs/unittests/testnetworkrequest \
Programs/unittests/testwebframe \
Programs/unittests/testwebbackforwardlist \
Programs/unittests/testwebhistoryitem \
Programs/unittests/testdownload \
- Programs/unittests/testatk
+ Programs/unittests/testatk \
+ Programs/unittests/testwebsettings
# Add additional tests here
Programs_unittests_testhttpbackend_SOURCES = WebKit/gtk/tests/testhttpbackend.c
@@ -536,6 +541,16 @@ Programs_unittests_testhttpbackend_CFLAGS = $(webkit_tests_cflags)
Programs_unittests_testhttpbackend_LDADD = $(webkit_tests_ldadd)
Programs_unittests_testhttpbackend_LDFLAGS = $(webkit_tests_ldflags)
+Programs_unittests_testloading_SOURCES = WebKit/gtk/tests/testloading.c
+Programs_unittests_testloading_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testloading_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testloading_LDFLAGS = $(webkit_tests_ldflags)
+
+Programs_unittests_testnetworkrequest_SOURCES = WebKit/gtk/tests/testnetworkrequest.c
+Programs_unittests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testnetworkrequest_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testnetworkrequest_LDFLAGS = $(webkit_tests_ldflags)
+
Programs_unittests_testwebframe_SOURCES = WebKit/gtk/tests/testwebframe.c
Programs_unittests_testwebframe_CFLAGS = $(webkit_tests_cflags)
Programs_unittests_testwebframe_LDADD = $(webkit_tests_ldadd)
@@ -561,6 +576,11 @@ Programs_unittests_testatk_CFLAGS = $(webkit_tests_cflags)
Programs_unittests_testatk_LDADD = $(webkit_tests_ldadd)
Programs_unittests_testatk_LDFLAGS = $(webkit_tests_ldflags)
+Programs_unittests_testwebsettings_SOURCES = WebKit/gtk/tests/testwebsettings.c
+Programs_unittests_testwebsettings_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testwebsettings_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testwebsettings_LDFLAGS = $(webkit_tests_ldflags)
+
# Autogenerated sources
BUILT_SOURCES := \
$(javascriptcore_built_sources) \
diff --git a/recipes/webkit/webkit-gtk/WebKit.pri b/recipes/webkit/webkit-gtk/WebKit.pri
index a869906288..73288abc0f 100644
--- a/recipes/webkit/webkit-gtk/WebKit.pri
+++ b/recipes/webkit/webkit-gtk/WebKit.pri
@@ -2,21 +2,37 @@
isEmpty(OUTPUT_DIR) {
- CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release
- CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug
+ CONFIG(debug, debug|release) {
+ OUTPUT_DIR=$$PWD/WebKitBuild/Debug
+ } else { # Release
+ OUTPUT_DIR=$$PWD/WebKitBuild/Release
+ }
}
DEFINES += BUILDING_QT__=1
building-libs {
win32-msvc*: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32
} else {
- QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
- LIBS += -lQtWebKit
+ CONFIG(QTDIR_build) {
+ QT += webkit
+ } else {
+ QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
+ mac:!static:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework) {
+ LIBS += -framework QtWebKit
+ QMAKE_FRAMEWORKPATH = $$OUTPUT_DIR/lib $$QMAKE_FRAMEWORKPATH
+ } else {
+ win32-*|wince* {
+ LIBS += -lQtWebKit$${QT_MAJOR_VERSION}
+ } else {
+ LIBS += -lQtWebKit
+ }
+ }
+ }
DEPENDPATH += $$PWD/WebKit/qt/Api
}
DEFINES += USE_SYSTEM_MALLOC
-CONFIG(release) {
+CONFIG(release, debug|release) {
DEFINES += NDEBUG
}
@@ -34,6 +50,8 @@ INCLUDEPATH += $$PWD/WebKit/qt/Api
defineTest(addExtraCompiler) {
CONFIG(QTDIR_build) {
outputRule = $$eval($${1}.output)
+ outVariable = $$eval($${1}.variable_out)
+ !isEqual(outVariable,GENERATED_SOURCES):return(true)
input = $$eval($${1}.input)
input = $$eval($$input)
diff --git a/recipes/webkit/webkit-gtk/WebKit.pro b/recipes/webkit/webkit-gtk/WebKit.pro
index 035f73aa3f..bb2ae976b7 100644
--- a/recipes/webkit/webkit-gtk/WebKit.pro
+++ b/recipes/webkit/webkit-gtk/WebKit.pro
@@ -2,11 +2,12 @@ TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += \
- JavaScriptCore \
WebCore \
- JavaScriptCore/kjs/jsc.pro \
+ JavaScriptCore/jsc.pro \
WebKit/qt/QtLauncher \
WebKit/qt/tests
-!win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
+!win32:!symbian: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro \
+ WebKitTools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
+include(WebKit/qt/docs/docs.pri)
diff --git a/recipes/webkit/webkit-gtk/acinclude.m4 b/recipes/webkit/webkit-gtk/acinclude.m4
deleted file mode 100644
index e69de29bb2..0000000000
--- a/recipes/webkit/webkit-gtk/acinclude.m4
+++ /dev/null
diff --git a/recipes/webkit/webkit-gtk/configure.ac b/recipes/webkit/webkit-gtk/configure.ac
index 19ce1eb553..4793e68b24 100644
--- a/recipes/webkit/webkit-gtk/configure.ac
+++ b/recipes/webkit/webkit-gtk/configure.ac
@@ -2,7 +2,14 @@ AC_PREREQ(2.59)
m4_define([webkit_major_version], [1])
m4_define([webkit_minor_version], [1])
-m4_define([webkit_micro_version], [8])
+m4_define([webkit_micro_version], [11])
+
+# This is the version we'll be using as part of our User-Agent string
+# e.g., AppleWebKit/$(webkit_user_agent_version) ...
+#
+# Sourced from WebCore/Configurations/Version.xcconfig
+m4_define([webkit_user_agent_major_version], [531])
+m4_define([webkit_user_agent_minor_version], [2])
AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
@@ -16,15 +23,19 @@ AC_CANONICAL_HOST
WEBKIT_MAJOR_VERSION=webkit_major_version
WEBKIT_MINOR_VERSION=webkit_minor_version
WEBKIT_MICRO_VERSION=webkit_micro_version
+WEBKIT_USER_AGENT_MAJOR_VERSION=webkit_user_agent_major_version
+WEBKIT_USER_AGENT_MINOR_VERSION=webkit_user_agent_minor_version
AC_SUBST(WEBKIT_MAJOR_VERSION)
AC_SUBST(WEBKIT_MINOR_VERSION)
AC_SUBST(WEBKIT_MICRO_VERSION)
+AC_SUBST(WEBKIT_USER_AGENT_MAJOR_VERSION)
+AC_SUBST(WEBKIT_USER_AGENT_MINOR_VERSION)
AC_CONFIG_SRCDIR([WebCore/config.h])
dnl # Libtool library version, not to confuse with API version
dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning
-LIBWEBKITGTK_VERSION=8:0:6
+LIBWEBKITGTK_VERSION=10:0:8
AC_SUBST([LIBWEBKITGTK_VERSION])
AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
@@ -176,6 +187,7 @@ if test "$with_hildon" = "yes"; then
fi
# minimum base dependencies
+LIBSOUP_REQUIRED_VERSION=2.27.4
CAIRO_REQUIRED_VERSION=1.2
FONTCONFIG_REQUIRED_VERSION=2.4
FREETYPE2_REQUIRED_VERSION=9.0
@@ -186,12 +198,12 @@ PANGO_REQUIRED_VERSION=1.0
GTK_REQUIRED_VERSION=2.10
# optional modules
-LIBSOUP_REQUIRED_VERSION=2.25.91
LIBXSLT_REQUIRED_VERSION=1.1.7
SQLITE_REQUIRED_VERSION=3.0
GSTREAMER_REQUIRED_VERSION=0.10
GNOME_KEYRING_REQUIRED_VERSION=2.26.0
ENCHANT_REQUIRED_VERSION=0.22
+GAIL_REQUIRED_VERSION=1.8
# Available modules
#
@@ -220,6 +232,10 @@ PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED_VERSION)
AC_SUBST(ENCHANT_CFLAGS)
AC_SUBST(ENCHANT_LIBS)
+PKG_CHECK_MODULES(GAIL, gail >= $GAIL_REQUIRED_VERSION)
+AC_SUBST(GAIL_CFLAGS)
+AC_SUBST(GAIL_LIBS)
+
# check for target-specific dependencies
if test "$with_target" = "directfb"; then
PKG_CHECK_MODULES(CAIRO, cairo-directfb >= $CAIRO_REQUIRED_VERSION)
@@ -293,8 +309,8 @@ AC_MSG_RESULT([$enable_3D_transforms])
AC_MSG_CHECKING([whether to enable HTML5 Channel Messaging support])
AC_ARG_ENABLE(channel_messaging,
AC_HELP_STRING([--enable-channel-messaging],
- [enable HTML5 channel messaging support [default=no]]),
- [],[enable_channel_messaging="no"])
+ [enable HTML5 channel messaging support [default=yes]]),
+ [],[enable_channel_messaging="yes"])
AC_MSG_RESULT([$enable_channel_messaging])
# check whether to enable JavaScript debugger/profiler support
@@ -393,13 +409,21 @@ AC_ARG_ENABLE(wml,
[],[enable_wml="no"])
AC_MSG_RESULT([$enable_wml])
+# check whether to enable SharedWorkers support
+AC_MSG_CHECKING([whether to enable SharedWorkers support])
+AC_ARG_ENABLE(shared_workers,
+ AC_HELP_STRING([--enable-shared-workers],
+ [enable support for SharedWorkers [default=no]]),
+ [],[enable_shared_workers="no"])
+AC_MSG_RESULT([$enable_shared_workers])
+
# check whether to enable Web Workers support
AC_MSG_CHECKING([whether to enable Web Workers support])
-AC_ARG_ENABLE(web_workers,
- AC_HELP_STRING([--enable-web-workers],
+AC_ARG_ENABLE(workers,
+ AC_HELP_STRING([--enable-workers],
[enable support for Web Workers [default=yes]]),
- [],[enable_web_workers="yes"])
-AC_MSG_RESULT([$enable_web_workers])
+ [],[enable_workers="yes"])
+AC_MSG_RESULT([$enable_workers])
# turn off svg features if --disable-svg is requested
if test "$enable_svg" = "no"; then
@@ -407,7 +431,7 @@ if test "$enable_svg" = "no"; then
enable_svg_fonts=no
enable_svg_foreign_object=no
enable_svg_as_image=no
- enable_svg_use_element=no
+ enable_svg_use=no
fi
# check whether to enable support for SVG animation
@@ -452,18 +476,18 @@ AC_MSG_RESULT([$enable_svg_as_image])
# check whether to enable SVG USE element support
AC_MSG_CHECKING([whether to enable support for SVG use element])
-AC_ARG_ENABLE(svg_use_element,
- AC_HELP_STRING([--enable-svg-use-element],
+AC_ARG_ENABLE(svg_use,
+ AC_HELP_STRING([--enable-svg-use],
[enable SVG use element support (experimental) [default=yes]]),
- [],[enable_svg_use_element="yes"])
-AC_MSG_RESULT([$enable_svg_use_element])
+ [],[enable_svg_use="yes"])
+AC_MSG_RESULT([$enable_svg_use])
# check for SVG features, enabling SVG if necessary
if test "$enable_svg_animation" = "yes" || \
test "$enable_svg_fonts" = "yes" || \
test "$enable_svg_foreign_object" = "yes" || \
test "$enable_svg_as_image" = "yes" || \
- test "$enable_svg_use_element" = "yes"; then
+ test "$enable_svg_use" = "yes"; then
svg_flags=yes
if test "$enable_svg" = "no"; then
AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support])
@@ -494,10 +518,6 @@ AC_ARG_ENABLE([jit],
[],[enable_jit="yes"])
if test "$enable_jit" = "yes"; then
case "$host_cpu" in
- arm)
- AC_DEFINE([ENABLE_JIT_OPTIMIZE_CALL], [1], [Define to enable optimizing calls])
- AC_DEFINE([ENABLE_JIT_OPTIMIZE_METHOD_CALLS], [1], [Define to enable optimizing method calls])
- ;;
i*86|x86_64)
AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR])
@@ -674,11 +694,12 @@ AM_CONDITIONAL([ENABLE_SVG_ANIMATION],[test "$enable_svg_animation" = "yes"])
AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"])
AM_CONDITIONAL([ENABLE_SVG_FOREIGN_OBJECT],[test "$enable_svg_foreign_object" = "yes"])
AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"])
-AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use_element" = "yes"])
+AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use" = "yes"])
AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"])
AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"])
AM_CONDITIONAL([ENABLE_WML],[test "$enable_wml" = "yes"])
-AM_CONDITIONAL([ENABLE_WORKERS],[test "$enable_web_workers" = "yes"])
+AM_CONDITIONAL([ENABLE_WORKERS],[test "$enable_workers" = "yes"])
+AM_CONDITIONAL([ENABLE_SHARED_WORKERS],[test "$enable_shared_workers" = "yes"])
AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
AM_CONDITIONAL([HTML_FLAGS],[test "$html_flags" = "yes"])
@@ -717,14 +738,15 @@ Features:
HTML5 client-side database storage support : $enable_database
HTML5 video element support : $enable_video
Icon database support : $enable_icon_database
+ SharedWorkers support : $enable_shared_workers
SVG support : $enable_svg
SVG animation support : $enable_svg_animation
SVG fonts support : $enable_svg_fonts
SVG foreign object support : $enable_svg_foreign_object
SVG as image support : $enable_svg_as_image
- SVG use element support : $enable_svg_use_element
+ SVG use element support : $enable_svg_use
WML support : $enable_wml
- Web Workers support : $enable_web_workers
+ Web Workers support : $enable_workers
XPATH support : $enable_xpath
XSLT support : $enable_xslt
GTK+ configuration:
diff --git a/recipes/webkit/webkit-gtk/symbols.filter b/recipes/webkit/webkit-gtk/symbols.filter
deleted file mode 100644
index f5af6bac90..0000000000
--- a/recipes/webkit/webkit-gtk/symbols.filter
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-local:
-_ZSt*;
-_ZNSt*;
-};
diff --git a/recipes/webkit/webkit-gtk/unicode-fixes.diff b/recipes/webkit/webkit-gtk/unicode-fixes.diff
deleted file mode 100644
index 03dbc0f3d1..0000000000
--- a/recipes/webkit/webkit-gtk/unicode-fixes.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: wtf/unicode/glib/UnicodeMacrosFromICU.h
-===================================================================
---- a/JavaScriptCore/wtf/unicode/glib/UnicodeMacrosFromICU.h (revision 44458)
-+++ b/JavaScriptCore/wtf/unicode/glib/UnicodeMacrosFromICU.h (working copy)
-@@ -41,6 +41,17 @@
- #define U16_IS_SURROGATE(c) U_IS_SURROGATE(c)
- #define U16_IS_SURROGATE_LEAD(c) (((c)&0x400)==0)
-
-+#define U16_PREV(s, start, i, c) { \
-+ (c)=(s)[--(i)]; \
-+ if(U16_IS_TRAIL(c)) { \
-+ uint16_t __c2; \
-+ if((i)>(start) && U16_IS_LEAD(__c2=(s)[(i)-1])) { \
-+ --(i); \
-+ (c)=U16_GET_SUPPLEMENTARY(__c2, (c)); \
-+ } \
-+ } \
-+}
-+
- #define U16_NEXT(s, i, length, c) { \
- (c)=(s)[(i)++]; \
- if(U16_IS_LEAD(c)) { \
diff --git a/recipes/webkit/webkit-gtk/update-webkit.sh b/recipes/webkit/webkit-gtk/update-webkit.sh
index e4cc3ebefa..723c45a4fb 100644
--- a/recipes/webkit/webkit-gtk/update-webkit.sh
+++ b/recipes/webkit/webkit-gtk/update-webkit.sh
@@ -3,6 +3,6 @@
export rev=$1
-for i in acinclude.m4 autogen.sh configure.ac GNUmakefile.am Makefile Makefile.shared ; do
+for i in autogen.sh configure.ac GNUmakefile.am Makefile Makefile.shared ; do
wget "http://trac.webkit.org/browser/trunk/$i?rev=$rev&format=raw" -O $i
done
diff --git a/recipes/webkit/webkit-gtk_svn.bb b/recipes/webkit/webkit-gtk_svn.bb
index f36671c494..fcf7ccfa97 100644
--- a/recipes/webkit/webkit-gtk_svn.bb
+++ b/recipes/webkit/webkit-gtk_svn.bb
@@ -3,7 +3,7 @@ DEPENDS = "enchant gtk-doc-native gtk-doc gnome-keyring libsoup-2.4 curl icu lib
SRCREV_FORMAT = "webcore-rwebkit"
-PV = "1.1.7+svnr${SRCREV}"
+PV = "1.1.11+svnr${SRCREV}"
SRC_URI = "\
svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
@@ -17,10 +17,8 @@ SRC_URI = "\
file://Makefile.shared \
file://autogen.sh \
file://configure.ac \
- file://symbols.filter \
file://GNUmakefile.am \
file://gtk-doc.make \
- file://unicode-fixes.diff;patch=1;maxrev=44459 \
"
S = "${WORKDIR}/"
@@ -57,7 +55,7 @@ do_compile_prepend() {
${BUILD_CXX} dftables.cpp -o dftables -I. -I../wtf
fi
cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
- cp dftables ${S}/Programs/
+ cp dftables ${S}/Programs/
cd ${S}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 16:48:26 +0000