diff options
author | Koen Kooi <koen@openembedded.org> | 2010-09-24 13:11:01 +0200 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2010-09-24 13:37:18 +0200 |
commit | 5d462f7230c2ced6baecf516103b616ab6933b74 (patch) | |
tree | 3200a717b7be8a2f193e342e010cd03aa7067540 /recipes/webkit/webkit-gtk | |
parent | 845625651f891fbd14ed15698785cce1a7e67c1e (diff) | |
download | openembedded-5d462f7230c2ced6baecf516103b616ab6933b74.tar.gz |
webkit-gtk: bump SRCREV
Diffstat (limited to 'recipes/webkit/webkit-gtk')
-rw-r--r-- | recipes/webkit/webkit-gtk/GNUmakefile.am | 407 | ||||
-rw-r--r-- | recipes/webkit/webkit-gtk/Makefile | 2 | ||||
-rw-r--r-- | recipes/webkit/webkit-gtk/autogen.sh | 2 | ||||
-rw-r--r-- | recipes/webkit/webkit-gtk/configure.ac | 209 |
4 files changed, 348 insertions, 272 deletions
diff --git a/recipes/webkit/webkit-gtk/GNUmakefile.am b/recipes/webkit/webkit-gtk/GNUmakefile.am index a662290fd5..c769db2db8 100644 --- a/recipes/webkit/webkit-gtk/GNUmakefile.am +++ b/recipes/webkit/webkit-gtk/GNUmakefile.am @@ -16,15 +16,11 @@ # webcore_sources, gtk port API and WebCoreSupport parts to webkitgtk_sources, # etc... The only exceptions are the global variables. See Global Variables # below. -# -# Global Variables -# -# global_cppflags = CPPFLAGS that apply to JSC, WebCore, and to any -# specific port -# global_cflags = CFLAGS that apply to JSC, WebCore, and to -# any specific port -# global_cxxflags = CXXFLAGS that apply to JSC, WebCore, and to any -# specific port + +# Global Variables Reference +# global_cppflags = CPPFLAGS that apply to all C/C++ files that are built for any project. +# global_cflags = CFLAGS that apply to all C files that are built for any project. +# global_cxxflags = CXXFLAGS that apply to all C++ files that are bult for any project. srcdir = @srcdir@ VPATH = @srcdir@ @@ -35,14 +31,12 @@ DISTCHECK_CONFIGURE_FLAGS = \ # Directory for autogenerated sources GENSOURCES := $(top_builddir)/DerivedSources -GENSOURCESWEBKITDOM := $(top_builddir)/DerivedSources/webkit +GENSOURCES_JAVASCRIPTCORE := $(top_builddir)/DerivedSources/JavaScriptCore +GENSOURCES_WEBCORE := $(top_builddir)/DerivedSources/WebCore +GENSOURCES_WEBKIT := $(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 +GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector +WebCore := $(srcdir)/WebCore # Programs to run the WebKitGtk unit tests GTESTER = gtester @@ -53,7 +47,7 @@ bin_PROGRAMS := noinst_PROGRAMS := noinst_HEADERS := noinst_LTLIBRARIES := -lib_LIBRARIES := +lib_LTLIBRARIES := IDL_BINDINGS := TEST_PROGS := POFILES := @@ -63,36 +57,27 @@ javascriptcore_cppflags:= javascriptcore_sources := javascriptcore_built_sources := javascriptcore_built_nosources := -javascriptcore_dist := webcore_cppflags := webcore_sources := webcore_libadd := webcore_built_sources := 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 := +webcoregtk_cppflags := +webkitgtk_built_h_api := +webkitgtk_static_h_api := webkitgtk_h_api := webkitgtk_sources := webkitgtk_cppflags := +webkitgtk_gdom_built_sources := webkitgtk_built_sources := webkitgtk_built_nosources := -webkitgtk_cleanfiles := global_cppflags := global_cflags := global_cxxflags := -corekit_cflags := -corekit_cppflags := JSCORE_GIRSOURCES := WEBKIT_GIRSOURCES := +FEATURE_DEFINES := typelibsdir := typelibs_DATA := EXTRA_DIST := @@ -101,49 +86,7 @@ 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 -# Don't include them for now to reduce the noise when compiling -# $(GLIB_CFLAGS) $(CAIRO_CFLAGS) $(PANGO_CFLAGS) $(FREETYPE_CFLAGS) -corekit_cflags += \ - -fno-strict-aliasing \ - $(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) - -# 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. -corekit_cppflags += \ - $(global_cppflags) \ - $(webcore_cppflags) \ - $(webcoregtk_cppflags) \ - $(javascriptcore_cppflags) - -# For the Gtk port we want to use XP_UNIX both in X11 and Mac -if !TARGET_WIN32 -corekit_cppflags += -DXP_UNIX -endif - -# Default compiler flags -global_cflags += \ +global_cppflags += \ -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \ -Wformat -Wformat-security -Wno-format-y2k -Wundef \ -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \ @@ -151,7 +94,6 @@ global_cflags += \ -fno-exceptions global_cxxflags += \ - $(global_cflags) \ $(SYMBOL_VISIBILITY_INLINES) \ -fno-rtti @@ -159,7 +101,7 @@ global_cxxflags += \ # It breaks the build on other platforms, so we use it conditionally if OS_WIN32 no_undefined = -no-undefined -version_script = -export-symbols-regex "^(webkit_|JS).*" +version_script = -export-symbols-regex "^(webkit_|k?JS).*" endif if OS_GNU @@ -167,29 +109,20 @@ version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter endif # Shared libraries -lib_LTLIBRARIES = \ - libwebkit-1.0.la +lib_LTLIBRARIES += \ + libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la # Convenience libraries noinst_LTLIBRARIES += \ libJavaScriptCore.la -# JavaScriptCore -javascriptcore_cppflags += \ - -I$(srcdir)/JavaScriptCore/ForwardingHeaders \ - -I$(srcdir)/JavaScriptCore/parser \ - -I$(srcdir)/JavaScriptCore/wtf \ - -I$(srcdir)/JavaScriptCore/wtf/gtk \ - -I$(srcdir)/JavaScriptCore/wtf/gobject \ - -I$(top_builddir)/DerivedSources - nodist_EXTRA_libJavaScriptCore_la_SOURCES = \ $(javascriptcore_built_nosources) nodist_libJavaScriptCore_la_SOURCES = \ $(javascriptcore_built_sources) -libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore +libJavaScriptCore_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/JavaScriptCore libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api) libJavaScriptCore_la_SOURCES = \ @@ -216,46 +149,83 @@ libJavaScriptCore_la_CPPFLAGS = \ $(javascriptcore_cppflags) # WebKit -nodist_EXTRA_libwebkit_1_0_la_SOURCES = \ +nodist_EXTRA_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \ $(webcore_built_nosources) -nodist_libwebkit_1_0_la_SOURCES = \ +nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \ $(webcore_built_sources) \ $(webkitgtk_built_sources) -libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit -libwebkit_1_0_la_HEADERS = \ - $(webkitgtk_h_api) \ +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 -libwebkit_1_0_la_SOURCES = \ +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \ $(webcore_sources) \ $(webcoregtk_sources) \ $(webkitgtk_sources) -libwebkit_1_0_la_CXXFLAGS = \ - $(global_cxxflags) \ - $(corekit_cflags) +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS = \ + $(global_cxxflags) -libwebkit_1_0_la_CFLAGS = \ - $(global_cflags) \ - $(corekit_cflags) +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \ + $(global_cflags) -libwebkit_1_0_la_CPPFLAGS = \ - $(corekit_cppflags) \ - $(webkitgtk_cppflags) \ - $(HILDON_CPPFLAGS) +# 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 -libwebkit_1_0_la_LDFLAGS = \ +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \ -version-info @LIBWEBKITGTK_VERSION@ \ $(version_script) \ $(no_undefined) -libwebkit_1_0_la_LIBADD = \ +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \ -lpthread \ libJavaScriptCore.la \ - libWebCoreJS.la \ - libgdom.la \ $(webcore_ldflags) \ $(CAIRO_LIBS) \ $(COVERAGE_LDFLAGS) \ @@ -275,16 +245,10 @@ libwebkit_1_0_la_LIBADD = \ $(PNG_LIBS) \ $(SQLITE3_LIBS) \ $(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 + $(XT_LIBS) \ + $(WINMM_LIBS) \ + $(SHLWAPI_LIBS) \ + $(OLE32_LIBS) # # Extra checks and flags @@ -308,18 +272,24 @@ global_cppflags += \ -DUSE_SYSTEM_MALLOC endif +# ---- +# GTK+ 2.x/3.x support +# ---- +if GTK_API_VERSION_2 +global_cppflags += \ + -DGTK_API_VERSION_2=1 +endif + if !ENABLE_DEBUG global_cppflags += -DNDEBUG global_cflags += $(SYMBOL_VISIBILITY) - else -webcoregtk_cppflags += \ +global_cppflags += \ -DG_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ -DPANGO_DISABLE_DEPRECATED - # Might be useful in the future # -DGDK_MULTIHEAD_SAFE \ # -DGTK_MULTIHEAD_SAFE @@ -331,7 +301,7 @@ global_cppflags += \ -DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS endif -webkitgtk_h_api += \ +webkitgtk_static_h_api += \ $(srcdir)/WebKit/gtk/webkit/webkit.h \ $(srcdir)/WebKit/gtk/webkit/webkitdefines.h \ $(srcdir)/WebKit/gtk/webkit/webkitdownload.h \ @@ -353,14 +323,23 @@ webkitgtk_h_api += \ $(srcdir)/WebKit/gtk/webkit/webkitwebwindowfeatures.h \ $(srcdir)/WebKit/gtk/webkit/webkitwebview.h \ $(srcdir)/WebKit/gtk/webkit/webkitwebdatabase.h \ - $(srcdir)/WebKit/gtk/webkit/webkitsecurityorigin.h \ - $(top_builddir)/WebKit/gtk/webkit/webkitversion.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 += \ - DerivedSources/webkitenumtypes.cpp \ - DerivedSources/webkitdomenumtypes.cpp \ - DerivedSources/webkitmarshal.cpp \ - DerivedSources/webkitmarshal.h \ + $(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 += \ @@ -376,6 +355,9 @@ webkitgtk_sources += \ 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 \ @@ -406,61 +388,43 @@ webkitgtk_sources += \ WebKit/gtk/webkit/webkitwebwindowfeatures.cpp \ WebKit/gtk/webkit/webkitworkers.cpp -webkitgtk_cppflags += \ - -DBUILDING_WEBKIT \ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - -DDATA_DIR=\"${datadir}\" \ - -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$(GENSOURCESWEBKITDOM) - -webkitgtk_cleanfiles += \ - $(top_builddir)/stamp-webkitmarshal.cpp \ - $(top_builddir)/stamp-webkitmarshal.h \ - $(top_builddir)/stamp-webkitenumtypes.cpp \ - $(top_builddir)/stamp-webkitenumtypes.h \ - $(top_builddir)/Programs/GtkLauncher \ - $(top_builddir)/WebKit/gtk/docs/version.xml \ - $(top_builddir)/WebKit/gtk/docs/GNUmakefile \ - $(top_builddir)/WebKit/gtk/webkit-1.0.pc \ - $(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h \ - $(top_builddir)/WebKit/gtk/webkit/webkitversion.h - pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc +pkgconfig_DATA = WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc if ENABLE_INTROSPECTION -JSCORE_GIRSOURCES += JSCore-1.0.gir -WEBKIT_GIRSOURCES += WebKit-1.0.gir -# JSCore-1.0.gir is handwritten - this is a hack to make the typelib -# generation work during make dist -JSCore-1.0.gir: $(srcdir)/WebKit/gtk/JSCore-1.0.gir - cp $(srcdir)/WebKit/gtk/JSCore-1.0.gir $(builddir)/ +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)/ -$(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER) libwebkit-1.0.la - $(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=1.0 \ +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-2.0 \ - --include=JSCore-1.0 \ + --include=Gtk-@GTK_API_VERSION@ \ + --include=JSCore-@WEBKITGTK_API_VERSION@ \ --include=Soup-2.4 \ - --library=webkit-1.0 \ + --library=webkitgtk-@WEBKITGTK_API_VERSION@ \ --libtool="$(LIBTOOL)" \ - --pkg gobject-2.0 \ - --pkg gtk+-2.0 \ - --pkg libsoup-2.4 \ - --output $@ \ - --add-include-path $(top_srcdir)/WebKit/gtk \ + --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) \ - $(libgdom_h_api) + $(top_srcdir)/WebKit/gtk/webkit/*.cpp girdir = $(datadir)/gir-1.0 gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES) @@ -469,17 +433,16 @@ 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 $< -o $@ + $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk --includedir $(builddir) $< -o $@ CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA) endif -EXTRA_DIST += WebKit/gtk/JSCore-1.0.gir +EXTRA_DIST += $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir -WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal +WEBKIT_MARSHAL = $(GENSOURCES_WEBKIT)/webkitmarshal WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list - $(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp @true @@ -517,7 +480,7 @@ stamp-webkitenumtypes.h: $(webkitgtk_h_api) GNUmakefile && rm -f xgen-gth \ && echo timestamp > $(@F) -DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile +WebKit/gtk/webkit/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile $(AM_V_GEN)glib-mkenums \ --fhead "#include <config.h>\n" \ --fhead "#include <glib-object.h>\n" \ @@ -539,55 +502,17 @@ 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) +# GSettings +if USE_GSETTINGS +gsettings_SCHEMAS = $(top_builddir)/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml -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 +@GSETTINGS_RULES@ +endif # Files that will be distributed EXTRA_DIST += \ $(srcdir)/gtk-doc.make \ WebKit/LICENSE \ - $(javascriptcore_dist) \ - $(webcore_dist) \ $(srcdir)/autotools/symbols.filter \ $(srcdir)/WebKit/gtk/ChangeLog \ $(srcdir)/WebKit/gtk/NEWS \ @@ -600,10 +525,11 @@ EXTRA_DIST += \ $(srcdir)/WebKit/gtk/po/* \ $(srcdir)/WebKit/gtk/resources/* \ $(srcdir)/WebKit/gtk/tests/resources/* \ - $(srcdir)/WebKit/gtk/tests/test_utils.h + $(srcdir)/WebKit/gtk/tests/test_utils.h \ + $(srcdir)/WebKit/gtk/org.webkitgtk.gschema.xml.in # extra resource files -resourcesdir = ${datadir}/webkit-1.0/resources +resourcesdir = ${datadir}/webkit-@WEBKITGTK_API_VERSION@/resources dist_resources_DATA = \ $(shell ls $(srcdir)/WebKit/gtk/resources/*.html) @@ -612,6 +538,7 @@ dist_resources_DATA = \ # Include module makefiles include JavaScriptCore/GNUmakefile.am include WebCore/GNUmakefile.am +include WebCore/bindings/gobject/GNUmakefile.am include WebKitTools/GNUmakefile.am include WebKit/gtk/po/GNUmakefile.am @@ -626,14 +553,15 @@ webkit_tests_cflags = \ -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 = \ - libwebkit-1.0.la \ - $(GTK_LIBS) \ + libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ + $(GTK_LIBS) \ $(GLIB_LIBS) \ $(LIBSOUP_LIBS) @@ -644,6 +572,7 @@ webkit_tests_ldflags = \ TEST_PROGS += \ Programs/unittests/testdomdocument \ Programs/unittests/testdomdomwindow \ + Programs/unittests/testdomnode \ Programs/unittests/testhttpbackend \ Programs/unittests/testloading \ Programs/unittests/testglobals \ @@ -662,7 +591,8 @@ TEST_PROGS += \ Programs/unittests/testwebresource \ Programs/unittests/testwebdatasource \ Programs/unittests/testwebview \ - Programs/unittests/testkeyevents + Programs/unittests/testkeyevents \ + Programs/unittests/testcopyandpaste # Add additional tests here Programs_unittests_testdomdocument_SOURCES = WebKit/gtk/tests/testdomdocument.c @@ -675,6 +605,11 @@ 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) @@ -767,6 +702,14 @@ 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) \ @@ -774,20 +717,27 @@ BUILT_SOURCES += \ $(webcore_built_sources) \ $(webcore_built_nosources) \ $(webkitgtk_built_sources) \ - $(webkitgtk_built_nosources) \ - $(gdom_built_nosources) + $(webkitgtk_built_nosources) # Project-wide clean rules # Files that will be cleaned CLEANFILES += \ $(BUILT_SOURCES) \ - $(webkitgtk_cleanfiles) \ - $(libgdom_cleanfiles) + $(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 + $(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 MAINTAINERCLEANFILES += \ $(CLEANFILES) \ @@ -819,6 +769,9 @@ 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 diff --git a/recipes/webkit/webkit-gtk/Makefile b/recipes/webkit/webkit-gtk/Makefile index 1e50d1d358..cdee9da7a6 100644 --- a/recipes/webkit/webkit-gtk/Makefile +++ b/recipes/webkit/webkit-gtk/Makefile @@ -1,4 +1,4 @@ -MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools +MODULES = JavaScriptCore JavaScriptGlue ANGLE WebCore WebKit WebKit2 WebKitTools all: @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ diff --git a/recipes/webkit/webkit-gtk/autogen.sh b/recipes/webkit/webkit-gtk/autogen.sh index 97beb209d2..60b163d550 100644 --- a/recipes/webkit/webkit-gtk/autogen.sh +++ b/recipes/webkit/webkit-gtk/autogen.sh @@ -10,7 +10,7 @@ cd $srcdir GTKDOCIZE_FLAGS="--copy" LIBTOOLIZE_FLAGS="--force --automake" -ACLOCAL_FLAGS="-I autotools" +ACLOCAL_FLAGS="-I autotools $ACLOCAL_FLAGS" AUTOMAKE_FLAGS="--foreign --add-missing" DIE=0 diff --git a/recipes/webkit/webkit-gtk/configure.ac b/recipes/webkit/webkit-gtk/configure.ac index be29495cff..dea741a418 100644 --- a/recipes/webkit/webkit-gtk/configure.ac +++ b/recipes/webkit/webkit-gtk/configure.ac @@ -2,14 +2,14 @@ AC_PREREQ(2.59) m4_define([webkit_major_version], [1]) m4_define([webkit_minor_version], [3]) -m4_define([webkit_micro_version], [1]) +m4_define([webkit_micro_version], [4]) # 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]) +m4_define([webkit_user_agent_major_version], [534]) +m4_define([webkit_user_agent_minor_version], [7]) AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/]) @@ -34,8 +34,8 @@ 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=20:0:18 +dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html +LIBWEBKITGTK_VERSION=2:0:2 AC_SUBST([LIBWEBKITGTK_VERSION]) AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar]) @@ -167,6 +167,56 @@ if test "$png_ok" != yes; then fi AC_SUBST([PNG_LIBS]) + +if test "$os_win32" = "yes"; then + WINMM_LIBS=-lwinmm + SHLWAPI_LIBS=-lshlwapi + OLE32_LIBS=-lole32 +fi +AC_SUBST([WINMM_LIBS]) +AC_SUBST([SHLWAPI_LIBS]) +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)])], + [case "$with_gtk" in + 2.0|3.0) ;; + *) AC_MSG_ERROR([invalid GTK+ version specified]) ;; + esac], + [with_gtk=2.0]) +AC_MSG_RESULT([$with_gtk]) + +case "$with_gtk" in + 2.0) GTK_REQUIRED_VERSION=2.10 + 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 + ;; + 3.0) GTK_REQUIRED_VERSION=2.90 + 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=2.90.4 + ;; +esac + +AC_SUBST([WEBKITGTK_API_MAJOR_VERSION]) +AC_SUBST([WEBKITGTK_API_MINOR_VERSION]) +AC_SUBST([WEBKITGTK_API_VERSION]) +AC_SUBST([WEBKITGTK_PC_NAME]) +AC_SUBST([GTK_API_VERSION]) +AM_CONDITIONAL([GTK_API_VERSION_2],[test "$GTK_API_VERSION" = "2.0"]) + # determine the GDK/GTK+ target AC_MSG_CHECKING([the target windowing system]) AC_ARG_WITH(target, @@ -205,7 +255,6 @@ LIBXML_REQUIRED_VERSION=2.6 # minimum GTK+ base dependencies PANGO_REQUIRED_VERSION=1.12 -GTK_REQUIRED_VERSION=2.10 # optional modules LIBXSLT_REQUIRED_VERSION=1.1.7 @@ -213,7 +262,6 @@ SQLITE_REQUIRED_VERSION=3.0 GSTREAMER_REQUIRED_VERSION=0.10 GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=0.10.25 ENCHANT_REQUIRED_VERSION=0.22 -GAIL_REQUIRED_VERSION=1.8 # Available modules # @@ -223,7 +271,17 @@ GAIL_REQUIRED_VERSION=1.8 # todo: webcore gtk WEBKIT_CHECK_DEPENDENCIES([glib unicode]) -GETTEXT_PACKAGE=$PACKAGE +# Check if we can use GSettings +PKG_CHECK_MODULES([GSETTINGS], + [gio-2.0 >= 2.25.0], + [have_gsettings=yes], + [have_gsettings=no]) +if test "$have_gsettings" = "yes"; then + AC_DEFINE([HAVE_GSETTINGS], 1, [Whether we can use GSettings]) + GLIB_GSETTINGS +fi + +GETTEXT_PACKAGE=$PACKAGE-$GTK_API_VERSION AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext catalog name]) @@ -242,7 +300,7 @@ PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED_VERSION) AC_SUBST(ENCHANT_CFLAGS) AC_SUBST(ENCHANT_LIBS) -PKG_CHECK_MODULES(GAIL, gail >= $GAIL_REQUIRED_VERSION) +PKG_CHECK_MODULES(GAIL, $GAIL_PC_NAME >= $GAIL_REQUIRED_VERSION) AC_SUBST(GAIL_CFLAGS) AC_SUBST(GAIL_LIBS) @@ -253,7 +311,7 @@ if test "$with_target" = "directfb"; then AC_DEFINE([WTF_PLATFORM_DIRECTFB],[1],[Define if target is DirectFB]) else PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_REQUIRED_VERSION) - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION) + PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION) if test "$with_target" = "x11" && test "$os_win32" = "no"; then # check for XT @@ -347,6 +405,14 @@ AC_ARG_ENABLE(indexed_database, [],[enable_indexed_database="no"]) AC_MSG_RESULT([$enable_indexed_database]) +# check whether to enable the speech input API +AC_MSG_CHECKING([whether to enable the speech input API]) +AC_ARG_ENABLE(input_speech, + AC_HELP_STRING([--enable-input-speech], + [enable the speech input API [default=no]]), + [],[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, @@ -371,6 +437,14 @@ AC_ARG_ENABLE(icon_database, [],[enable_icon_database="yes"]) AC_MSG_RESULT([$enable_icon_database]) +# check whether to build with image resizer API support +AC_MSG_CHECKING([whether to enable image resizer API support]) +AC_ARG_ENABLE(image_resizer, + AC_HELP_STRING([--enable-image-resizer], + [enable image resizer [default=no]]), + [],[enable_image_resizer="no"]) +AC_MSG_RESULT([$enable_image_resizer]) + # check whether to enable HTML5 datalist support AC_MSG_CHECKING([whether to enable HTML5 datalist support]) AC_ARG_ENABLE(datalist, @@ -475,6 +549,22 @@ AC_ARG_ENABLE(workers, [],[enable_workers="yes"]) AC_MSG_RESULT([$enable_workers]) +# check whether to enable directory upload support +AC_MSG_CHECKING([whether to enable directory upload support]) +AC_ARG_ENABLE(directory_upload, + AC_HELP_STRING([--enable-directory-upload], + [enable support for directory upload [default=no]]), + [], [enable_directory_upload="no"]) +AC_MSG_RESULT([$enable_directory_upload]) + +# check whether to enable HTML5 FileSystem API support +AC_MSG_CHECKING([whether to enable HTML5 FileSystem API support]) +AC_ARG_ENABLE(file_system, + AC_HELP_STRING([--enable-file-system], + [enable support for HTML5 FileSystem API [default=no]]), + [], [enable_file_system="no"]) +AC_MSG_RESULT([$enable_file_system]) + # turn off svg features if --disable-svg is requested if test "$enable_svg" = "no"; then enable_svg_animation=no @@ -549,17 +639,25 @@ fi AC_MSG_CHECKING([whether to enable Web Sockets support]) AC_ARG_ENABLE(web_sockets, AC_HELP_STRING([--enable-web-sockets], - [enable support for Web Sockets [default=no]]), - [],[enable_web_sockets="no"]) + [enable support for Web Sockets [default=yes]]), + [],[enable_web_sockets="yes"]) AC_MSG_RESULT([$enable_web_sockets]) -# check whether to enable Blob.slice support -AC_MSG_CHECKING([whether to enable Blob.slice support]) -AC_ARG_ENABLE(blob_slice, - AC_HELP_STRING([--enable-blob-slice], - [enable support for Blob.slice [default=no]]), - [],[enable_blob_slice="no"]) -AC_MSG_RESULT([$enable_blob_slice]) +# check whether to enable Web Timing support +AC_MSG_CHECKING([whether to enable Web Timing support]) +AC_ARG_ENABLE(web_timing, + AC_HELP_STRING([--enable-web-timing], + [enable support for Web Timing [default=no]]), + [],[enable_web_timing="no"]) +AC_MSG_RESULT([$enable_web_timing]) + +# check whether to enable Blob support +AC_MSG_CHECKING([whether to enable Blob support]) +AC_ARG_ENABLE(blob, + AC_HELP_STRING([--enable-blob], + [enable support for Blob [default=no]]), + [],[enable_blob="no"]) +AC_MSG_RESULT([$enable_blob]) # check whether to enable Fast Mobile Scrolling support AC_MSG_CHECKING([whether to enable Fast Mobile Scrolling]) @@ -569,22 +667,6 @@ 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, @@ -608,6 +690,11 @@ AC_ARG_ENABLE([jit], [],[enable_jit="yes"]) if test "$enable_jit" = "yes"; then case "$host_cpu" in + arm*) + AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT]) + AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR]) + AC_DEFINE([ENABLE_YARR_JIT], [1], [Define to enable YARR JIT]) + ;; i*86|x86_64) AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT]) AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR]) @@ -629,9 +716,25 @@ if test "$enable_jit" = "yes"; then enable_jit="no (CPU '$host_cpu' not supported)" ;; esac +else + AC_DEFINE([ENABLE_JIT], [0], [Define to enable JIT]) fi AC_MSG_RESULT([$enable_jit]) +# Opcode stats +AC_MSG_CHECKING([whether to enable opcode stats]) +AC_ARG_ENABLE([opcode-stats], + [AS_HELP_STRING([--enable-opcode-stats], [Enable Opcode statistics (default: disabled)])], + [], [enable_opcode_stats=no]) +AC_MSG_RESULT([$enable_opcode_stats]) + +if test "$enable_opcode_stats" = "yes"; then + if test "$enable_jit" = "yes"; then + AC_MSG_ERROR([JIT must be disabled for Opcode stats to work.]) + fi + AC_DEFINE([ENABLE_OPCODE_STATS], [1], [Define to enable Opcode statistics]) +fi + # GObject Introspection AC_MSG_CHECKING([whether to enable GObject introspection support]) AC_ARG_ENABLE([introspection], @@ -646,7 +749,7 @@ GIRDIR= GIRTYPELIBDIR= if test "$enable_introspection" = "yes"; then - GOBJECT_INTROSPECTION_REQUIRED=0.6.2 + GOBJECT_INTROSPECTION_REQUIRED=0.9.5 PKG_CHECK_MODULES([INTROSPECTION],[gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED]) G_IR_SCANNER="$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)" @@ -757,6 +860,7 @@ if test "$enable_video" = "yes"; then [gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION gstreamer-app-0.10 gstreamer-base-0.10 + gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION gstreamer-video-0.10]) @@ -800,26 +904,31 @@ AM_CONDITIONAL([USE_GLIB_UNICODE], [test "$with_unicode_backend" = "glib"]) AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"]) AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"]) +# GLib/GIO feature conditionals +AM_CONDITIONAL([USE_GSETTINGS], [test "$have_gsettings" = "yes"]) + # WebKit feature conditionals AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"]) AM_CONDITIONAL([ENABLE_3D_TRANSFORMS],[test "$enable_3D_transforms" = "yes"]) -AM_CONDITIONAL([ENABLE_BLOB_SLICE],[test "$enable_blob_slice" = "yes"]) +AM_CONDITIONAL([ENABLE_BLOB],[test "$enable_blob" = "yes"]) AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"]) AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"]) AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"]) +AM_CONDITIONAL([ENABLE_DIRECTORY_UPLOAD],[test "$enable_directory_upload" = "yes"]) AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"]) AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"]) AM_CONDITIONAL([ENABLE_DATALIST],[test "$enable_datalist" = "yes"]) AM_CONDITIONAL([ENABLE_EVENTSOURCE],[test "$enable_eventsource" = "yes"]) AM_CONDITIONAL([ENABLE_FAST_MOBILE_SCROLLING],[test "$enable_fast_mobile_scrolling" = "yes"]) +AM_CONDITIONAL([ENABLE_FILE_SYSTEM],[test "$enable_file_system" = "yes"]) AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"]) +AM_CONDITIONAL([ENABLE_IMAGE_RESIZER],[test "$enable_image_resizer" = "yes"]) AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"]) +AM_CONDITIONAL([ENABLE_INPUT_SPEECH],[test "$enable_input_speech" = "yes"]) 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"]) @@ -841,6 +950,8 @@ 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"]) AM_CONDITIONAL([ENABLE_WEB_SOCKETS],[test "$enable_web_sockets" = "yes"]) +AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"]) +AM_CONDITIONAL([ENABLE_OPCODE_STATS],[test "$enable_opcode_stats" = "yes"]) # Gtk conditionals AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"]) @@ -848,13 +959,20 @@ AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"]) AC_CONFIG_FILES([ GNUmakefile -WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in WebKit/gtk/webkit/webkitversion.h WebKit/gtk/docs/GNUmakefile WebKit/gtk/docs/version.xml ] ) +AC_CONFIG_FILES([ +WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit/gtk/webkit.pc.in +WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in +WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:WebKit/gtk/org.webkitgtk.gschema.xml.in +] +,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME] +) + AC_OUTPUT echo " @@ -869,12 +987,11 @@ Build configuration: Optimized memory allocator : $enable_fast_malloc Features: 3D Transforms : $enable_3D_transforms - Blob.slice support : $enable_blob_slice + Blob support : $enable_blob + Directory upload : $enable_directory_upload 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 @@ -882,12 +999,16 @@ Features: HTML5 channel messaging support : $enable_channel_messaging 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 + Opcode stats : $enable_opcode_stats SharedWorkers support : $enable_shared_workers + Speech input support : $enable_input_speech SVG support : $enable_svg SVG animation support : $enable_svg_animation SVG fonts support : $enable_svg_fonts @@ -896,11 +1017,13 @@ Features: SVG use element support : $enable_svg_use WML support : $enable_wml Web Sockets support : $enable_web_sockets + Web Timing support : $enable_web_timing Web Workers support : $enable_workers XHTML-MP support : $enable_xhtmlmp XPATH support : $enable_xpath XSLT support : $enable_xslt GTK+ configuration: + GTK+ version : $with_gtk GDK target : $with_target Hildon UI extensions : $with_hildon Introspection support : $enable_introspection |