From c8c9a17ae2603ccb34641d4188850a18e6ce6096 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Nov 2011 15:58:40 +0100 Subject: webkit-gtk svn: update to r101488 tested on beagleboard/angstrom with midori and epiphany browsers Signed-off-by: Koen Kooi --- meta/recipes-sato/webkit/files/GNUmakefile.am | 37 ++- meta/recipes-sato/webkit/files/autogen.sh | 1 - meta/recipes-sato/webkit/files/configure.ac | 395 +++++++++++++------------- meta/recipes-sato/webkit/webkit-gtk_svn.bb | 9 +- 4 files changed, 232 insertions(+), 210 deletions(-) diff --git a/meta/recipes-sato/webkit/files/GNUmakefile.am b/meta/recipes-sato/webkit/files/GNUmakefile.am index fb10790b1..4d2785f24 100644 --- a/meta/recipes-sato/webkit/files/GNUmakefile.am +++ b/meta/recipes-sato/webkit/files/GNUmakefile.am @@ -27,7 +27,8 @@ VPATH = @srcdir@ DISTCHECK_CONFIGURE_FLAGS = \ --enable-introspection \ - --enable-gtk-doc + --enable-gtk-doc \ + --enable-webkit2 # Directory for autogenerated sources GENSOURCES := $(top_builddir)/DerivedSources @@ -40,10 +41,13 @@ GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector WebCore := $(srcdir)/Source/WebCore WebKit := $(srcdir)/Source/WebKit/gtk WebKit2 := $(srcdir)/Source/WebKit2 +pkgconfigdir := $(libdir)/pkgconfig +libwebkitgtkincludedir := $(prefix)/include/webkitgtk-@WEBKITGTK_API_VERSION@ # Libraries and support components bin_PROGRAMS := noinst_PROGRAMS := +libexec_PROGRAMS := noinst_HEADERS := noinst_LTLIBRARIES := lib_LTLIBRARIES := @@ -73,6 +77,8 @@ webkitgtk_gdom_built_sources := webkitgtk_built_sources := webkitgtk_built_nosources := webkit2_built_sources := +webkit2_plugin_process_built_sources := +webkittestrunner_built_sources := libwebcoreinternals_built_sources := global_cppflags := global_cflags := @@ -85,8 +91,10 @@ typelibs_DATA := EXTRA_DIST := BUILT_SOURCES := CLEANFILES := +DOMAIN := DISTCLEANFILES := MAINTAINERCLEANFILES := +pkgconfig_DATA := # We do not care at all about this implicit built-in make rules, # disable them to save some build time @@ -187,11 +195,13 @@ endif EXTRA_DIST += \ $(srcdir)/Source/autotools/symbols.filter \ - $(srcdir)/gtk-doc.make \ $(srcdir)/Source/WebKit/LICENSE # Include module makefiles +if USE_JSC include Source/JavaScriptCore/GNUmakefile.am +endif + include Source/WebCore/GNUmakefile.am include Source/WebKit/gtk/GNUmakefile.am include Source/WebCore/bindings/gobject/GNUmakefile.am @@ -201,6 +211,7 @@ include Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am if ENABLE_WEBKIT2 include Source/WebKit2/GNUmakefile.am +include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am include Tools/MiniBrowser/gtk/GNUmakefile.am include Tools/WebKitTestRunner/GNUmakefile.am # [GTK] Refactor the translations now that we have webkit2 @@ -209,13 +220,17 @@ endif # Autogenerated sources BUILT_SOURCES += \ - $(javascriptcore_built_sources) \ - $(javascriptcore_built_nosources) \ $(webcore_built_sources) \ $(webcore_built_nosources) \ $(webkitgtk_built_sources) \ $(webkitgtk_built_nosources) +if USE_JSC +BUILT_SOURCES += \ + $(javascriptcore_built_sources) \ + $(javascriptcore_built_nosources) +endif + DISTCLEANFILES += \ $(CLEANFILES) \ $(builddir)/doltcompile \ @@ -249,3 +264,17 @@ clean-local: maintainer-clean-local: distclean-local distclean-local: -rm -rf $(GENSOURCES) $(GENPROGRAMS) + +dist-hook: doc-dist-hook +doc-dist-hook: docs-build.stamp + cp $(WebKit)/NEWS $(distdir) + @mkdir -p $(distdir)/Documentation/webkitgtk/html + @mkdir -p $(distdir)/Documentation/webkitgtk/tmpl + @-cp ./Documentation/webkitgtk/tmpl/*.sgml $(distdir)/Documentation/webkitgtk/tmpl + @cp ./Documentation/webkitgtk/html/* $(distdir)/Documentation/webkitgtk/html +if ENABLE_WEBKIT2 + @mkdir -p $(distdir)/Documentation/webkit2gtk/html + @mkdir -p $(distdir)/Documentation/webkit2gtk/tmpl + @-cp ./Documentation/webkit2gtk/tmpl/*.sgml $(distdir)/Documentation/webkit2gtk/tmpl + @cp ./Documentation/webkit2gtk/html/* $(distdir)/Documentation/webkit2gtk/html +endif diff --git a/meta/recipes-sato/webkit/files/autogen.sh b/meta/recipes-sato/webkit/files/autogen.sh index 23639e897..bb7779d44 100755 --- a/meta/recipes-sato/webkit/files/autogen.sh +++ b/meta/recipes-sato/webkit/files/autogen.sh @@ -12,7 +12,6 @@ rm -f $top_srcdir/autom4te.cache touch README INSTALL -gtkdocize --copy > /dev/null 2>&1 || echo "Warning: not running gtk-docize." if test -z `which autoreconf`; then echo "Error: autoreconf not found, please install it." exit 1 diff --git a/meta/recipes-sato/webkit/files/configure.ac b/meta/recipes-sato/webkit/files/configure.ac index 9d8ad90c3..65176aea2 100644 --- a/meta/recipes-sato/webkit/files/configure.ac +++ b/meta/recipes-sato/webkit/files/configure.ac @@ -1,15 +1,15 @@ AC_PREREQ(2.59) m4_define([webkit_major_version], [1]) -m4_define([webkit_minor_version], [5]) -m4_define([webkit_micro_version], [1]) +m4_define([webkit_minor_version], [7]) +m4_define([webkit_micro_version], [2]) # This is the version we'll be using as part of our User-Agent string # e.g., AppleWebKit/$(webkit_user_agent_version) ... # # Sourced from Source/WebCore/Configurations/Version.xcconfig -m4_define([webkit_user_agent_major_version], [534]) -m4_define([webkit_user_agent_minor_version], [26]) +m4_define([webkit_user_agent_major_version], [535]) +m4_define([webkit_user_agent_minor_version], [10]) AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/]) @@ -35,10 +35,10 @@ AC_CONFIG_SRCDIR([Source/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 -LIBWEBKITGTK_VERSION=8:0:8 +LIBWEBKITGTK_VERSION=11:2:11 AC_SUBST([LIBWEBKITGTK_VERSION]) -AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar]) +AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz no-dist-gzip tar-ustar]) # Use AM_SILENT_RULES if present m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -111,6 +111,9 @@ if test "$os_win32" = "no"; then AC_CHECK_HEADERS([pthread.h], AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists]), AC_MSG_ERROR([pthread support is required to build WebKit])) +AC_CHECK_LIB(pthread, pthread_rwlock_init, + AC_DEFINE([HAVE_PTHREAD_RWLOCK],[1],[Define if pthread rwlock is present]), + AC_MSG_WARN([pthread rwlock support is not available])) fi # check for libjpeg the way Gtk does it. @@ -188,32 +191,37 @@ AC_SUBST([OLE32_LIBS]) # determine the GTK+ version to use AC_MSG_CHECKING([the GTK+ version to use]) AC_ARG_WITH([gtk], - [AS_HELP_STRING([--with-gtk=2.0|3.0], [the GTK+ version to use (default: 2.0)])], + [AS_HELP_STRING([--with-gtk=2.0|3.0], [the GTK+ version to use (default: 3.0)])], [case "$with_gtk" in 2.0|3.0) ;; *) AC_MSG_ERROR([invalid GTK+ version specified]) ;; esac], - [with_gtk=2.0]) + [with_gtk=3.0]) AC_MSG_RESULT([$with_gtk]) +GTK2_REQUIRED_VERSION=2.10 +GAIL2_REQUIRED_VERSION=1.8 +GTK3_REQUIRED_VERSION=3.0 +GAIL3_REQUIRED_VERSION=3.0 + case "$with_gtk" in - 2.0) GTK_REQUIRED_VERSION=2.10 + 2.0) GTK_REQUIRED_VERSION=$GTK2_REQUIRED_VERSION GTK_API_VERSION=2.0 WEBKITGTK_API_MAJOR_VERSION=1 WEBKITGTK_API_MINOR_VERSION=0 WEBKITGTK_API_VERSION=1.0 WEBKITGTK_PC_NAME=webkit GAIL_PC_NAME=gail - GAIL_REQUIRED_VERSION=1.8 + GAIL_REQUIRED_VERSION=$GAIL2_REQUIRED_VERSION ;; - 3.0) GTK_REQUIRED_VERSION=3.0 + 3.0) GTK_REQUIRED_VERSION=$GTK3_REQUIRED_VERSION GTK_API_VERSION=3.0 WEBKITGTK_API_MAJOR_VERSION=3 WEBKITGTK_API_MINOR_VERSION=0 WEBKITGTK_API_VERSION=3.0 WEBKITGTK_PC_NAME=webkitgtk GAIL_PC_NAME=gail-3.0 - GAIL_REQUIRED_VERSION=3.0 + GAIL_REQUIRED_VERSION=$GAIL3_REQUIRED_VERSION ;; esac @@ -267,8 +275,9 @@ PANGO_REQUIRED_VERSION=1.12 LIBXSLT_REQUIRED_VERSION=1.1.7 SQLITE_REQUIRED_VERSION=3.0 GSTREAMER_REQUIRED_VERSION=0.10 -GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=0.10.25 +GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=0.10.30 ENCHANT_REQUIRED_VERSION=0.22 +LIBFFTW_REQUIRED_VERSION=3.2.2 # Available modules # @@ -373,15 +382,14 @@ AC_MSG_RESULT([$enable_3d_rendering]) # check whether to enable WebGL support AC_MSG_CHECKING([whether to enable WebGL support]) AC_ARG_ENABLE(webgl, - AC_HELP_STRING([--enable-webgl], - [enable support for WebGL (experimental) [default=no]]), - [], [enable_webgl="no"]) + AC_HELP_STRING([--enable-webgl], [enable support for WebGL [default=yes]]), + [], [if test "$with_target" = "x11"; then enable_webgl="yes"; else enable_webgl="no"; fi]) AC_MSG_RESULT([$enable_webgl]) if test "$enable_webgl" = "yes"; then AC_CHECK_HEADERS([GL/gl.h], [], AC_MSG_ERROR([OpenGL header not found])) AC_CHECK_HEADERS([GL/glx.h], [], AC_MSG_ERROR([GLX header not found])) - OPENGL_LIBS=-lGL + OPENGL_LIBS="-lGL -ldl" fi AC_SUBST([OPENGL_LIBS]) @@ -409,6 +417,14 @@ AC_ARG_ENABLE(meter_tag, [],[enable_meter_tag="yes"]) AC_MSG_RESULT([$enable_meter_tag]) +# check whether to enable HTML5 Microdata support +AC_MSG_CHECKING([whether to enable HTML5 Microdata support]) +AC_ARG_ENABLE(microdata, + AC_HELP_STRING([--enable-microdata], + [enable HTML5 microdata support [default=no]]), + [],[enable_microdata="no"]) +AC_MSG_RESULT([$enable_microdata]) + # check whether to enable page visibility API. AC_MSG_CHECKING([whether to enable Page Visibility API support]) AC_ARG_ENABLE(page_visibility_api, @@ -433,6 +449,14 @@ AC_ARG_ENABLE(javascript_debugger, [],[enable_javascript_debugger="yes"]) AC_MSG_RESULT([$enable_javascript_debugger]) +# check whether to enable Gamepad support +AC_MSG_CHECKING([whether to enable Gamepad support]) +AC_ARG_ENABLE(gamepad, + AC_HELP_STRING([--enable-gamepad], + [enable Gamepad support [default=no]]), + [],[enable_gamepad="no"]) +AC_MSG_RESULT([$enable_gamepad]) + # check whether to build with datagrid support AC_MSG_CHECKING([whether to enable HTML5 datagrid support]) AC_ARG_ENABLE(datagrid, @@ -449,13 +473,13 @@ AC_ARG_ENABLE(data_transfer_items, [],[enable_data_transfer_items="no"]) AC_MSG_RESULT([$enable_data_transfer_items]) -# check whether to enable HTML5 Offline Web Applications support -AC_MSG_CHECKING([whether to enable HTML5 offline web applications support]) -AC_ARG_ENABLE(offline_web_applications, - AC_HELP_STRING([--enable-offline-web-applications], - [enable HTML5 offline web applications support [default=yes]]), - [],[enable_offline_web_applications="yes"]) -AC_MSG_RESULT([$enable_offline_web_applications]) +# check whether to enable DOM mutation observer support +AC_MSG_CHECKING([whether to enable DOM mutation observer support]) +AC_ARG_ENABLE(mutation_observers, + AC_HELP_STRING([--enable-mutation-observers], + [enable DOM mutation observer support [default=no]]), + [],[enable_mutation_observers="no"]) +AC_MSG_RESULT([$enable_mutation_observers]) # check whether to enable HTML5 client-side session and persitent storage support AC_MSG_CHECKING([whether to enable HTML5 client-side session and persistent storage support]) @@ -489,21 +513,13 @@ AC_ARG_ENABLE(input_speech, [],[enable_input_speech="no"]) AC_MSG_RESULT([$enable_input_speech]) -# check whether to build with database support -AC_MSG_CHECKING([whether to enable HTML5 client-side database storage support]) -AC_ARG_ENABLE(database, - AC_HELP_STRING([--enable-database], - [enable HTML5 client-side database storage support [default=yes]]), - [],[enable_database="yes"]) -AC_MSG_RESULT([$enable_database]) - -# check whether to build with server-sent events support -AC_MSG_CHECKING([whether to enable HTML5 server-sent events support]) -AC_ARG_ENABLE(eventsource, - AC_HELP_STRING([--enable-eventsource], - [enable HTML5 server-sent events support [default=yes]]), - [],[enable_eventsource="yes"]) -AC_MSG_RESULT([$enable_eventsource]) +# check whether to build with SQL database support +AC_MSG_CHECKING([whether to enable SQL client-side database storage support]) +AC_ARG_ENABLE(sql_database, + AC_HELP_STRING([--enable-sql-database], + [enable SQL client-side database storage support [default=yes]]), + [],[enable_sql_database="yes"]) +AC_MSG_RESULT([$enable_sql_database]) # check whether to build with icon database support AC_MSG_CHECKING([whether to enable icon database support]) @@ -554,10 +570,18 @@ fi AC_MSG_CHECKING([whether to enable HTML5 video track support]) AC_ARG_ENABLE(video_track, AC_HELP_STRING([--enable-video-track], - [enable HTML5 video track support [default=yes]]), - [],[enable_video_track="yes"]) + [enable HTML5 video track support [default=no]]), + [],[enable_video_track="no"]) AC_MSG_RESULT([$enable_video_track]) +# check whether to enable media source support +AC_MSG_CHECKING([whether to enable media source support]) +AC_ARG_ENABLE(media_source, + AC_HELP_STRING([--enable-media-source], + [enable support for media source [default=no]]), + [], [enable_media_source="no"]) +AC_MSG_RESULT([$enable_media_source]) + # check whether to enable media statistics support AC_MSG_CHECKING([whether to enable media statistics support]) AC_ARG_ENABLE(media_statistics, @@ -582,22 +606,6 @@ AC_ARG_ENABLE(media_stream, [],[enable_media_stream="no"]) AC_MSG_RESULT([$enable_media_stream]) -# check whether to enable XHTML-MP support -AC_MSG_CHECKING([whether to enable XHTML-MP support]) -AC_ARG_ENABLE(xhtmlmp, - AC_HELP_STRING([--enable-xhtmlmp], - [enable support for XHTML-MP [default=no]]), - [],[enable_xhtmlmp="no"]) -AC_MSG_RESULT([$enable_xhtmlmp]) - -# check whether to enable XPath support -AC_MSG_CHECKING([whether to enable XPath support]) -AC_ARG_ENABLE(xpath, - AC_HELP_STRING([--enable-xpath], - [enable support for XPath [default=yes]]), - [],[enable_xpath="yes"]) -AC_MSG_RESULT([$enable_xpath]) - # check whether to enable XSLT support AC_MSG_CHECKING([whether to enable XSLT support]) AC_ARG_ENABLE(xslt, @@ -614,14 +622,6 @@ AC_ARG_ENABLE(geolocation, [],[enable_geolocation="no"]) AC_MSG_RESULT([$enable_geolocation]) -# check whether to enable client-based geolocation support -AC_MSG_CHECKING([whether to enable client-based geolocation support]) -AC_ARG_ENABLE(client_based_geolocation, - AC_HELP_STRING([--enable-client-based-geolocation], - [enable support for client-based geolocation [default=no]]), - [],[enable_client_based_geolocation="no"]) -AC_MSG_RESULT([$enable_client_based_geolocation]) - # check whether to enable MathML support AC_MSG_CHECKING([whether to enable MathML support]) AC_ARG_ENABLE(mathml, @@ -638,14 +638,6 @@ AC_ARG_ENABLE(svg, [],[enable_svg="yes"]) AC_MSG_RESULT([$enable_svg]) -# check whether to enable WCSS support -AC_MSG_CHECKING([whether to enable WCSS support]) -AC_ARG_ENABLE(wcss, - AC_HELP_STRING([--enable-wcss], - [enable support for WCSS [default=no]]), - [],[enable_wcss="no"]) -AC_MSG_RESULT([$enable_wcss]) - # check whether to enable SharedWorkers support AC_MSG_CHECKING([whether to enable SharedWorkers support]) AC_ARG_ENABLE(shared_workers, @@ -678,6 +670,14 @@ AC_ARG_ENABLE(file_system, [], [enable_file_system="no"]) AC_MSG_RESULT([$enable_file_system]) +# check whether to enable HTML5