From 8636fa26b1da9ddedfabca738a1f95d5861c9555 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 24 Nov 2010 12:23:20 +0100 Subject: [PATCH] webkit-gtk: bump SRCREV Signed-off-by: Koen Kooi --- recipes/webkit/webkit-gtk/GNUmakefile.am | 571 +---------------------- recipes/webkit/webkit-gtk/configure.ac | 38 +- recipes/webkit/webkit-gtk_svn.bb | 7 +- 3 files changed, 40 insertions(+), 576 deletions(-) diff --git a/recipes/webkit/webkit-gtk/GNUmakefile.am b/recipes/webkit/webkit-gtk/GNUmakefile.am index c769db2db8..8884fcb6f9 100644 --- a/recipes/webkit/webkit-gtk/GNUmakefile.am +++ b/recipes/webkit/webkit-gtk/GNUmakefile.am @@ -37,10 +37,7 @@ GENSOURCES_WEBKIT := $(top_builddir)/DerivedSources/webkit GENPROGRAMS := $(top_builddir)/Programs GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector WebCore := $(srcdir)/WebCore - -# Programs to run the WebKitGtk unit tests -GTESTER = gtester -GTESTER_REPORT = gtester-report +WebKit := $(srcdir)/WebKit/gtk # Libraries and support components bin_PROGRAMS := @@ -91,7 +88,8 @@ global_cppflags += \ -Wformat -Wformat-security -Wno-format-y2k -Wundef \ -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \ -Wno-unused-parameter -Wno-parentheses \ - -fno-exceptions + -fno-exceptions -DENABLE_GLIB_SUPPORT=1 + global_cxxflags += \ $(SYMBOL_VISIBILITY_INLINES) \ @@ -108,10 +106,6 @@ if OS_GNU version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter endif -# Shared libraries -lib_LTLIBRARIES += \ - libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la - # Convenience libraries noinst_LTLIBRARIES += \ libJavaScriptCore.la @@ -148,109 +142,6 @@ libJavaScriptCore_la_CPPFLAGS = \ $(global_cppflags) \ $(javascriptcore_cppflags) -# WebKit -nodist_EXTRA_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \ - $(webcore_built_nosources) - -nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \ - $(webcore_built_sources) \ - $(webkitgtk_built_sources) - -libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit -libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \ - $(webkitgtk_static_h_api) - -nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \ - $(webkitgtk_built_h_api) \ - WebKit/gtk/webkit/webkitenumtypes.h - -libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \ - $(webcore_sources) \ - $(webcoregtk_sources) \ - $(webkitgtk_sources) - -libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS = \ - $(global_cxxflags) - -libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \ - $(global_cflags) - -# When building WebCore/WebKit, we want WebCore/config.h and NOT JavaScriptCore/config.h, -# hence, it's important that WebCore/ should come first before JavaScriptCore in the -# include path. -libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS = \ - -DBUILDING_WEBKIT \ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - -DDATA_DIR=\"${datadir}\" \ - -I$(top_builddir)/DerivedSources/webkit \ - -I$(srcdir)/WebCore/bindings \ - -I$(srcdir)/WebCore/bindings/gobject \ - -I$(srcdir)/WebKit/gtk \ - -I$(srcdir)/WebKit/gtk/WebCoreSupport \ - -I$(srcdir)/WebKit/gtk/webkit \ - -I$(top_builddir)/WebKit/gtk \ - -I$(top_builddir)/WebKit/gtk/webkit \ - -I$(GENSOURCES_WEBKIT) \ - $(global_cppflags) \ - $(webcore_cppflags) \ - $(webcoregtk_cppflags) \ - $(javascriptcore_cppflags) \ - -fno-strict-aliasing \ - $(HILDON_CPPFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(ENCHANT_CFLAGS) \ - $(GAIL_CFLAGS) \ - $(GEOCLUE_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(GTK_CFLAGS) \ - $(HILDON_CFLAGS) \ - $(LIBSOUP_CFLAGS) \ - $(LIBXML_CFLAGS) \ - $(LIBXSLT_CFLAGS) \ - $(SQLITE3_CFLAGS) \ - $(UNICODE_CFLAGS) \ - $(XT_CFLAGS) - -# For the Gtk port we want to use XP_UNIX both in X11 and Mac -if !TARGET_WIN32 -libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS += \ - -DXP_UNIX -endif - -libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \ - -version-info @LIBWEBKITGTK_VERSION@ \ - $(version_script) \ - $(no_undefined) - -libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \ - -lpthread \ - libJavaScriptCore.la \ - $(webcore_ldflags) \ - $(CAIRO_LIBS) \ - $(COVERAGE_LDFLAGS) \ - $(ENCHANT_LIBS) \ - $(FREETYPE_LIBS) \ - $(GAIL_LIBS) \ - $(GEOCLUE_LIBS) \ - $(GLIB_LIBS) \ - $(GSTREAMER_LIBS) \ - $(GTK_LIBS) \ - $(HILDON_LIBS) \ - $(JPEG_LIBS) \ - $(LIBSOUP_LIBS) \ - $(LIBXML_LIBS) \ - $(LIBXSLT_LIBS) \ - $(PANGO_LIBS) \ - $(PNG_LIBS) \ - $(SQLITE3_LIBS) \ - $(UNICODE_LIBS) \ - $(XT_LIBS) \ - $(WINMM_LIBS) \ - $(SHLWAPI_LIBS) \ - $(OLE32_LIBS) - -# # Extra checks and flags global_cppflags += \ -DBUILDING_CAIRO__=1 \ @@ -272,6 +163,11 @@ global_cppflags += \ -DUSE_SYSTEM_MALLOC endif +if USE_GSTREAMER +global_cppflags += \ + -DWTF_USE_GSTREAMER=1 +endif + # ---- # GTK+ 2.x/3.x support # ---- @@ -301,415 +197,19 @@ global_cppflags += \ -DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS endif -webkitgtk_static_h_api += \ - $(srcdir)/WebKit/gtk/webkit/webkit.h \ - $(srcdir)/WebKit/gtk/webkit/webkitdefines.h \ - $(srcdir)/WebKit/gtk/webkit/webkitdownload.h \ - $(srcdir)/WebKit/gtk/webkit/webkiterror.h \ - $(srcdir)/WebKit/gtk/webkit/webkithittestresult.h \ - $(srcdir)/WebKit/gtk/webkit/webkitnetworkrequest.h \ - $(srcdir)/WebKit/gtk/webkit/webkitnetworkresponse.h \ - $(srcdir)/WebKit/gtk/webkit/webkitsoupauthdialog.h \ - $(srcdir)/WebKit/gtk/webkit/webkitwebbackforwardlist.h \ - $(srcdir)/WebKit/gtk/webkit/webkitwebdatasource.h \ - $(srcdir)/WebKit/gtk/webkit/webkitwebframe.h \ - $(srcdir)/WebKit/gtk/webkit/webkitwebhistoryitem.h \ - $(srcdir)/WebKit/gtk/webkit/webkitwebinspector.h \ - $(srcdir)/WebKit/gtk/webkit/webkitwebnavigationaction.h \ - $(srcdir)/WebKit/gtk/webkit/webkitwebpolicydecision.h \ - $(srcdir)/WebKit/gtk/webkit/webkitgeolocationpolicydecision.h \ - $(srcdir)/WebKit/gtk/webkit/webkitwebresource.h \ - $(srcdir)/WebKit/gtk/webkit/webkitwebsettings.h \ - $(srcdir)/WebKit/gtk/webkit/webkitwebwindowfeatures.h \ - $(srcdir)/WebKit/gtk/webkit/webkitwebview.h \ - $(srcdir)/WebKit/gtk/webkit/webkitwebdatabase.h \ - $(srcdir)/WebKit/gtk/webkit/webkitsecurityorigin.h - -webkitgtk_built_h_api += \ - WebKit/gtk/webkit/webkitversion.h - -webkitgtk_h_api += \ - $(webkitgtk_built_h_api) \ - $(webkitgtk_static_h_api) - -# webkitenumtypes.{h,cpp} cannot be in webkitgtk_built_h_api, because -# the rule that builds it depends on webkitgtk_built_h_api (circular dependency). -webkitgtk_built_sources += \ - $(webkitgtk_built_h_api) \ - $(webkitgtk_gdom_built_sources) \ - DerivedSources/webkit/webkitmarshal.cpp \ - DerivedSources/webkit/webkitmarshal.h \ - WebKit/gtk/webkit/webkitenumtypes.cpp \ - WebKit/gtk/webkit/webkitenumtypes.h - -webkitgtk_sources += \ - WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ - WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \ - WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp \ - WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.h \ - WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/DragClientGtk.h \ - WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/EditorClientGtk.h \ - WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \ - WebKit/gtk/WebCoreSupport/FrameNetworkingContextGtk.h \ - WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp \ - WebKit/gtk/WebCoreSupport/FullscreenVideoController.h \ - WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \ - WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \ - WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \ - WebKit/gtk/webkit/webkitapplicationcache.cpp \ - WebKit/gtk/webkit/webkitdownload.cpp \ - WebKit/gtk/webkit/webkiterror.cpp \ - WebKit/gtk/webkit/webkithittestresult.cpp \ - WebKit/gtk/webkit/webkitnetworkrequest.cpp \ - WebKit/gtk/webkit/webkitnetworkresponse.cpp \ - WebKit/gtk/webkit/webkitprivate.cpp \ - WebKit/gtk/webkit/webkitprivate.h \ - WebKit/gtk/webkit/webkitsoupauthdialog.c \ - WebKit/gtk/webkit/webkitversion.cpp \ - WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \ - WebKit/gtk/webkit/webkitwebdatasource.cpp \ - WebKit/gtk/webkit/webkitwebframe.cpp \ - WebKit/gtk/webkit/webkitwebhistoryitem.cpp \ - WebKit/gtk/webkit/webkitwebinspector.cpp \ - WebKit/gtk/webkit/webkitwebnavigationaction.cpp \ - WebKit/gtk/webkit/webkitwebpolicydecision.cpp \ - WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp \ - WebKit/gtk/webkit/webkitwebresource.cpp \ - WebKit/gtk/webkit/webkitwebdatabase.cpp \ - WebKit/gtk/webkit/webkitsecurityorigin.cpp \ - WebKit/gtk/webkit/webkitwebsettings.cpp \ - WebKit/gtk/webkit/webkitwebview.cpp \ - WebKit/gtk/webkit/webkitwebwindowfeatures.cpp \ - WebKit/gtk/webkit/webkitworkers.cpp - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc - -if ENABLE_INTROSPECTION - -JSCore-@WEBKITGTK_API_VERSION@.gir: $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir - $(AM_V_GEN)cp $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir $(builddir)/ - -JSCORE_GIRSOURCES += JSCore-@WEBKITGTK_API_VERSION@.gir -WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir - -$(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la - $(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \ - --symbol-prefix=webkit \ - --identifier-prefix=WebKit \ - --namespace=WebKit \ - --nsversion=@WEBKITGTK_API_VERSION@ \ - --include=GObject-2.0 \ - --include=Gtk-@GTK_API_VERSION@ \ - --include=JSCore-@WEBKITGTK_API_VERSION@ \ - --include=Soup-2.4 \ - --library=webkitgtk-@WEBKITGTK_API_VERSION@ \ - --libtool="$(LIBTOOL)" \ - --pkg=gobject-2.0 \ - --pkg=gtk+-@GTK_API_VERSION@ \ - --pkg=libsoup-2.4 \ - --output=$@ \ - --add-include-path=$(top_srcdir)/WebKit/gtk \ - --add-include-path=$(builddir) \ - -I$(top_srcdir)/WebKit/gtk \ - -I$(top_builddir)/WebKit/gtk \ - -I$(top_builddir)/DerivedSources \ - -I$(top_builddir)/DerivedSources/webkit \ - -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \ - -I$(top_srcdir) \ - $(webkitgtk_h_api) \ - $(top_srcdir)/WebKit/gtk/webkit/*.cpp - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES) - -typelibsdir += $(libdir)/girepository-1.0 -typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib) - -%.typelib: %.gir $(G_IR_COMPILER) - $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk --includedir $(builddir) $< -o $@ - -CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA) - -endif - -EXTRA_DIST += $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir - -WEBKIT_MARSHAL = $(GENSOURCES_WEBKIT)/webkitmarshal -WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list -$(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp - @true - -$(WEBKIT_MARSHAL).h: stamp-webkitmarshal.h - @true - -stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST) - $(AM_V_GEN) echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \ - $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \ - echo timestamp > $(@F) - -stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST) - $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \ - echo timestamp > $(@F) - -WebKit/gtk/webkit/webkitenumtypes.h: stamp-webkitenumtypes.h - @true -stamp-webkitenumtypes.h: $(webkitgtk_h_api) GNUmakefile - $(AM_V_GEN)glib-mkenums \ - --fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \ - --fhead "#define WEBKIT_ENUM_TYPES_H\n\n" \ - --fhead "#include \n\n" \ - --fhead "#include \n\n" \ - --fhead "G_BEGIN_DECLS\n\n" \ - --ftail "G_END_DECLS\n\n" \ - --ftail "#endif\n" \ - --fprod "#include \n\n" \ - --eprod "#define WEBKIT_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \ - --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);\n\n" \ - $(webkitgtk_h_api) | \ - sed 's,web_kit,webkit,' | \ - sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \ - > xgen-gth \ - && (cmp -s xgen-gth WebKit/gtk/webkit/webkitenumtypes.h || cp xgen-gth WebKit/gtk/webkit/webkitenumtypes.h) \ - && rm -f xgen-gth \ - && echo timestamp > $(@F) - -WebKit/gtk/webkit/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile - $(AM_V_GEN)glib-mkenums \ - --fhead "#include \n" \ - --fhead "#include \n" \ - --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.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" \ - $(webkitgtk_h_api) | \ - sed 's,web_kit,webkit,' \ - > xgen-gtc \ - && cp xgen-gtc $@ \ - && rm -f xgen-gtc - -# GSettings -if USE_GSETTINGS -gsettings_SCHEMAS = $(top_builddir)/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml - -@GSETTINGS_RULES@ -endif - -# Files that will be distributed EXTRA_DIST += \ - $(srcdir)/gtk-doc.make \ - WebKit/LICENSE \ $(srcdir)/autotools/symbols.filter \ - $(srcdir)/WebKit/gtk/ChangeLog \ - $(srcdir)/WebKit/gtk/NEWS \ - $(srcdir)/WebKit/gtk/webkitmarshal.list \ - $(srcdir)/WebKit/gtk/docs/GNUmakefile.* \ - $(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \ - $(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \ - $(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \ - $(srcdir)/WebKit/gtk/docs/version.xml.in \ - $(srcdir)/WebKit/gtk/po/* \ - $(srcdir)/WebKit/gtk/resources/* \ - $(srcdir)/WebKit/gtk/tests/resources/* \ - $(srcdir)/WebKit/gtk/tests/test_utils.h \ - $(srcdir)/WebKit/gtk/org.webkitgtk.gschema.xml.in - -# extra resource files -resourcesdir = ${datadir}/webkit-@WEBKITGTK_API_VERSION@/resources -dist_resources_DATA = \ - $(shell ls $(srcdir)/WebKit/gtk/resources/*.html) - -# END WEBKIT GTK+ + $(srcdir)/gtk-doc.make \ + $(srcdir)/WebKit/LICENSE # Include module makefiles include JavaScriptCore/GNUmakefile.am include WebCore/GNUmakefile.am +include WebKit/gtk/GNUmakefile.am include WebCore/bindings/gobject/GNUmakefile.am include WebKitTools/GNUmakefile.am include WebKit/gtk/po/GNUmakefile.am -# Build unit tests -noinst_PROGRAMS += $(TEST_PROGS) - -webkit_tests_cflags = \ - -fno-strict-aliasing \ - -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_cppflags) \ - $(global_cflags) \ - $(GLIB_CFLAGS) \ - $(GTK_CFLAGS) \ - $(LIBSOUP_CFLAGS) - -webkit_tests_ldadd = \ - libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ - $(GTK_LIBS) \ - $(GLIB_LIBS) \ - $(LIBSOUP_LIBS) - -webkit_tests_ldflags = \ - -no-install \ - -no-fast-install - -TEST_PROGS += \ - Programs/unittests/testdomdocument \ - Programs/unittests/testdomdomwindow \ - Programs/unittests/testdomnode \ - Programs/unittests/testhttpbackend \ - Programs/unittests/testloading \ - Programs/unittests/testglobals \ - Programs/unittests/testmimehandling \ - Programs/unittests/testnetworkrequest \ - Programs/unittests/testnetworkresponse \ - Programs/unittests/testwebframe \ - Programs/unittests/testwebbackforwardlist \ - Programs/unittests/testwebhistoryitem \ - Programs/unittests/testwindow \ - Programs/unittests/testdownload \ - Programs/unittests/testatk \ - Programs/unittests/testatkroles \ - Programs/unittests/testhittestresult \ - Programs/unittests/testwebsettings \ - Programs/unittests/testwebresource \ - Programs/unittests/testwebdatasource \ - Programs/unittests/testwebview \ - Programs/unittests/testkeyevents \ - Programs/unittests/testcopyandpaste - -# 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_testdomnode_SOURCES = WebKit/gtk/tests/testdomnode.c -Programs_unittests_testdomnode_CFLAGS = $(webkit_tests_cflags) -Programs_unittests_testdomnode_LDADD = $(webkit_tests_ldadd) -Programs_unittests_testdomnode_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) -Programs_unittests_testloading_LDFLAGS = $(webkit_tests_ldflags) - -Programs_unittests_testmimehandling_SOURCES = WebKit/gtk/tests/testmimehandling.c WebKit/gtk/tests/test_utils.c -Programs_unittests_testmimehandling_CFLAGS = $(webkit_tests_cflags) -Programs_unittests_testmimehandling_LDADD = $(webkit_tests_ldadd) -Programs_unittests_testmimehandling_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_testnetworkresponse_SOURCES = WebKit/gtk/tests/testnetworkresponse.c -Programs_unittests_testnetworkresponse_CFLAGS = $(webkit_tests_cflags) -Programs_unittests_testnetworkresponse_LDADD = $(webkit_tests_ldadd) -Programs_unittests_testnetworkresponse_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) -Programs_unittests_testwebframe_LDFLAGS = $(webkit_tests_ldflags) - -Programs_unittests_testwebbackforwardlist_SOURCES = WebKit/gtk/tests/testwebbackforwardlist.c -Programs_unittests_testwebbackforwardlist_CFLAGS = $(webkit_tests_cflags) -Programs_unittests_testwebbackforwardlist_LDADD = $(webkit_tests_ldadd) -Programs_unittests_testwebbackforwardlist_LDFLAGS = $(webkit_tests_ldflags) - -Programs_unittests_testwebhistoryitem_SOURCES = WebKit/gtk/tests/testwebhistoryitem.c -Programs_unittests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags) -Programs_unittests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd) -Programs_unittests_testwebhistoryitem_LDFLAGS = $(webkit_tests_ldflags) - -Programs_unittests_testwindow_SOURCES = WebKit/gtk/tests/testwindow.c -Programs_unittests_testwindow_CFLAGS = $(webkit_tests_cflags) -Programs_unittests_testwindow_LDADD = $(webkit_tests_ldadd) -Programs_unittests_testwindow_LDFLAGS = $(webkit_tests_ldflags) - -Programs_unittests_testdownload_SOURCES = WebKit/gtk/tests/testdownload.c -Programs_unittests_testdownload_CFLAGS = $(webkit_tests_cflags) -Programs_unittests_testdownload_LDADD = $(webkit_tests_ldadd) -Programs_unittests_testdownload_LDFLAGS = $(webkit_tests_ldflags) - -Programs_unittests_testatk_SOURCES = WebKit/gtk/tests/testatk.c -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) -Programs_unittests_testwebsettings_LDFLAGS = $(webkit_tests_ldflags) - -Programs_unittests_testwebresource_SOURCES = WebKit/gtk/tests/testwebresource.c -Programs_unittests_testwebresource_CFLAGS = $(webkit_tests_cflags) -Programs_unittests_testwebresource_LDADD = $(webkit_tests_ldadd) - -Programs_unittests_testwebdatasource_SOURCES = WebKit/gtk/tests/testwebdatasource.c -Programs_unittests_testwebdatasource_CFLAGS = $(webkit_tests_cflags) -Programs_unittests_testwebdatasource_LDADD = $(webkit_tests_ldadd) - -Programs_unittests_testwebview_SOURCES = WebKit/gtk/tests/testwebview.c WebKit/gtk/tests/test_utils.c -Programs_unittests_testwebview_CFLAGS = $(webkit_tests_cflags) -Programs_unittests_testwebview_LDADD = $(webkit_tests_ldadd) -Programs_unittests_testwebview_LDFLAGS = $(webkit_tests_ldflags) - -Programs_unittests_testhittestresult_SOURCES = WebKit/gtk/tests/testhittestresult.c -Programs_unittests_testhittestresult_CFLAGS = $(webkit_tests_cflags) -Programs_unittests_testhittestresult_LDADD = $(webkit_tests_ldadd) - -Programs_unittests_testkeyevents_SOURCES = WebKit/gtk/tests/testkeyevents.c -Programs_unittests_testkeyevents_CFLAGS = $(webkit_tests_cflags) -Programs_unittests_testkeyevents_LDADD = $(webkit_tests_ldadd) -Programs_unittests_testkeyevents_LDFLAGS = $(webkit_tests_ldflags) - -Programs_unittests_testcopyandpaste_SOURCES = WebKit/gtk/tests/testcopyandpaste.c \ - WebCore/platform/gtk/GtkVersioning.c -Programs_unittests_testcopyandpaste_CFLAGS = $(webkit_tests_cflags) \ - -I$(srcdir)/WebCore/platform/gtk \ - -I$(srcdir)/WebCore -Programs_unittests_testcopyandpaste_LDADD = $(webkit_tests_ldadd) -Programs_unittests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags) - # Autogenerated sources BUILT_SOURCES += \ $(javascriptcore_built_sources) \ @@ -719,25 +219,10 @@ BUILT_SOURCES += \ $(webkitgtk_built_sources) \ $(webkitgtk_built_nosources) -# Project-wide clean rules -# Files that will be cleaned -CLEANFILES += \ - $(BUILT_SOURCES) \ - $(top_builddir)/stamp-webkitmarshal.cpp \ - $(top_builddir)/stamp-webkitmarshal.h \ - $(top_builddir)/stamp-webkitenumtypes.cpp \ - $(top_builddir)/stamp-webkitenumtypes.h \ - $(top_builddir)/Programs/GtkLauncher - DISTCLEANFILES += \ $(CLEANFILES) \ $(builddir)/doltcompile \ - $(builddir)/doltlibtool \ - $(top_builddir)/WebKit/gtk/docs/version.xml \ - $(top_builddir)/WebKit/gtk/docs/GNUmakefile \ - $(top_builddir)/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc \ - $(top_builddir)/WebKit/gtk/webkit/webkitversion.h \ - $(top_builddir)/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml + $(builddir)/doltlibtool MAINTAINERCLEANFILES += \ $(CLEANFILES) \ @@ -757,7 +242,7 @@ MAINTAINERCLEANFILES += \ # Older automake versions (1.7) place Plo files in a different place so we need # to create the output directory manually. -all-local: stamp-po +all-local: $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources # remove built sources and program directories @@ -765,35 +250,5 @@ clean-local: -rm -rf $(GENPROGRAMS) maintainer-clean-local: distclean-local - distclean-local: -rm -rf $(GENSOURCES) $(GENPROGRAMS) - -dist-hook: - cp $(srcdir)/WebKit/gtk/NEWS $(distdir) - -install-data-local: po-install-data-local - -installdirs-data-local: po-installdirs-data-local - -uninstall-local: po-uninstall-local - -# Run all tests in cwd -# FIXME: we should run this under xvfb -test: $(TEST_PROGS) - $(GTESTER) --verbose $(TEST_PROGS); - -# test-report: run tests in cwd and generate report -# full-report: run tests in cwd with -m perf and -m slow and generate report -# perf-report: run tests in cwd with -m perf and generate report -test-report full-report perf-report: $(TEST_PROGS) - @ case $@ in \ - test-report) test_options="-k";; \ - full-report) test_options="-k -m=perf";; \ - perf-report) test_options="-k -m=perf -m=slow";; \ - esac ; \ - $(GTESTER) --verbose $$test_options -o test-report.xml $(TEST_PROGS); \ - $(GTESTER_REPORT) test-report.xml > test-report.html ; - -.PHONY: test test-report perf-report full-report -check-local: test diff --git a/recipes/webkit/webkit-gtk/configure.ac b/recipes/webkit/webkit-gtk/configure.ac index dea741a418..cf7a67a66d 100644 --- a/recipes/webkit/webkit-gtk/configure.ac +++ b/recipes/webkit/webkit-gtk/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ(2.59) m4_define([webkit_major_version], [1]) m4_define([webkit_minor_version], [3]) -m4_define([webkit_micro_version], [4]) +m4_define([webkit_micro_version], [6]) # 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 -LIBWEBKITGTK_VERSION=2:0:2 +LIBWEBKITGTK_VERSION=3:1:3 AC_SUBST([LIBWEBKITGTK_VERSION]) AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar]) @@ -199,7 +199,7 @@ case "$with_gtk" in GAIL_PC_NAME=gail GAIL_REQUIRED_VERSION=1.8 ;; - 3.0) GTK_REQUIRED_VERSION=2.90 + 3.0) GTK_REQUIRED_VERSION=2.91 GTK_API_VERSION=3.0 WEBKITGTK_API_MAJOR_VERSION=3 WEBKITGTK_API_MINOR_VERSION=0 @@ -453,14 +453,6 @@ AC_ARG_ENABLE(datalist, [],[enable_datalist="yes"]) AC_MSG_RESULT([$enable_datalist]) -# check whether to enable HTML5 ruby support -AC_MSG_CHECKING([whether to enable HTML5 ruby support]) -AC_ARG_ENABLE(ruby, - AC_HELP_STRING([--enable-ruby], - [enable HTML5 ruby support [default=yes]]), - [],[enable_ruby="yes"]) -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(sandbox, @@ -735,6 +727,17 @@ if test "$enable_opcode_stats" = "yes"; then AC_DEFINE([ENABLE_OPCODE_STATS], [1], [Define to enable Opcode statistics]) fi +# Link prefetch +AC_MSG_CHECKING([whether to enable link prefetch support]) +AC_ARG_ENABLE([link-prefetch], + [AS_HELP_STRING([--enable-link-prefetch], [Enable Link prefetch support (default: disabled)])], + [],[enable_link_prefetch=no]) +AC_MSG_RESULT([$enable_link_prefetch]) + +if test "$enable_link_prefetch" = "yes"; then + AC_DEFINE([ENABLE_LINK_PREFETCH], [1], [Define to enable link prefetch support]) +fi + # GObject Introspection AC_MSG_CHECKING([whether to enable GObject introspection support]) AC_ARG_ENABLE([introspection], @@ -863,7 +866,10 @@ if test "$enable_video" = "yes"; then gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION - gstreamer-video-0.10]) + gstreamer-video-0.10], + [have_gstreamer=yes], + [have_gstreamer=no]) + AC_SUBST([GSTREAMER_CFLAGS]) AC_SUBST([GSTREAMER_LIBS]) fi @@ -907,6 +913,9 @@ AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"]) # GLib/GIO feature conditionals AM_CONDITIONAL([USE_GSETTINGS], [test "$have_gsettings" = "yes"]) +# GStreamer feature conditional +AM_CONDITIONAL([USE_GSTREAMER], [test "$have_gstreamer" = "yes"]) + # WebKit feature conditionals AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"]) AM_CONDITIONAL([ENABLE_3D_TRANSFORMS],[test "$enable_3D_transforms" = "yes"]) @@ -931,8 +940,6 @@ AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"]) AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "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"]) -AM_CONDITIONAL([ENABLE_SANDBOX],[test "$enable_sandbox" = "yes"]) AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"]) AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"]) AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" = "yes"]) @@ -1000,12 +1007,12 @@ Features: HTML5 client-side session and persistent storage support : $enable_dom_storage HTML5 client-side database storage support : $enable_database HTML5 FileSystem API support : $enable_file_system - HTML5 ruby support : $enable_ruby HTML5 sandboxed iframe support : $enable_sandbox HTML5 server-sent events support : $enable_eventsource HTML5 video element support : $enable_video Icon database support : $enable_icon_database Image resizer support : $enable_image_resizer + Link prefetch support : $enable_link_prefetch Opcode stats : $enable_opcode_stats SharedWorkers support : $enable_shared_workers Speech input support : $enable_input_speech @@ -1022,6 +1029,7 @@ Features: XHTML-MP support : $enable_xhtmlmp XPATH support : $enable_xpath XSLT support : $enable_xslt + GTK+ configuration: GTK+ version : $with_gtk GDK target : $with_target diff --git a/recipes/webkit/webkit-gtk_svn.bb b/recipes/webkit/webkit-gtk_svn.bb index 74fb33b7f9..4a12c34795 100644 --- a/recipes/webkit/webkit-gtk_svn.bb +++ b/recipes/webkit/webkit-gtk_svn.bb @@ -3,9 +3,9 @@ DEPENDS = "geoclue enchant gtk-doc-native gtk-doc gnome-keyring libsoup-2.4 curl SRCREV_FORMAT = "webcore-rwebkit" -PR = "r1" -SRCREV = "68244" -PV = "1.3.4+svnr${SRCPV}" +PR = "r0" +SRCREV = "72648" +PV = "1.3.6+svnr${SRCPV}" SRC_URI = "\ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ @@ -34,6 +34,7 @@ EXTRA_OECONF = "\ --enable-svg \ --enable-icon-database=yes \ --enable-geolocation=yes \ + --enable-link-prefetch \ # --with-unicode-backend=glib \ " -- 2.39.5