summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-01-14 15:35:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-27 21:52:24 +0000
commitdeec6fa8d0748297eb40eb4fe98e4fec8fb201f4 (patch)
tree5af5dde6d303f581b6eaf65d666ecb8069a2fab6
parentef6cc9af8c6756b659824680846783444919eb90 (diff)
downloadpoky-deec6fa8d0748297eb40eb4fe98e4fec8fb201f4.tar.gz
webkit-gtk: upgrade to 1.3.7
Also update some local files from upstream, and add nodolt.patch to fix build error. Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
-rw-r--r--meta/recipes-sato/webkit/files/GNUmakefile.am692
-rw-r--r--meta/recipes-sato/webkit/files/Makefile2
-rwxr-xr-xmeta/recipes-sato/webkit/files/autogen.sh2
-rw-r--r--meta/recipes-sato/webkit/files/configure.ac164
-rw-r--r--meta/recipes-sato/webkit/files/nodolt.patch16
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk_svn.bb8
7 files changed, 183 insertions, 703 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 22f0befd9d..9a34a200dc 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -175,7 +175,7 @@ SRCREV_pn-tidy ??= "e25416e1293e1074bfa6727c80527dcff5b1f3cb"
175SRCREV_pn-u-boot-omap3 ??= "f40f6db278f602b55820693634a7256b0b4e4b80" 175SRCREV_pn-u-boot-omap3 ??= "f40f6db278f602b55820693634a7256b0b4e4b80"
176SRCREV_pn-u-boot ??= "v2010.12" 176SRCREV_pn-u-boot ??= "v2010.12"
177SRCREV_pn-ubootchart ??= "10" 177SRCREV_pn-ubootchart ??= "10"
178SRCREV_pn-webkit-gtk ??= "62027" 178SRCREV_pn-webkit-gtk ??= "72836"
179SRCREV_pn-web-webkit ??= "130" 179SRCREV_pn-web-webkit ??= "130"
180SRCREV_pn-web ??= "129" 180SRCREV_pn-web ??= "129"
181SRCREV_pn-xcb-proto ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66" 181SRCREV_pn-xcb-proto ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
diff --git a/meta/recipes-sato/webkit/files/GNUmakefile.am b/meta/recipes-sato/webkit/files/GNUmakefile.am
index 39817f1dd5..8884fcb6f9 100644
--- a/meta/recipes-sato/webkit/files/GNUmakefile.am
+++ b/meta/recipes-sato/webkit/files/GNUmakefile.am
@@ -16,15 +16,11 @@
16# webcore_sources, gtk port API and WebCoreSupport parts to webkitgtk_sources, 16# webcore_sources, gtk port API and WebCoreSupport parts to webkitgtk_sources,
17# etc... The only exceptions are the global variables. See Global Variables 17# etc... The only exceptions are the global variables. See Global Variables
18# below. 18# below.
19# 19
20# Global Variables 20# Global Variables Reference
21# 21# global_cppflags = CPPFLAGS that apply to all C/C++ files that are built for any project.
22# global_cppflags = CPPFLAGS that apply to JSC, WebCore, and to any 22# global_cflags = CFLAGS that apply to all C files that are built for any project.
23# specific port 23# global_cxxflags = CXXFLAGS that apply to all C++ files that are bult for any project.
24# global_cflags = CFLAGS that apply to JSC, WebCore, and to
25# any specific port
26# global_cxxflags = CXXFLAGS that apply to JSC, WebCore, and to any
27# specific port
28 24
29srcdir = @srcdir@ 25srcdir = @srcdir@
30VPATH = @srcdir@ 26VPATH = @srcdir@
@@ -35,18 +31,13 @@ DISTCHECK_CONFIGURE_FLAGS = \
35 31
36# Directory for autogenerated sources 32# Directory for autogenerated sources
37GENSOURCES := $(top_builddir)/DerivedSources 33GENSOURCES := $(top_builddir)/DerivedSources
38GENSOURCESWEBKITDOM := $(top_builddir)/DerivedSources/webkit 34GENSOURCES_JAVASCRIPTCORE := $(top_builddir)/DerivedSources/JavaScriptCore
35GENSOURCES_WEBCORE := $(top_builddir)/DerivedSources/WebCore
36GENSOURCES_WEBKIT := $(top_builddir)/DerivedSources/webkit
39GENPROGRAMS := $(top_builddir)/Programs 37GENPROGRAMS := $(top_builddir)/Programs
40 38GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
41# Script for creating hash tables 39WebCore := $(srcdir)/WebCore
42CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/create_hash_table 40WebKit := $(srcdir)/WebKit/gtk
43
44# Script for creating regexp tables
45CREATE_REGEXP_TABLES = $(srcdir)/JavaScriptCore/create_regex_tables
46
47# Programs to run the WebKitGtk unit tests
48GTESTER = gtester
49GTESTER_REPORT = gtester-report
50 41
51# Libraries and support components 42# Libraries and support components
52bin_PROGRAMS := 43bin_PROGRAMS :=
@@ -63,36 +54,27 @@ javascriptcore_cppflags:=
63javascriptcore_sources := 54javascriptcore_sources :=
64javascriptcore_built_sources := 55javascriptcore_built_sources :=
65javascriptcore_built_nosources := 56javascriptcore_built_nosources :=
66javascriptcore_dist :=
67webcore_cppflags := 57webcore_cppflags :=
68webcore_sources := 58webcore_sources :=
69webcore_libadd := 59webcore_libadd :=
70webcore_built_sources := 60webcore_built_sources :=
71webcore_built_nosources := 61webcore_built_nosources :=
72webcore_dist :=
73webcoregtk_cppflags :=
74webcoregtk_sources := 62webcoregtk_sources :=
75IDL_BINDINGS_GDOM := 63webcoregtk_cppflags :=
76GDOM_AUTO_CLASSES := 64webkitgtk_built_h_api :=
77GDOM_FIXED_CLASSES := 65webkitgtk_static_h_api :=
78GDOM_CLASSES :=
79GDOM_HEADERS_BUILT :=
80GDOM_HEADERS_FIXED :=
81libgdom_h_api :=
82libgdom_cleanfiles :=
83webkitgtk_h_api := 66webkitgtk_h_api :=
84webkitgtk_sources := 67webkitgtk_sources :=
85webkitgtk_cppflags := 68webkitgtk_cppflags :=
69webkitgtk_gdom_built_sources :=
86webkitgtk_built_sources := 70webkitgtk_built_sources :=
87webkitgtk_built_nosources := 71webkitgtk_built_nosources :=
88webkitgtk_cleanfiles :=
89global_cppflags := 72global_cppflags :=
90global_cflags := 73global_cflags :=
91global_cxxflags := 74global_cxxflags :=
92corekit_cflags :=
93corekit_cppflags :=
94JSCORE_GIRSOURCES := 75JSCORE_GIRSOURCES :=
95WEBKIT_GIRSOURCES := 76WEBKIT_GIRSOURCES :=
77FEATURE_DEFINES :=
96typelibsdir := 78typelibsdir :=
97typelibs_DATA := 79typelibs_DATA :=
98EXTRA_DIST := 80EXTRA_DIST :=
@@ -101,57 +83,15 @@ CLEANFILES :=
101DISTCLEANFILES := 83DISTCLEANFILES :=
102MAINTAINERCLEANFILES := 84MAINTAINERCLEANFILES :=
103 85
104webcoregtk_cppflags += \ 86global_cppflags += \
105 -I$(top_builddir)/DerivedSources/webkit \
106 -I$(srcdir)/WebCore/bindings \
107 -I$(srcdir)/WebCore/bindings/gobject
108
109# CFLAGS/CXXFLAGS used by WebCore and WebKit
110#
111# gtk+.pc already include glib, cairo, freetype and pango CFLAGS
112# Don't include them for now to reduce the noise when compiling
113# $(GLIB_CFLAGS) $(CAIRO_CFLAGS) $(PANGO_CFLAGS) $(FREETYPE_CFLAGS)
114corekit_cflags += \
115 -fno-strict-aliasing \
116 $(COVERAGE_CFLAGS) \
117 $(ENCHANT_CFLAGS) \
118 $(GAIL_CFLAGS) \
119 $(GEOCLUE_CFLAGS) \
120 $(GLIB_CFLAGS) \
121 $(GSTREAMER_CFLAGS) \
122 $(GTK_CFLAGS) \
123 $(HILDON_CFLAGS) \
124 $(LIBSOUP_CFLAGS) \
125 $(LIBXML_CFLAGS) \
126 $(LIBXSLT_CFLAGS) \
127 $(SQLITE3_CFLAGS) \
128 $(UNICODE_CFLAGS) \
129 $(XT_CFLAGS)
130
131# When building webcore/webkit, we want WebCore/config.h and NOT
132# JavaScriptCore/config.h, hence, it's important that WebCore/ should come first
133# before JavaScriptCore in the include path.
134corekit_cppflags += \
135 $(global_cppflags) \
136 $(webcore_cppflags) \
137 $(webcoregtk_cppflags) \
138 $(javascriptcore_cppflags)
139
140# For the Gtk port we want to use XP_UNIX both in X11 and Mac
141if !TARGET_WIN32
142corekit_cppflags += -DXP_UNIX
143endif
144
145# Default compiler flags
146global_cflags += \
147 -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \ 87 -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \
148 -Wformat -Wformat-security -Wno-format-y2k -Wundef \ 88 -Wformat -Wformat-security -Wno-format-y2k -Wundef \
149 -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \ 89 -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \
150 -Wno-unused-parameter -Wno-parentheses \ 90 -Wno-unused-parameter -Wno-parentheses \
151 -fno-exceptions 91 -fno-exceptions -DENABLE_GLIB_SUPPORT=1
92
152 93
153global_cxxflags += \ 94global_cxxflags += \
154 $(global_cflags) \
155 $(SYMBOL_VISIBILITY_INLINES) \ 95 $(SYMBOL_VISIBILITY_INLINES) \
156 -fno-rtti 96 -fno-rtti
157 97
@@ -159,30 +99,17 @@ global_cxxflags += \
159# It breaks the build on other platforms, so we use it conditionally 99# It breaks the build on other platforms, so we use it conditionally
160if OS_WIN32 100if OS_WIN32
161no_undefined = -no-undefined 101no_undefined = -no-undefined
162version_script = -export-symbols-regex "^(webkit_|JS).*" 102version_script = -export-symbols-regex "^(webkit_|k?JS).*"
163endif 103endif
164 104
165if OS_GNU 105if OS_GNU
166version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter 106version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter
167endif 107endif
168 108
169# Shared libraries
170lib_LTLIBRARIES += \
171 libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
172
173# Convenience libraries 109# Convenience libraries
174noinst_LTLIBRARIES += \ 110noinst_LTLIBRARIES += \
175 libJavaScriptCore.la 111 libJavaScriptCore.la
176 112
177# JavaScriptCore
178javascriptcore_cppflags += \
179 -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
180 -I$(srcdir)/JavaScriptCore/parser \
181 -I$(srcdir)/JavaScriptCore/wtf \
182 -I$(srcdir)/JavaScriptCore/wtf/gtk \
183 -I$(srcdir)/JavaScriptCore/wtf/gobject \
184 -I$(top_builddir)/DerivedSources
185
186nodist_EXTRA_libJavaScriptCore_la_SOURCES = \ 113nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
187 $(javascriptcore_built_nosources) 114 $(javascriptcore_built_nosources)
188 115
@@ -215,78 +142,6 @@ libJavaScriptCore_la_CPPFLAGS = \
215 $(global_cppflags) \ 142 $(global_cppflags) \
216 $(javascriptcore_cppflags) 143 $(javascriptcore_cppflags)
217 144
218# WebKit
219nodist_EXTRA_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
220 $(webcore_built_nosources)
221
222nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
223 $(webcore_built_sources) \
224 $(webkitgtk_built_sources)
225
226libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit
227libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
228 $(webkitgtk_h_api) \
229 WebKit/gtk/webkit/webkitenumtypes.h
230
231libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
232 $(webcore_sources) \
233 $(webcoregtk_sources) \
234 $(webkitgtk_sources)
235
236libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS = \
237 $(global_cxxflags) \
238 $(corekit_cflags)
239
240libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \
241 $(global_cflags) \
242 $(corekit_cflags)
243
244libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS = \
245 $(corekit_cppflags) \
246 $(webkitgtk_cppflags) \
247 $(HILDON_CPPFLAGS)
248
249libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \
250 -version-info @LIBWEBKITGTK_VERSION@ \
251 $(version_script) \
252 $(no_undefined)
253
254libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
255 -lpthread \
256 libJavaScriptCore.la \
257 libWebCoreJS.la \
258 libgdom.la \
259 $(webcore_ldflags) \
260 $(CAIRO_LIBS) \
261 $(COVERAGE_LDFLAGS) \
262 $(ENCHANT_LIBS) \
263 $(FREETYPE_LIBS) \
264 $(GAIL_LIBS) \
265 $(GEOCLUE_LIBS) \
266 $(GLIB_LIBS) \
267 $(GSTREAMER_LIBS) \
268 $(GTK_LIBS) \
269 $(HILDON_LIBS) \
270 $(JPEG_LIBS) \
271 $(LIBSOUP_LIBS) \
272 $(LIBXML_LIBS) \
273 $(LIBXSLT_LIBS) \
274 $(PANGO_LIBS) \
275 $(PNG_LIBS) \
276 $(SQLITE3_LIBS) \
277 $(UNICODE_LIBS) \
278 $(XT_LIBS)
279
280libgdom_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit
281nodist_libgdom_la_HEADERS = \
282 $(libgdom_h_api)
283
284libgdom_cleanfiles += \
285 $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h \
286 $(top_builddir)/libgdom.la \
287 $(top_builddir)/stamp-webkitdomenumtypes.h
288
289#
290# Extra checks and flags 145# Extra checks and flags
291global_cppflags += \ 146global_cppflags += \
292 -DBUILDING_CAIRO__=1 \ 147 -DBUILDING_CAIRO__=1 \
@@ -308,17 +163,29 @@ global_cppflags += \
308 -DUSE_SYSTEM_MALLOC 163 -DUSE_SYSTEM_MALLOC
309endif 164endif
310 165
166if USE_GSTREAMER
167global_cppflags += \
168 -DWTF_USE_GSTREAMER=1
169endif
170
171# ----
172# GTK+ 2.x/3.x support
173# ----
174if GTK_API_VERSION_2
175global_cppflags += \
176 -DGTK_API_VERSION_2=1
177endif
178
311if !ENABLE_DEBUG 179if !ENABLE_DEBUG
312global_cppflags += -DNDEBUG 180global_cppflags += -DNDEBUG
313global_cflags += $(SYMBOL_VISIBILITY) 181global_cflags += $(SYMBOL_VISIBILITY)
314else 182else
315webcoregtk_cppflags += \ 183global_cppflags += \
316 -DG_DISABLE_DEPRECATED \ 184 -DG_DISABLE_DEPRECATED \
317 -DGDK_PIXBUF_DISABLE_DEPRECATED \ 185 -DGDK_PIXBUF_DISABLE_DEPRECATED \
318 -DGDK_DISABLE_DEPRECATED \ 186 -DGDK_DISABLE_DEPRECATED \
319 -DGTK_DISABLE_DEPRECATED \ 187 -DGTK_DISABLE_DEPRECATED \
320 -DPANGO_DISABLE_DEPRECATED 188 -DPANGO_DISABLE_DEPRECATED
321
322# Might be useful in the future 189# Might be useful in the future
323# -DGDK_MULTIHEAD_SAFE \ 190# -DGDK_MULTIHEAD_SAFE \
324# -DGTK_MULTIHEAD_SAFE 191# -DGTK_MULTIHEAD_SAFE
@@ -330,454 +197,19 @@ global_cppflags += \
330 -DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS 197 -DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS
331endif 198endif
332 199
333webkitgtk_h_api += \
334 $(srcdir)/WebKit/gtk/webkit/webkit.h \
335 $(srcdir)/WebKit/gtk/webkit/webkitdefines.h \
336 $(srcdir)/WebKit/gtk/webkit/webkitdownload.h \
337 $(srcdir)/WebKit/gtk/webkit/webkiterror.h \
338 $(srcdir)/WebKit/gtk/webkit/webkithittestresult.h \
339 $(srcdir)/WebKit/gtk/webkit/webkitnetworkrequest.h \
340 $(srcdir)/WebKit/gtk/webkit/webkitnetworkresponse.h \
341 $(srcdir)/WebKit/gtk/webkit/webkitsoupauthdialog.h \
342 $(srcdir)/WebKit/gtk/webkit/webkitwebbackforwardlist.h \
343 $(srcdir)/WebKit/gtk/webkit/webkitwebdatasource.h \
344 $(srcdir)/WebKit/gtk/webkit/webkitwebframe.h \
345 $(srcdir)/WebKit/gtk/webkit/webkitwebhistoryitem.h \
346 $(srcdir)/WebKit/gtk/webkit/webkitwebinspector.h \
347 $(srcdir)/WebKit/gtk/webkit/webkitwebnavigationaction.h \
348 $(srcdir)/WebKit/gtk/webkit/webkitwebpolicydecision.h \
349 $(srcdir)/WebKit/gtk/webkit/webkitgeolocationpolicydecision.h \
350 $(srcdir)/WebKit/gtk/webkit/webkitwebresource.h \
351 $(srcdir)/WebKit/gtk/webkit/webkitwebsettings.h \
352 $(srcdir)/WebKit/gtk/webkit/webkitwebwindowfeatures.h \
353 $(srcdir)/WebKit/gtk/webkit/webkitwebview.h \
354 $(srcdir)/WebKit/gtk/webkit/webkitwebdatabase.h \
355 $(srcdir)/WebKit/gtk/webkit/webkitsecurityorigin.h \
356 $(top_builddir)/WebKit/gtk/webkit/webkitversion.h
357
358webkitgtk_built_sources += \
359 DerivedSources/webkitenumtypes.cpp \
360 DerivedSources/webkitdomenumtypes.cpp \
361 DerivedSources/webkitmarshal.cpp \
362 DerivedSources/webkitmarshal.h \
363 WebKit/gtk/webkit/webkitenumtypes.h
364
365webkitgtk_sources += \
366 WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
367 WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
368 WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
369 WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
370 WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp \
371 WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.h \
372 WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
373 WebKit/gtk/WebCoreSupport/DragClientGtk.h \
374 WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \
375 WebKit/gtk/WebCoreSupport/EditorClientGtk.h \
376 WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \
377 WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
378 WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
379 WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \
380 WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \
381 WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \
382 WebKit/gtk/webkit/webkitapplicationcache.cpp \
383 WebKit/gtk/webkit/webkitdownload.cpp \
384 WebKit/gtk/webkit/webkiterror.cpp \
385 WebKit/gtk/webkit/webkithittestresult.cpp \
386 WebKit/gtk/webkit/webkitnetworkrequest.cpp \
387 WebKit/gtk/webkit/webkitnetworkresponse.cpp \
388 WebKit/gtk/webkit/webkitprivate.cpp \
389 WebKit/gtk/webkit/webkitprivate.h \
390 WebKit/gtk/webkit/webkitsoupauthdialog.c \
391 WebKit/gtk/webkit/webkitversion.cpp \
392 WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
393 WebKit/gtk/webkit/webkitwebdatasource.cpp \
394 WebKit/gtk/webkit/webkitwebframe.cpp \
395 WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
396 WebKit/gtk/webkit/webkitwebinspector.cpp \
397 WebKit/gtk/webkit/webkitwebnavigationaction.cpp \
398 WebKit/gtk/webkit/webkitwebpolicydecision.cpp \
399 WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp \
400 WebKit/gtk/webkit/webkitwebresource.cpp \
401 WebKit/gtk/webkit/webkitwebdatabase.cpp \
402 WebKit/gtk/webkit/webkitsecurityorigin.cpp \
403 WebKit/gtk/webkit/webkitwebsettings.cpp \
404 WebKit/gtk/webkit/webkitwebview.cpp \
405 WebKit/gtk/webkit/webkitwebwindowfeatures.cpp \
406 WebKit/gtk/webkit/webkitworkers.cpp
407
408webkitgtk_cppflags += \
409 -DBUILDING_WEBKIT \
410 -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
411 -DDATA_DIR=\"${datadir}\" \
412 -I$(srcdir)/WebKit/gtk \
413 -I$(srcdir)/WebKit/gtk/WebCoreSupport \
414 -I$(srcdir)/WebKit/gtk/webkit \
415 -I$(top_builddir)/WebKit/gtk \
416 -I$(top_builddir)/WebKit/gtk/webkit \
417 -I$(GENSOURCESWEBKITDOM)
418
419webkitgtk_cleanfiles += \
420 $(top_builddir)/stamp-webkitmarshal.cpp \
421 $(top_builddir)/stamp-webkitmarshal.h \
422 $(top_builddir)/stamp-webkitenumtypes.cpp \
423 $(top_builddir)/stamp-webkitenumtypes.h \
424 $(top_builddir)/Programs/GtkLauncher \
425 $(top_builddir)/WebKit/gtk/docs/version.xml \
426 $(top_builddir)/WebKit/gtk/docs/GNUmakefile \
427 $(top_builddir)/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc \
428 $(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h \
429 $(top_builddir)/WebKit/gtk/webkit/webkitversion.h
430
431pkgconfigdir = $(libdir)/pkgconfig
432pkgconfig_DATA = WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
433
434if ENABLE_INTROSPECTION
435
436JSCore-@WEBKITGTK_API_VERSION@.gir: $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
437 cp $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir $(builddir)/
438
439JSCORE_GIRSOURCES += JSCore-@WEBKITGTK_API_VERSION@.gir
440WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir
441
442$(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
443 $(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=@WEBKITGTK_API_VERSION@ \
444 --include=GObject-2.0 \
445 --include=Gtk-@GTK_API_VERSION@ \
446 --include=JSCore-@WEBKITGTK_API_VERSION@ \
447 --include=Soup-2.4 \
448 --library=webkitgtk-@WEBKITGTK_API_VERSION@ \
449 --libtool="$(LIBTOOL)" \
450 --pkg gobject-2.0 \
451 --pkg gtk+-@GTK_API_VERSION@ \
452 --pkg libsoup-2.4 \
453 --output $@ \
454 --add-include-path $(top_srcdir)/WebKit/gtk \
455 --add-include-path $(builddir) \
456 -I$(top_srcdir)/WebKit/gtk \
457 -I$(top_builddir)/WebKit/gtk \
458 -I$(top_builddir)/DerivedSources \
459 -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \
460 -I$(top_srcdir) \
461 $(webkitgtk_h_api) \
462 $(libgdom_h_api)
463
464girdir = $(datadir)/gir-1.0
465gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
466
467typelibsdir += $(libdir)/girepository-1.0
468typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
469
470%.typelib: %.gir $(G_IR_COMPILER)
471 $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk --includedir $(builddir) $< -o $@
472
473CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
474
475endif
476
477EXTRA_DIST += $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
478
479WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal
480WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list
481
482$(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp
483 @true
484
485$(WEBKIT_MARSHAL).h: stamp-webkitmarshal.h
486 @true
487
488stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
489 $(AM_V_GEN) echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \
490 $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \
491 echo timestamp > $(@F)
492
493stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST)
494 $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \
495 echo timestamp > $(@F)
496
497WebKit/gtk/webkit/webkitenumtypes.h: stamp-webkitenumtypes.h
498 @true
499stamp-webkitenumtypes.h: $(webkitgtk_h_api) GNUmakefile
500 $(AM_V_GEN)glib-mkenums \
501 --fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \
502 --fhead "#define WEBKIT_ENUM_TYPES_H\n\n" \
503 --fhead "#include <glib-object.h>\n\n" \
504 --fhead "#include <webkit/webkitdefines.h>\n\n" \
505 --fhead "G_BEGIN_DECLS\n\n" \
506 --ftail "G_END_DECLS\n\n" \
507 --ftail "#endif\n" \
508 --fprod "#include <webkit/@basename@>\n\n" \
509 --eprod "#define WEBKIT_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \
510 --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);\n\n" \
511 $(webkitgtk_h_api) | \
512 sed 's,web_kit,webkit,' | \
513 sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \
514 > xgen-gth \
515 && (cmp -s xgen-gth WebKit/gtk/webkit/webkitenumtypes.h || cp xgen-gth WebKit/gtk/webkit/webkitenumtypes.h) \
516 && rm -f xgen-gth \
517 && echo timestamp > $(@F)
518
519DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile
520 $(AM_V_GEN)glib-mkenums \
521 --fhead "#include <config.h>\n" \
522 --fhead "#include <glib-object.h>\n" \
523 --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h\"\n\n" \
524 --fhead "extern \"C\" {\n\n" \
525 --fprod "\n/* enumerations from \"@filename@\" */" \
526 --vhead "static const G@Type@Value _@enum_name@_values[] = {" \
527 --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
528 --vtail " { 0, NULL, NULL }\n};\n\n" \
529 --vtail "GType @enum_name@_get_type(void)\n{\n" \
530 --vtail " static GType type = 0;\n\n" \
531 --vtail " if (!type)\n" \
532 --vtail " type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \
533 --vtail " return type;\n}\n\n" \
534 --ftail "}\n" \
535 $(webkitgtk_h_api) | \
536 sed 's,web_kit,webkit,' \
537 > xgen-gtc \
538 && cp xgen-gtc $@ \
539 && rm -f xgen-gtc
540
541WebKit/gtk/webkit/webkitdomenumtypes.h: stamp-webkitdomenumtypes.h
542 @true
543stamp-webkitdomenumtypes.h: $(libgdom_h_api) GNUmakefile
544 $(AM_V_GEN)glib-mkenums \
545 --fhead "#ifndef WEBKIT_DOM_ENUM_TYPES_H\n" \
546 --fhead "#define WEBKIT_DOM_ENUM_TYPES_H\n\n" \
547 --fhead "#include <glib-object.h>\n\n" \
548 --fhead "G_BEGIN_DECLS\n\n" \
549 --ftail "G_END_DECLS\n\n" \
550 --ftail "#endif\n" \
551 --fprod "#include <webkit/@basename@>\n\n" \
552 --eprod "#define WEBKIT_DOM_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \
553 --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);n\n" \
554 $(libgdom_h_api) | \
555 sed 's,web_kit,webkit_dom,' | \
556 sed 's,WEBKIT_DOM_TYPE_KIT,WEBKIT_DOM_TYPE,' \
557 > xgen-cgth \
558 && (cmp -s xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h || cp xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h) \
559 && rm -f xgen-cgth \
560 && echo timestamp > $(@F)
561
562DerivedSources/webkitdomenumtypes.cpp: $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h $(libgdom_h_api) GNUmakefile
563 $(AM_V_GEN)glib-mkenums \
564 --fhead "#include <config.h>\n" \
565 --fhead "#include <glib-object.h>\n" \
566 --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h\"\n\n" \
567 --fhead "extern \"C\" {\n\n" \
568 --fprod "\n/* enumerations from \"@filename@\" */" \
569 --vhead "static const G@Type@Value _@enum_name@_values] = {" \
570 --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
571 --vtail " { 0, NULL, NULL }\n};\n\n" \
572 --vtail "GType @enum_name@_get_type(void)\n{\n" \
573 --vtail " static GType type = 0;\n\n" \
574 --vtail " if (!type)\n" \
575 --vtail " type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \
576 --vtail " return type;\n}\n\n" \
577 --ftail "}\n" \
578 $(libgdom_h_api) | \
579 sed 's,web_kit,webkitdom,' \
580 > xgen-cgtc \
581 && cp xgen-cgtc $@ \
582 && rm -f xgen-cgtc
583
584# Files that will be distributed
585EXTRA_DIST += \ 200EXTRA_DIST += \
586 $(srcdir)/gtk-doc.make \
587 WebKit/LICENSE \
588 $(javascriptcore_dist) \
589 $(webcore_dist) \
590 $(srcdir)/autotools/symbols.filter \ 201 $(srcdir)/autotools/symbols.filter \
591 $(srcdir)/WebKit/gtk/ChangeLog \ 202 $(srcdir)/gtk-doc.make \
592 $(srcdir)/WebKit/gtk/NEWS \ 203 $(srcdir)/WebKit/LICENSE
593 $(srcdir)/WebKit/gtk/webkitmarshal.list \
594 $(srcdir)/WebKit/gtk/docs/GNUmakefile.* \
595 $(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \
596 $(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \
597 $(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \
598 $(srcdir)/WebKit/gtk/docs/version.xml.in \
599 $(srcdir)/WebKit/gtk/po/* \
600 $(srcdir)/WebKit/gtk/resources/* \
601 $(srcdir)/WebKit/gtk/tests/resources/* \
602 $(srcdir)/WebKit/gtk/tests/test_utils.h
603
604# extra resource files
605resourcesdir = ${datadir}/webkit-@WEBKITGTK_API_VERSION@/resources
606dist_resources_DATA = \
607 $(shell ls $(srcdir)/WebKit/gtk/resources/*.html)
608
609# END WEBKIT GTK+
610 204
611# Include module makefiles 205# Include module makefiles
612include JavaScriptCore/GNUmakefile.am 206include JavaScriptCore/GNUmakefile.am
613include WebCore/GNUmakefile.am 207include WebCore/GNUmakefile.am
208include WebKit/gtk/GNUmakefile.am
209include WebCore/bindings/gobject/GNUmakefile.am
614include WebKitTools/GNUmakefile.am 210include WebKitTools/GNUmakefile.am
615include WebKit/gtk/po/GNUmakefile.am 211include WebKit/gtk/po/GNUmakefile.am
616 212
617# Build unit tests
618noinst_PROGRAMS += $(TEST_PROGS)
619
620webkit_tests_cflags = \
621 -fno-strict-aliasing \
622 -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
623 -I$(srcdir)/WebKit/gtk \
624 -I$(top_builddir)/WebKit/gtk \
625 -I$(top_builddir)/DerivedSources \
626 -I$(top_srcdir)/WebCore/bindings \
627 -I$(top_srcdir)/WebCore/bindings/gobject \
628 $(global_cflags) \
629 $(GLIB_CFLAGS) \
630 $(GTK_CFLAGS) \
631 $(LIBSOUP_CFLAGS)
632
633webkit_tests_ldadd = \
634 libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
635 $(GTK_LIBS) \
636 $(GLIB_LIBS) \
637 $(LIBSOUP_LIBS)
638
639webkit_tests_ldflags = \
640 -no-install \
641 -no-fast-install
642
643TEST_PROGS += \
644 Programs/unittests/testdomdocument \
645 Programs/unittests/testdomdomwindow \
646 Programs/unittests/testdomnode \
647 Programs/unittests/testhttpbackend \
648 Programs/unittests/testloading \
649 Programs/unittests/testglobals \
650 Programs/unittests/testmimehandling \
651 Programs/unittests/testnetworkrequest \
652 Programs/unittests/testnetworkresponse \
653 Programs/unittests/testwebframe \
654 Programs/unittests/testwebbackforwardlist \
655 Programs/unittests/testwebhistoryitem \
656 Programs/unittests/testwindow \
657 Programs/unittests/testdownload \
658 Programs/unittests/testatk \
659 Programs/unittests/testatkroles \
660 Programs/unittests/testhittestresult \
661 Programs/unittests/testwebsettings \
662 Programs/unittests/testwebresource \
663 Programs/unittests/testwebdatasource \
664 Programs/unittests/testwebview \
665 Programs/unittests/testkeyevents \
666 Programs/unittests/testcopyandpaste
667
668# Add additional tests here
669Programs_unittests_testdomdocument_SOURCES = WebKit/gtk/tests/testdomdocument.c
670Programs_unittests_testdomdocument_CFLAGS = $(webkit_tests_cflags)
671Programs_unittests_testdomdocument_LDADD = $(webkit_tests_ldadd)
672Programs_unittests_testdomdocument_LDFLAGS = $(webkit_tests_ldflags)
673
674Programs_unittests_testdomdomwindow_SOURCES = WebKit/gtk/tests/testdomdomwindow.c
675Programs_unittests_testdomdomwindow_CFLAGS = $(webkit_tests_cflags)
676Programs_unittests_testdomdomwindow_LDADD = $(webkit_tests_ldadd)
677Programs_unittests_testdomdomwindow_LDFLAGS = $(webkit_tests_ldflags)
678
679Programs_unittests_testdomnode_SOURCES = WebKit/gtk/tests/testdomnode.c
680Programs_unittests_testdomnode_CFLAGS = $(webkit_tests_cflags)
681Programs_unittests_testdomnode_LDADD = $(webkit_tests_ldadd)
682Programs_unittests_testdomnode_LDFLAGS = $(webkit_tests_ldflags)
683
684Programs_unittests_testhttpbackend_SOURCES = WebKit/gtk/tests/testhttpbackend.c
685Programs_unittests_testhttpbackend_CFLAGS = $(webkit_tests_cflags)
686Programs_unittests_testhttpbackend_LDADD = $(webkit_tests_ldadd)
687Programs_unittests_testhttpbackend_LDFLAGS = $(webkit_tests_ldflags)
688
689Programs_unittests_testglobals_SOURCES = WebKit/gtk/tests/testglobals.c
690Programs_unittests_testglobals_CFLAGS = $(webkit_tests_cflags)
691Programs_unittests_testglobals_LDADD = $(webkit_tests_ldadd)
692Programs_unittests_testglobals_LDFLAGS = $(webkit_tests_ldflags)
693
694Programs_unittests_testloading_SOURCES = WebKit/gtk/tests/testloading.c
695Programs_unittests_testloading_CFLAGS = $(webkit_tests_cflags)
696Programs_unittests_testloading_LDADD = $(webkit_tests_ldadd)
697Programs_unittests_testloading_LDFLAGS = $(webkit_tests_ldflags)
698
699Programs_unittests_testmimehandling_SOURCES = WebKit/gtk/tests/testmimehandling.c WebKit/gtk/tests/test_utils.c
700Programs_unittests_testmimehandling_CFLAGS = $(webkit_tests_cflags)
701Programs_unittests_testmimehandling_LDADD = $(webkit_tests_ldadd)
702Programs_unittests_testmimehandling_LDFLAGS = $(webkit_tests_ldflags)
703
704Programs_unittests_testnetworkrequest_SOURCES = WebKit/gtk/tests/testnetworkrequest.c
705Programs_unittests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags)
706Programs_unittests_testnetworkrequest_LDADD = $(webkit_tests_ldadd)
707Programs_unittests_testnetworkrequest_LDFLAGS = $(webkit_tests_ldflags)
708
709Programs_unittests_testnetworkresponse_SOURCES = WebKit/gtk/tests/testnetworkresponse.c
710Programs_unittests_testnetworkresponse_CFLAGS = $(webkit_tests_cflags)
711Programs_unittests_testnetworkresponse_LDADD = $(webkit_tests_ldadd)
712Programs_unittests_testnetworkresponse_LDFLAGS = $(webkit_tests_ldflags)
713
714Programs_unittests_testwebframe_SOURCES = WebKit/gtk/tests/testwebframe.c
715Programs_unittests_testwebframe_CFLAGS = $(webkit_tests_cflags)
716Programs_unittests_testwebframe_LDADD = $(webkit_tests_ldadd)
717Programs_unittests_testwebframe_LDFLAGS = $(webkit_tests_ldflags)
718
719Programs_unittests_testwebbackforwardlist_SOURCES = WebKit/gtk/tests/testwebbackforwardlist.c
720Programs_unittests_testwebbackforwardlist_CFLAGS = $(webkit_tests_cflags)
721Programs_unittests_testwebbackforwardlist_LDADD = $(webkit_tests_ldadd)
722Programs_unittests_testwebbackforwardlist_LDFLAGS = $(webkit_tests_ldflags)
723
724Programs_unittests_testwebhistoryitem_SOURCES = WebKit/gtk/tests/testwebhistoryitem.c
725Programs_unittests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags)
726Programs_unittests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd)
727Programs_unittests_testwebhistoryitem_LDFLAGS = $(webkit_tests_ldflags)
728
729Programs_unittests_testwindow_SOURCES = WebKit/gtk/tests/testwindow.c
730Programs_unittests_testwindow_CFLAGS = $(webkit_tests_cflags)
731Programs_unittests_testwindow_LDADD = $(webkit_tests_ldadd)
732Programs_unittests_testwindow_LDFLAGS = $(webkit_tests_ldflags)
733
734Programs_unittests_testdownload_SOURCES = WebKit/gtk/tests/testdownload.c
735Programs_unittests_testdownload_CFLAGS = $(webkit_tests_cflags)
736Programs_unittests_testdownload_LDADD = $(webkit_tests_ldadd)
737Programs_unittests_testdownload_LDFLAGS = $(webkit_tests_ldflags)
738
739Programs_unittests_testatk_SOURCES = WebKit/gtk/tests/testatk.c
740Programs_unittests_testatk_CFLAGS = $(webkit_tests_cflags)
741Programs_unittests_testatk_LDADD = $(webkit_tests_ldadd)
742Programs_unittests_testatk_LDFLAGS = $(webkit_tests_ldflags)
743
744Programs_unittests_testatkroles_SOURCES = WebKit/gtk/tests/testatkroles.c
745Programs_unittests_testatkroles_CFLAGS = $(webkit_tests_cflags)
746Programs_unittests_testatkroles_LDADD = $(webkit_tests_ldadd)
747Programs_unittests_testatkroles_LDFLAGS = $(webkit_tests_ldflags)
748
749Programs_unittests_testwebsettings_SOURCES = WebKit/gtk/tests/testwebsettings.c
750Programs_unittests_testwebsettings_CFLAGS = $(webkit_tests_cflags)
751Programs_unittests_testwebsettings_LDADD = $(webkit_tests_ldadd)
752Programs_unittests_testwebsettings_LDFLAGS = $(webkit_tests_ldflags)
753
754Programs_unittests_testwebresource_SOURCES = WebKit/gtk/tests/testwebresource.c
755Programs_unittests_testwebresource_CFLAGS = $(webkit_tests_cflags)
756Programs_unittests_testwebresource_LDADD = $(webkit_tests_ldadd)
757
758Programs_unittests_testwebdatasource_SOURCES = WebKit/gtk/tests/testwebdatasource.c
759Programs_unittests_testwebdatasource_CFLAGS = $(webkit_tests_cflags)
760Programs_unittests_testwebdatasource_LDADD = $(webkit_tests_ldadd)
761
762Programs_unittests_testwebview_SOURCES = WebKit/gtk/tests/testwebview.c WebKit/gtk/tests/test_utils.c
763Programs_unittests_testwebview_CFLAGS = $(webkit_tests_cflags)
764Programs_unittests_testwebview_LDADD = $(webkit_tests_ldadd)
765Programs_unittests_testwebview_LDFLAGS = $(webkit_tests_ldflags)
766
767Programs_unittests_testhittestresult_SOURCES = WebKit/gtk/tests/testhittestresult.c
768Programs_unittests_testhittestresult_CFLAGS = $(webkit_tests_cflags)
769Programs_unittests_testhittestresult_LDADD = $(webkit_tests_ldadd)
770
771Programs_unittests_testkeyevents_SOURCES = WebKit/gtk/tests/testkeyevents.c
772Programs_unittests_testkeyevents_CFLAGS = $(webkit_tests_cflags)
773Programs_unittests_testkeyevents_LDADD = $(webkit_tests_ldadd)
774Programs_unittests_testkeyevents_LDFLAGS = $(webkit_tests_ldflags)
775
776Programs_unittests_testcopyandpaste_SOURCES = WebKit/gtk/tests/testcopyandpaste.c
777Programs_unittests_testcopyandpaste_CFLAGS = $(webkit_tests_cflags)
778Programs_unittests_testcopyandpaste_LDADD = $(webkit_tests_ldadd)
779Programs_unittests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags)
780
781# Autogenerated sources 213# Autogenerated sources
782BUILT_SOURCES += \ 214BUILT_SOURCES += \
783 $(javascriptcore_built_sources) \ 215 $(javascriptcore_built_sources) \
@@ -785,21 +217,17 @@ BUILT_SOURCES += \
785 $(webcore_built_sources) \ 217 $(webcore_built_sources) \
786 $(webcore_built_nosources) \ 218 $(webcore_built_nosources) \
787 $(webkitgtk_built_sources) \ 219 $(webkitgtk_built_sources) \
788 $(webkitgtk_built_nosources) \ 220 $(webkitgtk_built_nosources)
789 $(gdom_built_nosources)
790
791# Project-wide clean rules
792# Files that will be cleaned
793CLEANFILES += \
794 $(BUILT_SOURCES) \
795 $(webkitgtk_cleanfiles) \
796 $(libgdom_cleanfiles)
797 221
798DISTCLEANFILES += \ 222DISTCLEANFILES += \
799 $(CLEANFILES) 223 $(CLEANFILES) \
224 $(builddir)/doltcompile \
225 $(builddir)/doltlibtool
800 226
801MAINTAINERCLEANFILES += \ 227MAINTAINERCLEANFILES += \
802 $(CLEANFILES) \ 228 $(CLEANFILES) \
229 $(builddir)/doltcompile \
230 $(builddir)/doltlibtool \
803 $(srcdir)/aconfig.h.in \ 231 $(srcdir)/aconfig.h.in \
804 $(srcdir)/autotools/config.* \ 232 $(srcdir)/autotools/config.* \
805 $(srcdir)/autotools/compile \ 233 $(srcdir)/autotools/compile \
@@ -814,7 +242,7 @@ MAINTAINERCLEANFILES += \
814 242
815# Older automake versions (1.7) place Plo files in a different place so we need 243# Older automake versions (1.7) place Plo files in a different place so we need
816# to create the output directory manually. 244# to create the output directory manually.
817all-local: stamp-po 245all-local:
818 $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources 246 $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
819 247
820# remove built sources and program directories 248# remove built sources and program directories
@@ -822,35 +250,5 @@ clean-local:
822 -rm -rf $(GENPROGRAMS) 250 -rm -rf $(GENPROGRAMS)
823 251
824maintainer-clean-local: distclean-local 252maintainer-clean-local: distclean-local
825
826distclean-local: 253distclean-local:
827 -rm -rf $(GENSOURCES) $(GENPROGRAMS) 254 -rm -rf $(GENSOURCES) $(GENPROGRAMS)
828
829dist-hook:
830 cp $(srcdir)/WebKit/gtk/NEWS $(distdir)/
831
832install-data-local: po-install-data-local
833
834installdirs-data-local: po-installdirs-data-local
835
836uninstall-local: po-uninstall-local
837
838# Run all tests in cwd
839# FIXME: we should run this under xvfb
840test: $(TEST_PROGS)
841 $(GTESTER) --verbose $(TEST_PROGS);
842
843# test-report: run tests in cwd and generate report
844# full-report: run tests in cwd with -m perf and -m slow and generate report
845# perf-report: run tests in cwd with -m perf and generate report
846test-report full-report perf-report: $(TEST_PROGS)
847 @ case $@ in \
848 test-report) test_options="-k";; \
849 full-report) test_options="-k -m=perf";; \
850 perf-report) test_options="-k -m=perf -m=slow";; \
851 esac ; \
852 $(GTESTER) --verbose $$test_options -o test-report.xml $(TEST_PROGS); \
853 $(GTESTER_REPORT) test-report.xml > test-report.html ;
854
855.PHONY: test test-report perf-report full-report
856check-local: test
diff --git a/meta/recipes-sato/webkit/files/Makefile b/meta/recipes-sato/webkit/files/Makefile
index 1e50d1d358..cdee9da7a6 100644
--- a/meta/recipes-sato/webkit/files/Makefile
+++ b/meta/recipes-sato/webkit/files/Makefile
@@ -1,4 +1,4 @@
1MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools 1MODULES = JavaScriptCore JavaScriptGlue ANGLE WebCore WebKit WebKit2 WebKitTools
2 2
3all: 3all:
4 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ 4 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
diff --git a/meta/recipes-sato/webkit/files/autogen.sh b/meta/recipes-sato/webkit/files/autogen.sh
index 97beb209d2..60b163d550 100755
--- a/meta/recipes-sato/webkit/files/autogen.sh
+++ b/meta/recipes-sato/webkit/files/autogen.sh
@@ -10,7 +10,7 @@ cd $srcdir
10 10
11GTKDOCIZE_FLAGS="--copy" 11GTKDOCIZE_FLAGS="--copy"
12LIBTOOLIZE_FLAGS="--force --automake" 12LIBTOOLIZE_FLAGS="--force --automake"
13ACLOCAL_FLAGS="-I autotools" 13ACLOCAL_FLAGS="-I autotools $ACLOCAL_FLAGS"
14AUTOMAKE_FLAGS="--foreign --add-missing" 14AUTOMAKE_FLAGS="--foreign --add-missing"
15 15
16DIE=0 16DIE=0
diff --git a/meta/recipes-sato/webkit/files/configure.ac b/meta/recipes-sato/webkit/files/configure.ac
index d4f3e749fc..bb703b4bf7 100644
--- a/meta/recipes-sato/webkit/files/configure.ac
+++ b/meta/recipes-sato/webkit/files/configure.ac
@@ -2,14 +2,14 @@ AC_PREREQ(2.59)
2 2
3m4_define([webkit_major_version], [1]) 3m4_define([webkit_major_version], [1])
4m4_define([webkit_minor_version], [3]) 4m4_define([webkit_minor_version], [3])
5m4_define([webkit_micro_version], [2]) 5m4_define([webkit_micro_version], [7])
6 6
7# This is the version we'll be using as part of our User-Agent string 7# This is the version we'll be using as part of our User-Agent string
8# e.g., AppleWebKit/$(webkit_user_agent_version) ... 8# e.g., AppleWebKit/$(webkit_user_agent_version) ...
9# 9#
10# Sourced from WebCore/Configurations/Version.xcconfig 10# Sourced from WebCore/Configurations/Version.xcconfig
11m4_define([webkit_user_agent_major_version], [531]) 11m4_define([webkit_user_agent_major_version], [534])
12m4_define([webkit_user_agent_minor_version], [2]) 12m4_define([webkit_user_agent_minor_version], [7])
13 13
14AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/]) 14AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
15 15
@@ -34,8 +34,8 @@ AC_SUBST(WEBKIT_USER_AGENT_MINOR_VERSION)
34AC_CONFIG_SRCDIR([WebCore/config.h]) 34AC_CONFIG_SRCDIR([WebCore/config.h])
35 35
36dnl # Libtool library version, not to confuse with API version 36dnl # Libtool library version, not to confuse with API version
37dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning 37dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
38LIBWEBKITGTK_VERSION=0:0:0 38LIBWEBKITGTK_VERSION=4:0:4
39AC_SUBST([LIBWEBKITGTK_VERSION]) 39AC_SUBST([LIBWEBKITGTK_VERSION])
40 40
41AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar]) 41AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
@@ -82,6 +82,8 @@ WEBKIT_INIT
82AC_DISABLE_STATIC 82AC_DISABLE_STATIC
83AC_LIBTOOL_WIN32_DLL 83AC_LIBTOOL_WIN32_DLL
84AC_PROG_LIBTOOL 84AC_PROG_LIBTOOL
85# use dolt to speedup the build
86DOLT
85 87
86AC_PATH_PROG(FLEX, flex) 88AC_PATH_PROG(FLEX, flex)
87if test -z "$FLEX"; then 89if test -z "$FLEX"; then
@@ -165,6 +167,17 @@ if test "$png_ok" != yes; then
165fi 167fi
166AC_SUBST([PNG_LIBS]) 168AC_SUBST([PNG_LIBS])
167 169
170
171if test "$os_win32" = "yes"; then
172 WINMM_LIBS=-lwinmm
173 SHLWAPI_LIBS=-lshlwapi
174 OLE32_LIBS=-lole32
175fi
176AC_SUBST([WINMM_LIBS])
177AC_SUBST([SHLWAPI_LIBS])
178AC_SUBST([OLE32_LIBS])
179
180
168# determine the GTK+ version to use 181# determine the GTK+ version to use
169AC_MSG_CHECKING([the GTK+ version to use]) 182AC_MSG_CHECKING([the GTK+ version to use])
170AC_ARG_WITH([gtk], 183AC_ARG_WITH([gtk],
@@ -186,7 +199,7 @@ case "$with_gtk" in
186 GAIL_PC_NAME=gail 199 GAIL_PC_NAME=gail
187 GAIL_REQUIRED_VERSION=1.8 200 GAIL_REQUIRED_VERSION=1.8
188 ;; 201 ;;
189 3.0) GTK_REQUIRED_VERSION=2.90 202 3.0) GTK_REQUIRED_VERSION=2.91
190 GTK_API_VERSION=3.0 203 GTK_API_VERSION=3.0
191 WEBKITGTK_API_MAJOR_VERSION=3 204 WEBKITGTK_API_MAJOR_VERSION=3
192 WEBKITGTK_API_MINOR_VERSION=0 205 WEBKITGTK_API_MINOR_VERSION=0
@@ -258,7 +271,17 @@ ENCHANT_REQUIRED_VERSION=0.22
258# todo: webcore gtk 271# todo: webcore gtk
259WEBKIT_CHECK_DEPENDENCIES([glib unicode]) 272WEBKIT_CHECK_DEPENDENCIES([glib unicode])
260 273
261GETTEXT_PACKAGE=$PACKAGE 274# Check if we can use GSettings
275PKG_CHECK_MODULES([GSETTINGS],
276 [gio-2.0 >= 2.25.0],
277 [have_gsettings=yes],
278 [have_gsettings=no])
279if test "$have_gsettings" = "yes"; then
280 AC_DEFINE([HAVE_GSETTINGS], 1, [Whether we can use GSettings])
281 GLIB_GSETTINGS
282fi
283
284GETTEXT_PACKAGE=$PACKAGE-$GTK_API_VERSION
262AC_SUBST(GETTEXT_PACKAGE) 285AC_SUBST(GETTEXT_PACKAGE)
263AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", 286AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
264 [The gettext catalog name]) 287 [The gettext catalog name])
@@ -430,14 +453,6 @@ AC_ARG_ENABLE(datalist,
430 [],[enable_datalist="yes"]) 453 [],[enable_datalist="yes"])
431AC_MSG_RESULT([$enable_datalist]) 454AC_MSG_RESULT([$enable_datalist])
432 455
433# check whether to enable HTML5 ruby support
434AC_MSG_CHECKING([whether to enable HTML5 ruby support])
435AC_ARG_ENABLE(ruby,
436 AC_HELP_STRING([--enable-ruby],
437 [enable HTML5 ruby support [default=yes]]),
438 [],[enable_ruby="yes"])
439AC_MSG_RESULT([$enable_ruby])
440
441# check whether to enable HTML5 sandbox iframe support 456# check whether to enable HTML5 sandbox iframe support
442AC_MSG_CHECKING([whether to enable HTML5 sandboxed iframe support]) 457AC_MSG_CHECKING([whether to enable HTML5 sandboxed iframe support])
443AC_ARG_ENABLE(sandbox, 458AC_ARG_ENABLE(sandbox,
@@ -526,6 +541,22 @@ AC_ARG_ENABLE(workers,
526 [],[enable_workers="yes"]) 541 [],[enable_workers="yes"])
527AC_MSG_RESULT([$enable_workers]) 542AC_MSG_RESULT([$enable_workers])
528 543
544# check whether to enable directory upload support
545AC_MSG_CHECKING([whether to enable directory upload support])
546AC_ARG_ENABLE(directory_upload,
547 AC_HELP_STRING([--enable-directory-upload],
548 [enable support for directory upload [default=no]]),
549 [], [enable_directory_upload="no"])
550AC_MSG_RESULT([$enable_directory_upload])
551
552# check whether to enable HTML5 FileSystem API support
553AC_MSG_CHECKING([whether to enable HTML5 FileSystem API support])
554AC_ARG_ENABLE(file_system,
555 AC_HELP_STRING([--enable-file-system],
556 [enable support for HTML5 FileSystem API [default=no]]),
557 [], [enable_file_system="no"])
558AC_MSG_RESULT([$enable_file_system])
559
529# turn off svg features if --disable-svg is requested 560# turn off svg features if --disable-svg is requested
530if test "$enable_svg" = "no"; then 561if test "$enable_svg" = "no"; then
531 enable_svg_animation=no 562 enable_svg_animation=no
@@ -600,8 +631,8 @@ fi
600AC_MSG_CHECKING([whether to enable Web Sockets support]) 631AC_MSG_CHECKING([whether to enable Web Sockets support])
601AC_ARG_ENABLE(web_sockets, 632AC_ARG_ENABLE(web_sockets,
602 AC_HELP_STRING([--enable-web-sockets], 633 AC_HELP_STRING([--enable-web-sockets],
603 [enable support for Web Sockets [default=no]]), 634 [enable support for Web Sockets [default=yes]]),
604 [],[enable_web_sockets="no"]) 635 [],[enable_web_sockets="yes"])
605AC_MSG_RESULT([$enable_web_sockets]) 636AC_MSG_RESULT([$enable_web_sockets])
606 637
607# check whether to enable Web Timing support 638# check whether to enable Web Timing support
@@ -612,13 +643,13 @@ AC_ARG_ENABLE(web_timing,
612 [],[enable_web_timing="no"]) 643 [],[enable_web_timing="no"])
613AC_MSG_RESULT([$enable_web_timing]) 644AC_MSG_RESULT([$enable_web_timing])
614 645
615# check whether to enable Blob.slice support 646# check whether to enable Blob support
616AC_MSG_CHECKING([whether to enable Blob.slice support]) 647AC_MSG_CHECKING([whether to enable Blob support])
617AC_ARG_ENABLE(blob_slice, 648AC_ARG_ENABLE(blob,
618 AC_HELP_STRING([--enable-blob-slice], 649 AC_HELP_STRING([--enable-blob],
619 [enable support for Blob.slice [default=no]]), 650 [enable support for Blob [default=no]]),
620 [],[enable_blob_slice="no"]) 651 [],[enable_blob="no"])
621AC_MSG_RESULT([$enable_blob_slice]) 652AC_MSG_RESULT([$enable_blob])
622 653
623# check whether to enable Fast Mobile Scrolling support 654# check whether to enable Fast Mobile Scrolling support
624AC_MSG_CHECKING([whether to enable Fast Mobile Scrolling]) 655AC_MSG_CHECKING([whether to enable Fast Mobile Scrolling])
@@ -628,22 +659,6 @@ AC_ARG_ENABLE(fast_mobile_scrolling,
628 [],[enable_fast_mobile_scrolling="no"]) 659 [],[enable_fast_mobile_scrolling="no"])
629AC_MSG_RESULT([$enable_fast_mobile_scrolling]) 660AC_MSG_RESULT([$enable_fast_mobile_scrolling])
630 661
631# check whether to enable FileReader support
632AC_MSG_CHECKING([whether to enable FileReader support])
633AC_ARG_ENABLE(file_reader,
634 AC_HELP_STRING([--enable-file-reader],
635 [enable support for FileReader [default=no]]),
636 [],[enable_file_reader="no"])
637AC_MSG_RESULT([$enable_file_reader])
638
639# check whether to enable FileWriter support
640AC_MSG_CHECKING([whether to enable FileWriter support])
641AC_ARG_ENABLE(file_writer,
642 AC_HELP_STRING([--enable-file-writer],
643 [enable support for FileWriter [default=no]]),
644 [],[enable_file_writer="no"])
645AC_MSG_RESULT([$enable_file_writer])
646
647# check whether to enable code coverage 662# check whether to enable code coverage
648AC_MSG_CHECKING([whether to enable code coverage support]) 663AC_MSG_CHECKING([whether to enable code coverage support])
649AC_ARG_ENABLE(coverage, 664AC_ARG_ENABLE(coverage,
@@ -667,6 +682,11 @@ AC_ARG_ENABLE([jit],
667 [],[enable_jit="yes"]) 682 [],[enable_jit="yes"])
668if test "$enable_jit" = "yes"; then 683if test "$enable_jit" = "yes"; then
669 case "$host_cpu" in 684 case "$host_cpu" in
685 arm*)
686 AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
687 AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR])
688 AC_DEFINE([ENABLE_YARR_JIT], [1], [Define to enable YARR JIT])
689 ;;
670 i*86|x86_64) 690 i*86|x86_64)
671 AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT]) 691 AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
672 AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR]) 692 AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR])
@@ -688,9 +708,36 @@ if test "$enable_jit" = "yes"; then
688 enable_jit="no (CPU '$host_cpu' not supported)" 708 enable_jit="no (CPU '$host_cpu' not supported)"
689 ;; 709 ;;
690 esac 710 esac
711else
712 AC_DEFINE([ENABLE_JIT], [0], [Define to enable JIT])
691fi 713fi
692AC_MSG_RESULT([$enable_jit]) 714AC_MSG_RESULT([$enable_jit])
693 715
716# Opcode stats
717AC_MSG_CHECKING([whether to enable opcode stats])
718AC_ARG_ENABLE([opcode-stats],
719 [AS_HELP_STRING([--enable-opcode-stats], [Enable Opcode statistics (default: disabled)])],
720 [], [enable_opcode_stats=no])
721AC_MSG_RESULT([$enable_opcode_stats])
722
723if test "$enable_opcode_stats" = "yes"; then
724 if test "$enable_jit" = "yes"; then
725 AC_MSG_ERROR([JIT must be disabled for Opcode stats to work.])
726 fi
727 AC_DEFINE([ENABLE_OPCODE_STATS], [1], [Define to enable Opcode statistics])
728fi
729
730# Link prefetch
731AC_MSG_CHECKING([whether to enable link prefetch support])
732AC_ARG_ENABLE([link-prefetch],
733 [AS_HELP_STRING([--enable-link-prefetch], [Enable Link prefetch support (default: disabled)])],
734 [],[enable_link_prefetch=no])
735AC_MSG_RESULT([$enable_link_prefetch])
736
737if test "$enable_link_prefetch" = "yes"; then
738 AC_DEFINE([ENABLE_LINK_PREFETCH], [1], [Define to enable link prefetch support])
739fi
740
694# GObject Introspection 741# GObject Introspection
695AC_MSG_CHECKING([whether to enable GObject introspection support]) 742AC_MSG_CHECKING([whether to enable GObject introspection support])
696AC_ARG_ENABLE([introspection], 743AC_ARG_ENABLE([introspection],
@@ -705,7 +752,7 @@ GIRDIR=
705GIRTYPELIBDIR= 752GIRTYPELIBDIR=
706 753
707if test "$enable_introspection" = "yes"; then 754if test "$enable_introspection" = "yes"; then
708 GOBJECT_INTROSPECTION_REQUIRED=0.6.15 755 GOBJECT_INTROSPECTION_REQUIRED=0.9.5
709 PKG_CHECK_MODULES([INTROSPECTION],[gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED]) 756 PKG_CHECK_MODULES([INTROSPECTION],[gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED])
710 757
711 G_IR_SCANNER="$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)" 758 G_IR_SCANNER="$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)"
@@ -816,9 +863,13 @@ if test "$enable_video" = "yes"; then
816 [gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION 863 [gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
817 gstreamer-app-0.10 864 gstreamer-app-0.10
818 gstreamer-base-0.10 865 gstreamer-base-0.10
866 gstreamer-interfaces-0.10
819 gstreamer-pbutils-0.10 867 gstreamer-pbutils-0.10
820 gstreamer-plugins-base-0.10 >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION 868 gstreamer-plugins-base-0.10 >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION
821 gstreamer-video-0.10]) 869 gstreamer-video-0.10],
870 [have_gstreamer=yes],
871 [have_gstreamer=no])
872
822 AC_SUBST([GSTREAMER_CFLAGS]) 873 AC_SUBST([GSTREAMER_CFLAGS])
823 AC_SUBST([GSTREAMER_LIBS]) 874 AC_SUBST([GSTREAMER_LIBS])
824fi 875fi
@@ -859,18 +910,26 @@ AM_CONDITIONAL([USE_GLIB_UNICODE], [test "$with_unicode_backend" = "glib"])
859AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"]) 910AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"])
860AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"]) 911AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"])
861 912
913# GLib/GIO feature conditionals
914AM_CONDITIONAL([USE_GSETTINGS], [test "$have_gsettings" = "yes"])
915
916# GStreamer feature conditional
917AM_CONDITIONAL([USE_GSTREAMER], [test "$have_gstreamer" = "yes"])
918
862# WebKit feature conditionals 919# WebKit feature conditionals
863AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"]) 920AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"])
864AM_CONDITIONAL([ENABLE_3D_TRANSFORMS],[test "$enable_3D_transforms" = "yes"]) 921AM_CONDITIONAL([ENABLE_3D_TRANSFORMS],[test "$enable_3D_transforms" = "yes"])
865AM_CONDITIONAL([ENABLE_BLOB_SLICE],[test "$enable_blob_slice" = "yes"]) 922AM_CONDITIONAL([ENABLE_BLOB],[test "$enable_blob" = "yes"])
866AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"]) 923AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"])
867AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"]) 924AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"])
868AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"]) 925AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"])
926AM_CONDITIONAL([ENABLE_DIRECTORY_UPLOAD],[test "$enable_directory_upload" = "yes"])
869AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"]) 927AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"])
870AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"]) 928AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
871AM_CONDITIONAL([ENABLE_DATALIST],[test "$enable_datalist" = "yes"]) 929AM_CONDITIONAL([ENABLE_DATALIST],[test "$enable_datalist" = "yes"])
872AM_CONDITIONAL([ENABLE_EVENTSOURCE],[test "$enable_eventsource" = "yes"]) 930AM_CONDITIONAL([ENABLE_EVENTSOURCE],[test "$enable_eventsource" = "yes"])
873AM_CONDITIONAL([ENABLE_FAST_MOBILE_SCROLLING],[test "$enable_fast_mobile_scrolling" = "yes"]) 931AM_CONDITIONAL([ENABLE_FAST_MOBILE_SCROLLING],[test "$enable_fast_mobile_scrolling" = "yes"])
932AM_CONDITIONAL([ENABLE_FILE_SYSTEM],[test "$enable_file_system" = "yes"])
874AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"]) 933AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"])
875AM_CONDITIONAL([ENABLE_IMAGE_RESIZER],[test "$enable_image_resizer" = "yes"]) 934AM_CONDITIONAL([ENABLE_IMAGE_RESIZER],[test "$enable_image_resizer" = "yes"])
876AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"]) 935AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"])
@@ -879,12 +938,8 @@ AM_CONDITIONAL([ENABLE_XHTMLMP],[test "$enable_xhtmlmp" = "yes"])
879AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"]) 938AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"])
880AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"]) 939AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
881AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"]) 940AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
882AM_CONDITIONAL([ENABLE_FILE_READER],[test "$enable_file_reader" = "yes"])
883AM_CONDITIONAL([ENABLE_FILE_WRITER],[test "$enable_file_writer" = "yes"])
884AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"]) 941AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
885AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"]) 942AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"])
886AM_CONDITIONAL([ENABLE_RUBY],[test "$enable_ruby" = "yes"])
887AM_CONDITIONAL([ENABLE_SANDBOX],[test "$enable_sandbox" = "yes"])
888AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"]) 943AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"])
889AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"]) 944AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"])
890AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" = "yes"]) 945AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" = "yes"])
@@ -903,6 +958,7 @@ AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
903AM_CONDITIONAL([HTML_FLAGS],[test "$html_flags" = "yes"]) 958AM_CONDITIONAL([HTML_FLAGS],[test "$html_flags" = "yes"])
904AM_CONDITIONAL([ENABLE_WEB_SOCKETS],[test "$enable_web_sockets" = "yes"]) 959AM_CONDITIONAL([ENABLE_WEB_SOCKETS],[test "$enable_web_sockets" = "yes"])
905AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"]) 960AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"])
961AM_CONDITIONAL([ENABLE_OPCODE_STATS],[test "$enable_opcode_stats" = "yes"])
906 962
907# Gtk conditionals 963# Gtk conditionals
908AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"]) 964AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
@@ -918,7 +974,9 @@ WebKit/gtk/docs/version.xml
918 974
919AC_CONFIG_FILES([ 975AC_CONFIG_FILES([
920WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit/gtk/webkit.pc.in 976WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit/gtk/webkit.pc.in
921WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in] 977WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in
978WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:WebKit/gtk/org.webkitgtk.gschema.xml.in
979]
922,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME] 980,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
923) 981)
924 982
@@ -936,12 +994,11 @@ Build configuration:
936 Optimized memory allocator : $enable_fast_malloc 994 Optimized memory allocator : $enable_fast_malloc
937Features: 995Features:
938 3D Transforms : $enable_3D_transforms 996 3D Transforms : $enable_3D_transforms
939 Blob.slice support : $enable_blob_slice 997 Blob support : $enable_blob
998 Directory upload : $enable_directory_upload
940 Fast Mobile Scrolling : $enable_fast_mobile_scrolling 999 Fast Mobile Scrolling : $enable_fast_mobile_scrolling
941 JIT compilation : $enable_jit 1000 JIT compilation : $enable_jit
942 Filters support : $enable_filters 1001 Filters support : $enable_filters
943 FileReader support : $enable_file_reader
944 FileWriter support : $enable_file_writer
945 Geolocation support : $enable_geolocation 1002 Geolocation support : $enable_geolocation
946 JavaScript debugger/profiler support : $enable_javascript_debugger 1003 JavaScript debugger/profiler support : $enable_javascript_debugger
947 MathML support : $enable_mathml 1004 MathML support : $enable_mathml
@@ -949,12 +1006,14 @@ Features:
949 HTML5 channel messaging support : $enable_channel_messaging 1006 HTML5 channel messaging support : $enable_channel_messaging
950 HTML5 client-side session and persistent storage support : $enable_dom_storage 1007 HTML5 client-side session and persistent storage support : $enable_dom_storage
951 HTML5 client-side database storage support : $enable_database 1008 HTML5 client-side database storage support : $enable_database
952 HTML5 ruby support : $enable_ruby 1009 HTML5 FileSystem API support : $enable_file_system
953 HTML5 sandboxed iframe support : $enable_sandbox 1010 HTML5 sandboxed iframe support : $enable_sandbox
954 HTML5 server-sent events support : $enable_eventsource 1011 HTML5 server-sent events support : $enable_eventsource
955 HTML5 video element support : $enable_video 1012 HTML5 video element support : $enable_video
956 Icon database support : $enable_icon_database 1013 Icon database support : $enable_icon_database
957 Image resizer support : $enable_image_resizer 1014 Image resizer support : $enable_image_resizer
1015 Link prefetch support : $enable_link_prefetch
1016 Opcode stats : $enable_opcode_stats
958 SharedWorkers support : $enable_shared_workers 1017 SharedWorkers support : $enable_shared_workers
959 Speech input support : $enable_input_speech 1018 Speech input support : $enable_input_speech
960 SVG support : $enable_svg 1019 SVG support : $enable_svg
@@ -970,6 +1029,7 @@ Features:
970 XHTML-MP support : $enable_xhtmlmp 1029 XHTML-MP support : $enable_xhtmlmp
971 XPATH support : $enable_xpath 1030 XPATH support : $enable_xpath
972 XSLT support : $enable_xslt 1031 XSLT support : $enable_xslt
1032
973GTK+ configuration: 1033GTK+ configuration:
974 GTK+ version : $with_gtk 1034 GTK+ version : $with_gtk
975 GDK target : $with_target 1035 GDK target : $with_target
diff --git a/meta/recipes-sato/webkit/files/nodolt.patch b/meta/recipes-sato/webkit/files/nodolt.patch
new file mode 100644
index 0000000000..53313671f4
--- /dev/null
+++ b/meta/recipes-sato/webkit/files/nodolt.patch
@@ -0,0 +1,16 @@
1Dolt cause build error on some platform, so disable it.
2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4Index: webkit-gtk-1.3.7+svnr72836-r72836-r0/configure.ac
5===================================================================
6--- webkit-gtk-1.3.7+svnr72836-r72836-r0.orig/configure.ac 2011-01-21 11:11:07.000000000 +0800
7+++ webkit-gtk-1.3.7+svnr72836-r72836-r0/configure.ac 2011-01-21 11:11:15.000000000 +0800
8@@ -82,8 +82,6 @@
9 AC_DISABLE_STATIC
10 AC_LIBTOOL_WIN32_DLL
11 AC_PROG_LIBTOOL
12-# use dolt to speedup the build
13-DOLT
14
15 AC_PATH_PROG(FLEX, flex)
16 if test -z "$FLEX"; then
diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index 8d4eb35239..1b5e276739 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -12,7 +12,7 @@ DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer f
12 12
13SRCREV_FORMAT = "webcore-rwebkit" 13SRCREV_FORMAT = "webcore-rwebkit"
14 14
15PV = "1.3.2+svnr${SRCPV}" 15PV = "1.3.7+svnr${SRCPV}"
16PR = "r0" 16PR = "r0"
17 17
18SRC_URI = "\ 18SRC_URI = "\
@@ -29,6 +29,7 @@ SRC_URI = "\
29 file://configure.ac \ 29 file://configure.ac \
30 file://GNUmakefile.am \ 30 file://GNUmakefile.am \
31 file://gtk-doc.make \ 31 file://gtk-doc.make \
32 file://nodolt.patch \
32 " 33 "
33 34
34S = "${WORKDIR}/" 35S = "${WORKDIR}/"
@@ -60,6 +61,11 @@ do_compile_prepend() {
60 cd ${S} 61 cd ${S}
61} 62}
62 63
64do_install_prepend() {
65 cp ${S}/Programs/.libs/jsc ${S}/Programs/jsc-1 || true
66}
67
68
63PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore" 69PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore"
64FILES_${PN}launcher = "${bindir}/GtkLauncher" 70FILES_${PN}launcher = "${bindir}/GtkLauncher"
65FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher" 71FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher"