diff options
| -rw-r--r-- | recipes/webkit/webkit-gtk/GNUmakefile.am | 119 | ||||
| -rw-r--r-- | recipes/webkit/webkit-gtk/Makefile | 2 | ||||
| -rw-r--r-- | recipes/webkit/webkit-gtk/configure.ac | 33 | ||||
| -rw-r--r-- | recipes/webkit/webkit-gtk_svn.bb | 4 |
4 files changed, 139 insertions, 19 deletions
diff --git a/recipes/webkit/webkit-gtk/GNUmakefile.am b/recipes/webkit/webkit-gtk/GNUmakefile.am index 399f7a4125..a662290fd5 100644 --- a/recipes/webkit/webkit-gtk/GNUmakefile.am +++ b/recipes/webkit/webkit-gtk/GNUmakefile.am @@ -35,11 +35,15 @@ DISTCHECK_CONFIGURE_FLAGS = \ # Directory for autogenerated sources GENSOURCES := $(top_builddir)/DerivedSources +GENSOURCESWEBKITDOM := $(top_builddir)/DerivedSources/webkit GENPROGRAMS := $(top_builddir)/Programs # Script for creating hash tables CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/create_hash_table +# Script for creating regexp tables +CREATE_REGEXP_TABLES = $(srcdir)/JavaScriptCore/create_regex_tables + # Programs to run the WebKitGtk unit tests GTESTER = gtester GTESTER_REPORT = gtester-report @@ -68,6 +72,14 @@ webcore_built_nosources := webcore_dist := webcoregtk_cppflags := webcoregtk_sources := +IDL_BINDINGS_GDOM := +GDOM_AUTO_CLASSES := +GDOM_FIXED_CLASSES := +GDOM_CLASSES := +GDOM_HEADERS_BUILT := +GDOM_HEADERS_FIXED := +libgdom_h_api := +libgdom_cleanfiles := webkitgtk_h_api := webkitgtk_sources := webkitgtk_cppflags := @@ -89,6 +101,11 @@ CLEANFILES := DISTCLEANFILES := MAINTAINERCLEANFILES := +webcoregtk_cppflags += \ + -I$(top_builddir)/DerivedSources/webkit \ + -I$(srcdir)/WebCore/bindings \ + -I$(srcdir)/WebCore/bindings/gobject + # CFLAGS/CXXFLAGS used by WebCore and WebKit # # gtk+.pc already include glib, cairo, freetype and pango CFLAGS @@ -238,6 +255,7 @@ libwebkit_1_0_la_LIBADD = \ -lpthread \ libJavaScriptCore.la \ libWebCoreJS.la \ + libgdom.la \ $(webcore_ldflags) \ $(CAIRO_LIBS) \ $(COVERAGE_LDFLAGS) \ @@ -259,6 +277,15 @@ libwebkit_1_0_la_LIBADD = \ $(UNICODE_LIBS) \ $(XT_LIBS) +libgdom_ladir = $(prefix)/include/webkit-1.0/webkit +nodist_libgdom_la_HEADERS = \ + $(libgdom_h_api) + +libgdom_cleanfiles += \ + $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h \ + $(top_builddir)/libgdom.la \ + $(top_builddir)/stamp-webkitdomenumtypes.h + # # Extra checks and flags global_cppflags += \ @@ -331,6 +358,7 @@ webkitgtk_h_api += \ webkitgtk_built_sources += \ DerivedSources/webkitenumtypes.cpp \ + DerivedSources/webkitdomenumtypes.cpp \ DerivedSources/webkitmarshal.cpp \ DerivedSources/webkitmarshal.h \ WebKit/gtk/webkit/webkitenumtypes.h @@ -385,7 +413,9 @@ webkitgtk_cppflags += \ -I$(srcdir)/WebKit/gtk \ -I$(srcdir)/WebKit/gtk/WebCoreSupport \ -I$(srcdir)/WebKit/gtk/webkit \ - -I$(top_builddir)/WebKit/gtk/webkit + -I$(top_builddir)/WebKit/gtk \ + -I$(top_builddir)/WebKit/gtk/webkit \ + -I$(GENSOURCESWEBKITDOM) webkitgtk_cleanfiles += \ $(top_builddir)/stamp-webkitmarshal.cpp \ @@ -426,14 +456,16 @@ $(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER) libwebkit-1.0.la --add-include-path $(top_srcdir)/WebKit/gtk \ -I$(top_srcdir)/WebKit/gtk \ -I$(top_builddir)/WebKit/gtk \ + -I$(top_builddir)/DerivedSources \ -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \ -I$(top_srcdir) \ - $(webkitgtk_h_api) + $(webkitgtk_h_api) \ + $(libgdom_h_api) -girdir = $(GIRDIR) +girdir = $(datadir)/gir-1.0 gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES) -typelibsdir += $(GIRTYPELIBDIR) +typelibsdir += $(libdir)/girepository-1.0 typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib) %.typelib: %.gir $(G_IR_COMPILER) @@ -507,6 +539,49 @@ DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile && cp xgen-gtc $@ \ && rm -f xgen-gtc +WebKit/gtk/webkit/webkitdomenumtypes.h: stamp-webkitdomenumtypes.h + @true +stamp-webkitdomenumtypes.h: $(libgdom_h_api) GNUmakefile + $(AM_V_GEN)glib-mkenums \ + --fhead "#ifndef WEBKIT_DOM_ENUM_TYPES_H\n" \ + --fhead "#define WEBKIT_DOM_ENUM_TYPES_H\n\n" \ + --fhead "#include <glib-object.h>\n\n" \ + --fhead "G_BEGIN_DECLS\n\n" \ + --ftail "G_END_DECLS\n\n" \ + --ftail "#endif\n" \ + --fprod "#include <webkit/@basename@>\n\n" \ + --eprod "#define WEBKIT_DOM_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \ + --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);n\n" \ + $(libgdom_h_api) | \ + sed 's,web_kit,webkit_dom,' | \ + sed 's,WEBKIT_DOM_TYPE_KIT,WEBKIT_DOM_TYPE,' \ + > xgen-cgth \ + && (cmp -s xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h || cp xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h) \ + && rm -f xgen-cgth \ + && echo timestamp > $(@F) + +DerivedSources/webkitdomenumtypes.cpp: $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h $(libgdom_h_api) GNUmakefile + $(AM_V_GEN)glib-mkenums \ + --fhead "#include <config.h>\n" \ + --fhead "#include <glib-object.h>\n" \ + --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h\"\n\n" \ + --fhead "extern \"C\" {\n\n" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --vhead "static const G@Type@Value _@enum_name@_values] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n};\n\n" \ + --vtail "GType @enum_name@_get_type(void)\n{\n" \ + --vtail " static GType type = 0;\n\n" \ + --vtail " if (!type)\n" \ + --vtail " type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \ + --vtail " return type;\n}\n\n" \ + --ftail "}\n" \ + $(libgdom_h_api) | \ + sed 's,web_kit,webkitdom,' \ + > xgen-cgtc \ + && cp xgen-cgtc $@ \ + && rm -f xgen-cgtc + # Files that will be distributed EXTRA_DIST += \ $(srcdir)/gtk-doc.make \ @@ -548,6 +623,9 @@ webkit_tests_cflags = \ -I$(srcdir)/JavaScriptCore/ForwardingHeaders \ -I$(srcdir)/WebKit/gtk \ -I$(top_builddir)/WebKit/gtk \ + -I$(top_builddir)/DerivedSources \ + -I$(top_srcdir)/WebCore/bindings \ + -I$(top_srcdir)/WebCore/bindings/gobject \ $(global_cflags) \ $(GLIB_CFLAGS) \ $(GTK_CFLAGS) \ @@ -563,8 +641,12 @@ webkit_tests_ldflags = \ -no-install \ -no-fast-install -TEST_PROGS += Programs/unittests/testhttpbackend \ +TEST_PROGS += \ + Programs/unittests/testdomdocument \ + Programs/unittests/testdomdomwindow \ + Programs/unittests/testhttpbackend \ Programs/unittests/testloading \ + Programs/unittests/testglobals \ Programs/unittests/testmimehandling \ Programs/unittests/testnetworkrequest \ Programs/unittests/testnetworkresponse \ @@ -574,6 +656,7 @@ TEST_PROGS += Programs/unittests/testhttpbackend \ Programs/unittests/testwindow \ Programs/unittests/testdownload \ Programs/unittests/testatk \ + Programs/unittests/testatkroles \ Programs/unittests/testhittestresult \ Programs/unittests/testwebsettings \ Programs/unittests/testwebresource \ @@ -582,11 +665,26 @@ TEST_PROGS += Programs/unittests/testhttpbackend \ Programs/unittests/testkeyevents # Add additional tests here +Programs_unittests_testdomdocument_SOURCES = WebKit/gtk/tests/testdomdocument.c +Programs_unittests_testdomdocument_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testdomdocument_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testdomdocument_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testdomdomwindow_SOURCES = WebKit/gtk/tests/testdomdomwindow.c +Programs_unittests_testdomdomwindow_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testdomdomwindow_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testdomdomwindow_LDFLAGS = $(webkit_tests_ldflags) + Programs_unittests_testhttpbackend_SOURCES = WebKit/gtk/tests/testhttpbackend.c Programs_unittests_testhttpbackend_CFLAGS = $(webkit_tests_cflags) Programs_unittests_testhttpbackend_LDADD = $(webkit_tests_ldadd) Programs_unittests_testhttpbackend_LDFLAGS = $(webkit_tests_ldflags) +Programs_unittests_testglobals_SOURCES = WebKit/gtk/tests/testglobals.c +Programs_unittests_testglobals_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testglobals_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testglobals_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) @@ -637,6 +735,11 @@ Programs_unittests_testatk_CFLAGS = $(webkit_tests_cflags) Programs_unittests_testatk_LDADD = $(webkit_tests_ldadd) Programs_unittests_testatk_LDFLAGS = $(webkit_tests_ldflags) +Programs_unittests_testatkroles_SOURCES = WebKit/gtk/tests/testatkroles.c +Programs_unittests_testatkroles_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testatkroles_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testatkroles_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) @@ -671,13 +774,15 @@ BUILT_SOURCES += \ $(webcore_built_sources) \ $(webcore_built_nosources) \ $(webkitgtk_built_sources) \ - $(webkitgtk_built_nosources) + $(webkitgtk_built_nosources) \ + $(gdom_built_nosources) # Project-wide clean rules # Files that will be cleaned CLEANFILES += \ $(BUILT_SOURCES) \ - $(webkitgtk_cleanfiles) + $(webkitgtk_cleanfiles) \ + $(libgdom_cleanfiles) DISTCLEANFILES += \ $(CLEANFILES) \ diff --git a/recipes/webkit/webkit-gtk/Makefile b/recipes/webkit/webkit-gtk/Makefile index 24a6f0d945..1e50d1d358 100644 --- a/recipes/webkit/webkit-gtk/Makefile +++ b/recipes/webkit/webkit-gtk/Makefile @@ -1,4 +1,4 @@ -MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools +MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools all: @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ diff --git a/recipes/webkit/webkit-gtk/configure.ac b/recipes/webkit/webkit-gtk/configure.ac index 5bc1781698..be29495cff 100644 --- a/recipes/webkit/webkit-gtk/configure.ac +++ b/recipes/webkit/webkit-gtk/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.59) m4_define([webkit_major_version], [1]) -m4_define([webkit_minor_version], [1]) -m4_define([webkit_micro_version], [90]) +m4_define([webkit_minor_version], [3]) +m4_define([webkit_micro_version], [1]) # This is the version we'll be using as part of our User-Agent string # e.g., AppleWebKit/$(webkit_user_agent_version) ... @@ -35,7 +35,7 @@ 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=19:1:17 +LIBWEBKITGTK_VERSION=20:0:18 AC_SUBST([LIBWEBKITGTK_VERSION]) AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar]) @@ -389,7 +389,7 @@ AC_MSG_RESULT([$enable_ruby]) # check whether to enable HTML5 sandbox iframe support AC_MSG_CHECKING([whether to enable HTML5 sandboxed iframe support]) -AC_ARG_ENABLE(ruby, +AC_ARG_ENABLE(sandbox, AC_HELP_STRING([--enable-sandbox], [enable HTML5 sandboxed iframe support [default=yes]]), [],[enable_sandbox="yes"]) @@ -569,6 +569,22 @@ AC_ARG_ENABLE(fast_mobile_scrolling, [],[enable_fast_mobile_scrolling="no"]) AC_MSG_RESULT([$enable_fast_mobile_scrolling]) +# check whether to enable FileReader support +AC_MSG_CHECKING([whether to enable FileReader support]) +AC_ARG_ENABLE(file_reader, + AC_HELP_STRING([--enable-file-reader], + [enable support for FileReader [default=no]]), + [],[enable_file_reader="no"]) +AC_MSG_RESULT([$enable_file_reader]) + +# check whether to enable FileWriter support +AC_MSG_CHECKING([whether to enable FileWriter support]) +AC_ARG_ENABLE(file_writer, + AC_HELP_STRING([--enable-file-writer], + [enable support for FileWriter [default=no]]), + [],[enable_file_writer="no"]) +AC_MSG_RESULT([$enable_file_writer]) + # check whether to enable code coverage AC_MSG_CHECKING([whether to enable code coverage support]) AC_ARG_ENABLE(coverage, @@ -636,17 +652,12 @@ if test "$enable_introspection" = "yes"; then G_IR_SCANNER="$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)" G_IR_COMPILER="$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)" G_IR_GENERATE="$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)" - GIRDIR="$($PKG_CONFIG --define-variable=prefix=$prefix --variable=girdir gobject-introspection-1.0)" - GIRTYPELIBDIR="$($PKG_CONFIG --define-variable=prefix=$prefix --variable=typelibdir gobject-introspection-1.0)" - AC_DEFINE([ENABLE_INTROSPECTION],[1],[Define to enable GObject introspection support]) fi AC_SUBST([G_IR_SCANNER]) AC_SUBST([G_IR_COMPILER]) AC_SUBST([G_IR_GENERATE]) -AC_SUBST([GIRDIR]) -AC_SUBST([GIRTYPELIBDIR]) # determine the font backend AC_MSG_CHECKING([the font backend to use]) @@ -807,6 +818,8 @@ AM_CONDITIONAL([ENABLE_XHTMLMP],[test "$enable_xhtmlmp" = "yes"]) AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"]) AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"]) AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"]) +AM_CONDITIONAL([ENABLE_FILE_READER],[test "$enable_file_reader" = "yes"]) +AM_CONDITIONAL([ENABLE_FILE_WRITER],[test "$enable_file_writer" = "yes"]) AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"]) AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"]) AM_CONDITIONAL([ENABLE_RUBY],[test "$enable_ruby" = "yes"]) @@ -860,6 +873,8 @@ Features: Fast Mobile Scrolling : $enable_fast_mobile_scrolling JIT compilation : $enable_jit Filters support : $enable_filters + FileReader support : $enable_file_reader + FileWriter support : $enable_file_writer Geolocation support : $enable_geolocation JavaScript debugger/profiler support : $enable_javascript_debugger MathML support : $enable_mathml diff --git a/recipes/webkit/webkit-gtk_svn.bb b/recipes/webkit/webkit-gtk_svn.bb index 7356d8b386..b6460498ca 100644 --- a/recipes/webkit/webkit-gtk_svn.bb +++ b/recipes/webkit/webkit-gtk_svn.bb @@ -4,8 +4,8 @@ DEPENDS = "geoclue enchant gtk-doc-native gtk-doc gnome-keyring libsoup-2.4 curl SRCREV_FORMAT = "webcore-rwebkit" PR = "r1" -SRCREV = "56686" -PV = "1.1.90+svnr${SRCPV}" +SRCREV = "60413" +PV = "1.3.1+svnr${SRCPV}" SRC_URI = "\ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ |