summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/packages/webkit/files/GNUmakefile.am224
-rw-r--r--meta/packages/webkit/files/Makefile13
-rw-r--r--meta/packages/webkit/files/Makefile.shared6
-rw-r--r--meta/packages/webkit/files/WebKit.pri5
-rw-r--r--meta/packages/webkit/files/autogen.sh7
-rw-r--r--meta/packages/webkit/files/configure.ac217
-rw-r--r--meta/packages/webkit/webkit-gtk_svn.bb82
-rw-r--r--meta/packages/webkit/webkit.inc5
9 files changed, 398 insertions, 163 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 40040183b2..b19f30eb47 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -139,7 +139,7 @@ SRCREV_pn-gaku ?= "365"
139SRCREV_pn-gypsy ?= "39" 139SRCREV_pn-gypsy ?= "39"
140SRCDATE_yaffs2-utils = "20071107" 140SRCDATE_yaffs2-utils = "20071107"
141SRCDATE_yaffs2-utils-native = "20071107" 141SRCDATE_yaffs2-utils-native = "20071107"
142SRCREV_pn-webkit-gtk ?= "28656" 142SRCREV_pn-webkit-gtk ?= "30762"
143SRCREV_pn-clipboard-manager ?= "14994" 143SRCREV_pn-clipboard-manager ?= "14994"
144 144
145# Previously floating revisions 145# Previously floating revisions
diff --git a/meta/packages/webkit/files/GNUmakefile.am b/meta/packages/webkit/files/GNUmakefile.am
index f3ec252ee8..977770a1ed 100644
--- a/meta/packages/webkit/files/GNUmakefile.am
+++ b/meta/packages/webkit/files/GNUmakefile.am
@@ -21,8 +21,10 @@
21# 21#
22# global_cppflags = CPPFLAGS that apply to JSC, WebCore, and to any 22# global_cppflags = CPPFLAGS that apply to JSC, WebCore, and to any
23# specific port 23# specific port
24# global_cflags = CFLAGS and CXXFLAGS that apply to JSC, WebCore, and to 24# global_cflags = CFLAGS that apply to JSC, WebCore, and to
25# any specific port 25# any specific port
26# global_cxxflags = CXXFLAGS that apply to JSC, WebCore, and to any
27# specific port
26 28
27srcdir = @srcdir@ 29srcdir = @srcdir@
28VPATH = @srcdir@ 30VPATH = @srcdir@
@@ -34,8 +36,6 @@ GENSOURCES := $(top_builddir)/DerivedSources
34CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/kjs/create_hash_table 36CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/kjs/create_hash_table
35 37
36# Libraries and support components 38# Libraries and support components
37noinst_LTLIBRARIES :=
38
39noinst_HEADERS := 39noinst_HEADERS :=
40 40
41noinst_PROGRAMS := 41noinst_PROGRAMS :=
@@ -49,140 +49,203 @@ EXTRA_DIST :=
49 49
50# 50#
51# Global flags to CPP 51# Global flags to CPP
52global_cppflags := 52global_cppflags :=
53 53
54global_cppflags += \ 54global_cppflags += \
55 -I $(srcdir)/JavaScriptCore \ 55 -I$(srcdir)/JavaScriptCore \
56 -I $(srcdir)/JavaScriptCore/ForwardingHeaders \ 56 -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
57 -I $(srcdir)/JavaScriptCore/wtf \ 57 -I$(srcdir)/JavaScriptCore/wtf \
58 -I $(srcdir)/JavaScriptCore/kjs \ 58 -I$(srcdir)/JavaScriptCore/kjs \
59 -I $(top_builddir)/DerivedSources 59 -I$(top_builddir)/DerivedSources
60 60
61# Default compiler flags 61# Default compiler flags
62global_cflags := \ 62global_cflags := \
63 -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \ 63 -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \
64 -Wformat -Wformat-security -Wno-format-y2k -Wundef \ 64 -Wformat -Wformat-security -Wno-format-y2k -Wundef \
65 -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \ 65 -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \
66 -Wno-unused-parameter -fno-exceptions -fno-strict-aliasing 66 -Wno-unused-parameter
67 67
68# Libraries 68global_cxxflags := \
69lib_LTLIBRARIES = libJavaScriptCore.la libWebKitGtk.la 69 $(SYMBOL_VISIBILITY_INLINES)
70
71if !ENABLE_DEBUG
72global_cflags += \
73 -fno-exceptions \
74 $(SYMBOL_VISIBILITY)
75
76global_cxxflags += \
77 -fno-rtti
78endif
79
80# Shared libraries
81lib_LTLIBRARIES = \
82 libwebkit-1.0.la
83
84# Convenience libraries
85noinst_LTLIBRARIES = \
86 libJavaScriptCore.la \
87 libWebCore.la
70 88
71# 89#
72# JavaScriptCore 90# JavaScriptCore
73javascriptcore_h_api := 91javascriptcore_h_api :=
74javascriptcore_cppflags:= 92javascriptcore_cppflags:=
75javascriptcore_sources := 93javascriptcore_sources :=
76javascriptcore_built_sources := 94javascriptcore_built_sources :=
77javascriptcore_built_nosources := 95javascriptcore_built_nosources :=
78 96
79# The variables above are already included below so no need to touch 97# The variables above are already included below so no need to touch
80# these variables unless you really have to 98# these variables unless you really have to
81libJavaScriptCore_ladir = $(prefix)/include/WebKit/JavaScriptCore 99libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore
82libJavaScriptCore_la_HEADERS := $(javascriptcore_h_api) 100libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api)
83 101
84libJavaScriptCore_la_SOURCES := \ 102libJavaScriptCore_la_SOURCES = \
85 $(javascriptcore_built_sources) \ 103 $(javascriptcore_built_sources) \
86 $(javascriptcore_sources) 104 $(javascriptcore_sources)
87 105
88libJavaScriptCore_la_LDFLAGS := -lpthread 106libJavaScriptCore_la_LIBADD = \
107 $(ICU_LIBS) \
108 $(GLOBALDEPS_LIBS) \
109 -lpthread
89 110
90libJavaScriptCore_la_CXXFLAGS := $(global_cflags) 111libJavaScriptCore_la_CXXFLAGS = \
112 $(global_cxxflags) \
113 $(global_cflags) \
114 $(GLOBALDEPS_CFLAGS) \
115 -fstrict-aliasing
91 116
92libJavaScriptCore_la_CFLAGS := $(global_cflags) 117libJavaScriptCore_la_CFLAGS = \
118 $(global_cflags) \
119 $(GLOBALDEPS_CFLAGS) \
120 -fstrict-aliasing
93 121
94libJavaScriptCore_la_CPPFLAGS := $(global_cppflags) $(javascriptcore_cppflags) 122libJavaScriptCore_la_CPPFLAGS = \
123 $(global_cppflags) \
124 $(javascriptcore_cppflags) \
125 $(ICU_CPPFLAGS)
95 126
96# 127#
97# WebCore 128# WebCore
98webcore_cppflags := 129webcore_cppflags :=
99webcore_sources := 130webcore_sources :=
100webcore_headers := 131webcore_headers :=
132webcore_libadd :=
101webcore_built_sources := 133webcore_built_sources :=
102webcore_built_nosources := 134webcore_built_nosources :=
103 135
104# WebKitGtk 136webcore_cppflags += $(HILDON_CPPFLAGS)
137
138# WebKit
105webkitgtk_h_api := 139webkitgtk_h_api :=
106webkitgtk_headers := 140webkitgtk_headers :=
107webkitgtk_sources := 141webkitgtk_sources :=
108webkitgtk_cppflags := 142webkitgtk_cppflags :=
109webkitgtk_ldflags :=
110webkitgtk_built_sources := 143webkitgtk_built_sources :=
111webkitgtk_built_nosources := 144webkitgtk_built_nosources :=
112webkitgtk_cleanfiles := 145webkitgtk_cleanfiles :=
113 146
114# No need to touch the following variables unless you have to. If you need to change the values 147libWebCore_la_SOURCES = \
115# for the following variables, use the "webkitgtk_" variables above
116libWebKitGtk_ladir := $(prefix)/include/WebKit
117
118libWebKitGtk_la_HEADERS := $(webkitgtk_h_api)
119
120libWebKitGtk_la_SOURCES := \
121 $(webcore_built_sources) \ 148 $(webcore_built_sources) \
122 $(webcore_headers) \ 149 $(webcore_headers) \
123 $(webcore_sources) \ 150 $(webcore_sources)
124 $(webkitgtk_built_sources) \
125 $(webkitgtk_headers) \
126 $(webkitgtk_sources)
127 151
128libWebKitGtk_la_CXXFLAGS := \ 152libWebCore_la_CXXFLAGS = \
129 -fno-rtti \ 153 -fno-strict-aliasing \
154 $(global_cxxflags) \
130 $(global_cflags) \ 155 $(global_cflags) \
131 $(DEPENDENCIES_CFLAGS) \ 156 $(GLOBALDEPS_CFLAGS) \
157 $(WEBKITDEPS_CFLAGS) \
158 $(LIBCURL_CFLAGS) \
132 $(SQLITE3_CFLAGS) \ 159 $(SQLITE3_CFLAGS) \
133 $(GSTREAMER_CFLAGS) \ 160 $(GSTREAMER_CFLAGS) \
134 $(LIBXSLT_CFLAGS) \ 161 $(LIBXSLT_CFLAGS) \
135 $(COVERAGE_CFLAGS) 162 $(COVERAGE_CFLAGS) \
163 $(HILDON_CFLAGS)
136 164
137libWebKitGtk_la_CFLAGS := \ 165libWebCore_la_CFLAGS = \
166 -fno-strict-aliasing \
138 $(global_cflags) \ 167 $(global_cflags) \
139 $(DEPENDENCIES_CFLAGS) \ 168 $(GLOBALDEPS_CFLAGS) \
169 $(WEBKITDEPS_CFLAGS) \
170 $(LIBCURL_CFLAGS) \
140 $(SQLITE3_CFLAGS) \ 171 $(SQLITE3_CFLAGS) \
141 $(GSTREAMER_CFLAGS) \ 172 $(GSTREAMER_CFLAGS) \
142 $(LIBXSLT_CFLAGS) \ 173 $(LIBXSLT_CFLAGS) \
143 $(COVERAGE_CFLAGS) 174 $(COVERAGE_CFLAGS) \
175 $(HILDON_CFLAGS)
144 176
145libWebKitGtk_la_CPPFLAGS := \ 177libWebCore_la_CPPFLAGS = \
178 $(ICU_CPPFLAGS) \
146 $(global_cppflags) \ 179 $(global_cppflags) \
147 $(webcore_cppflags) \ 180 $(webcore_cppflags) \
148 $(webkitgtk_cppflags) 181 $(webkitgtk_cppflags)
149 182
150libWebKitGtk_la_LIBADD := @LTLIBOBJS@ libJavaScriptCore.la 183libWebCore_la_LIBADD = \
151 184 libJavaScriptCore.la \
152libWebKitGtk_la_LDFLAGS := \ 185 $(webcore_libadd) \
153 $(webkitgtk_ldflags) \ 186 $(GLOBALDEPS_LIBS) \
154 $(DEPENDENCIES_LIBS) \ 187 $(WEBKITDEPS_LIBS) \
188 $(LIBCURL_LIBS) \
155 $(ICU_LIBS) \ 189 $(ICU_LIBS) \
156 $(SQLITE3_LIBS) \ 190 $(SQLITE3_LIBS) \
157 $(GSTREAMER_LIBS) \ 191 $(GSTREAMER_LIBS) \
158 $(LIBXSLT_LIBS) \ 192 $(LIBXSLT_LIBS) \
159 $(COVERAGE_LDFLAGS) \ 193 $(HILDON_LIBS) \
160 -lpthread \ 194 -lpthread \
161 -ljpeg \ 195 -ljpeg
196
197libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit
198libwebkit_1_0_la_HEADERS = $(webkitgtk_h_api)
199
200libwebkit_1_0_la_SOURCES = \
201 $(webkitgtk_built_sources) \
202 $(webkitgtk_headers) \
203 $(webkitgtk_sources)
204
205libwebkit_1_0_la_CXXFLAGS = \
206 $(libWebCore_la_CXXFLAGS)
207
208libwebkit_1_0_la_CFLAGS = \
209 $(libWebCore_la_CFLAGS)
210
211libwebkit_1_0_la_CPPFLAGS = \
212 $(libWebCore_la_CPPFLAGS)
213
214libwebkit_1_0_la_LDFLAGS = \
215 $(COVERAGE_LDFLAGS) \
162 -version-info @LIBWEBKITGTK_VERSION@ 216 -version-info @LIBWEBKITGTK_VERSION@
163 217
218libwebkit_1_0_la_LIBADD = \
219 libWebCore.la
220
164# 221#
165# Extra checks and flags 222# Extra checks and flags
166global_cppflags += \ 223global_cppflags += \
167 -DBUILDING_GTK__=1 \ 224 -DBUILDING_GTK__=1 \
168 -DUSE_SYSTEM_MALLOC \
169 -DWTF_CHANGES 225 -DWTF_CHANGES
170 226
227if !ENABLE_FAST_MALLOC
228global_cppflags += \
229 -DUSE_SYSTEM_MALLOC
230endif
231
171if TARGET_X11 232if TARGET_X11
172global_cppflags += -DXP_UNIX 233global_cppflags += -DXP_UNIX
173endif 234endif
174 235
175if !ENABLE_DEBUG 236if !ENABLE_DEBUG
176global_cppflags += -DNDEBUG 237global_cppflags += -DNDEBUG
177else 238else
178webkitgtk_cppflags += \ 239webkitgtk_cppflags += \
179 -DG_DISABLE_DEPRECATED \ 240 -DG_DISABLE_DEPRECATED \
180 -DGDK_PIXBUF_DISABLE_DEPRECATED \ 241 -DGDK_PIXBUF_DISABLE_DEPRECATED \
181 -DGDK_DISABLE_DEPRECATED \ 242 -DGDK_DISABLE_DEPRECATED \
182 -DGTK_DISABLE_DEPRECATED \ 243 -DGTK_DISABLE_DEPRECATED \
183 -DPANGO_DISABLE_DEPRECATED \ 244 -DPANGO_DISABLE_DEPRECATED
184 -DGDK_MULTIHEAD_SAFE \ 245
185 -DGTK_MULTIHEAD_SAFE 246# Might be useful in the future
247# -DGDK_MULTIHEAD_SAFE \
248# -DGTK_MULTIHEAD_SAFE
186endif 249endif
187 250
188if !ENABLE_DATABASE 251if !ENABLE_DATABASE
@@ -200,30 +263,30 @@ global_cppflags += \
200endif 263endif
201 264
202if ENABLE_VIDEO 265if ENABLE_VIDEO
203webkitgtk_ldflags += -lgstinterfaces-0.10 -lgstvideo-0.10 266webcore_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10
204endif 267endif
205 268
206#
207# WEBKIT GTK+
208webkitgtk_cppflags += \ 269webkitgtk_cppflags += \
209-I $(top_builddir)/WebKit/gtk/WebView \ 270-I$(top_builddir)/WebKit/gtk/webkit \
210-DBUILDING_CAIRO__=1 \ 271-DBUILDING_CAIRO__=1 \
211-DBUILD_WEBKIT 272-DBUILD_WEBKIT
212 273
213webkitgtk_h_api += \ 274webkitgtk_h_api += \
214 WebKit/gtk/WebView/webkit.h \ 275 WebKit/gtk/webkit/webkit.h \
215 WebKit/gtk/WebView/webkitdefines.h \ 276 WebKit/gtk/webkit/webkitdefines.h \
216 WebKit/gtk/WebView/webkitnetworkrequest.h \ 277 WebKit/gtk/webkit/webkitnetworkrequest.h \
217 WebKit/gtk/WebView/webkitwebframe.h \ 278 WebKit/gtk/webkit/webkitwebbackforwardlist.h \
218 WebKit/gtk/WebView/webkitwebview.h 279 WebKit/gtk/webkit/webkitwebframe.h \
280 WebKit/gtk/webkit/webkitwebhistoryitem.h \
281 WebKit/gtk/webkit/webkitwebsettings.h \
282 WebKit/gtk/webkit/webkitwebview.h
219 283
220webkitgtk_built_sources += \ 284webkitgtk_built_sources += \
221 WebKit/gtk/WebView/webkit-marshal.h \ 285 WebKit/gtk/webkit/webkit-marshal.h \
222 WebKit/gtk/WebView/webkit-marshal.cpp 286 WebKit/gtk/webkit/webkit-marshal.cpp
223 287
224webkitgtk_headers += \ 288webkitgtk_headers += \
225 WebKit/gtk/WebView/webkitprivate.h \ 289 WebKit/gtk/webkit/webkitprivate.h \
226 WebKit/gtk/WebView/webkitsettings.h \
227 WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ 290 WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
228 WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \ 291 WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
229 WebKit/gtk/WebCoreSupport/DragClientGtk.h \ 292 WebKit/gtk/WebCoreSupport/DragClientGtk.h \
@@ -233,37 +296,39 @@ webkitgtk_headers += \
233 WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h 296 WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h
234 297
235webkitgtk_sources += \ 298webkitgtk_sources += \
236 WebKit/gtk/WebView/webkitnetworkrequest.cpp \ 299 WebKit/gtk/webkit/webkitnetworkrequest.cpp \
237 WebKit/gtk/WebView/webkitprivate.cpp \ 300 WebKit/gtk/webkit/webkitprivate.cpp \
238 WebKit/gtk/WebView/webkitsettings.cpp \ 301 WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
239 WebKit/gtk/WebView/webkitwebframe.cpp \ 302 WebKit/gtk/webkit/webkitwebframe.cpp \
240 WebKit/gtk/WebView/webkitwebview.cpp \ 303 WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
304 WebKit/gtk/webkit/webkitwebsettings.cpp \
305 WebKit/gtk/webkit/webkitwebview.cpp \
241 WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ 306 WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
242 WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ 307 WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
243 WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ 308 WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
244 WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ 309 WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \
245 WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ 310 WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \
246 WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ 311 WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
247 WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp 312 WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp
248 313
249webkitgtk_cleanfiles += \ 314webkitgtk_cleanfiles += \
250 $(top_builddir)/Programs/GtkLauncher \ 315 $(top_builddir)/Programs/GtkLauncher \
251 $(top_builddir)/WebKit/gtk/WebKitGtk.pc 316 $(top_builddir)/WebKit/gtk/webkit-1.0.pc
252 317
253pkgconfigdir = $(libdir)/pkgconfig 318pkgconfigdir = $(libdir)/pkgconfig
254pkgconfig_DATA = WebKit/gtk/WebKitGtk.pc 319pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
255 320
256WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/WebView/webkit-marshal 321WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/webkit/webkit-marshal
257WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/WebView/webkit-marshal.list 322WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list
258 323
259stamp_files := \ 324stamp_files := \
260 stamp-webkit-marshal.cpp \ 325 stamp-webkit-marshal.cpp \
261 stamp-webkit-marshal.h 326 stamp-webkit-marshal.h
262 327
263WebKit/gtk/WebView/webkit-marshal.cpp: stamp-webkit-marshal.cpp 328WebKit/gtk/webkit/webkit-marshal.cpp: stamp-webkit-marshal.cpp
264 @true 329 @true
265 330
266WebKit/gtk/WebView/webkit-marshal.h: stamp-webkit-marshal.h 331WebKit/gtk/webkit/webkit-marshal.h: stamp-webkit-marshal.h
267 @true 332 @true
268 333
269stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST) 334stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST)
@@ -289,7 +354,7 @@ include WebKitTools/GNUmakefile.am
289 354
290 355
291# Autogenerated sources 356# Autogenerated sources
292BUILT_SOURCES := \ 357BUILT_SOURCES = \
293 $(javascriptcore_built_sources) \ 358 $(javascriptcore_built_sources) \
294 $(javascriptcore_built_nosources) \ 359 $(javascriptcore_built_nosources) \
295 $(webcore_built_sources) \ 360 $(webcore_built_sources) \
@@ -302,7 +367,6 @@ CLEANFILES += \
302 $(webkitgtk_cleanfiles) \ 367 $(webkitgtk_cleanfiles) \
303 $(top_builddir)/Programs/DumpRenderTree \ 368 $(top_builddir)/Programs/DumpRenderTree \
304 $(top_builddir)/Programs/testkjs \ 369 $(top_builddir)/Programs/testkjs \
305 $(top_builddir)/Programs/dftables \
306 $(GENSOURCES) 370 $(GENSOURCES)
307 371
308MAINTAINERCLEANFILES += \ 372MAINTAINERCLEANFILES += \
diff --git a/meta/packages/webkit/files/Makefile b/meta/packages/webkit/files/Makefile
index 89344f7a58..fa7ea02426 100644
--- a/meta/packages/webkit/files/Makefile
+++ b/meta/packages/webkit/files/Makefile
@@ -7,16 +7,23 @@ all:
7debug d development dev develop: 7debug d development dev develop:
8 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ 8 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
9 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done 9 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
10 10
11release r deployment dep deploy: 11release r deployment dep deploy:
12 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ 12 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
13 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done 13 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
14 14
15universal u: 15universal u:
16 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ 16 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
17 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done 17 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
18 18
19clean: 1964:
20 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ 20 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
21 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done 21 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
22 22
2364u:
24 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
25 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
26
27clean:
28 @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
29 if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
diff --git a/meta/packages/webkit/files/Makefile.shared b/meta/packages/webkit/files/Makefile.shared
index a036aacc50..096d32e948 100644
--- a/meta/packages/webkit/files/Makefile.shared
+++ b/meta/packages/webkit/files/Makefile.shared
@@ -15,6 +15,12 @@ release r deployment dep deploy: force
15universal u: force 15universal u: force
16 ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} ) 16 ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
17 17
1864: force
19 ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
20
2164u: force
22 ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc ppc64 i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
23
18clean: 24clean:
19 ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) 25 ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
20 26
diff --git a/meta/packages/webkit/files/WebKit.pri b/meta/packages/webkit/files/WebKit.pri
index 640fa34174..36404ac803 100644
--- a/meta/packages/webkit/files/WebKit.pri
+++ b/meta/packages/webkit/files/WebKit.pri
@@ -58,6 +58,11 @@ CONFIG(release) {
58 DEFINES += NDEBUG 58 DEFINES += NDEBUG
59} 59}
60 60
61gtk-port:CONFIG(debug) {
62 DEFINES += G_DISABLE_DEPRECATED GDK_PIXBUF_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED GTK_DISABLE_DEPRECATED PANGO_DISABLE_DEPRECATED
63# maybe useful for debugging DEFINES += GDK_MULTIHEAD_SAFE GTK_MULTIHEAD_SAFE
64}
65
61BASE_DIR = $$PWD 66BASE_DIR = $$PWD
62qt-port:INCLUDEPATH += \ 67qt-port:INCLUDEPATH += \
63 $$PWD/WebKit/qt/Api 68 $$PWD/WebKit/qt/Api
diff --git a/meta/packages/webkit/files/autogen.sh b/meta/packages/webkit/files/autogen.sh
index b7f7d37b2f..1c0fc61156 100644
--- a/meta/packages/webkit/files/autogen.sh
+++ b/meta/packages/webkit/files/autogen.sh
@@ -1,8 +1,11 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# Allow invocation from a separate build directory; in that case, we change
4# to the source directory to run the auto*, then change back before running configure
3srcdir=`dirname $0` 5srcdir=`dirname $0`
4test -z "$srcdir" && srcdir=. 6test -z "$srcdir" && srcdir=.
5 7
8ORIGDIR=`pwd`
6cd $srcdir 9cd $srcdir
7 10
8DIE=0 11DIE=0
@@ -37,4 +40,6 @@ autoheader || exit $?
37automake --foreign --add-missing || exit $? 40automake --foreign --add-missing || exit $?
38autoconf || exit $? 41autoconf || exit $?
39 42
40./configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? 43cd $ORIGDIR || exit 1
44
45$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
diff --git a/meta/packages/webkit/files/configure.ac b/meta/packages/webkit/files/configure.ac
index 05c25b94a8..404e5a0d6a 100644
--- a/meta/packages/webkit/files/configure.ac
+++ b/meta/packages/webkit/files/configure.ac
@@ -9,9 +9,7 @@ AC_CONFIG_SRCDIR([WebCore/config.h])
9LIBWEBKITGTK_VERSION=1:0:0 9LIBWEBKITGTK_VERSION=1:0:0
10AC_SUBST([LIBWEBKITGTK_VERSION]) 10AC_SUBST([LIBWEBKITGTK_VERSION])
11 11
12AM_INIT_AUTOMAKE([1.9 foreign tar-ustar subdir-objects]) 12AM_INIT_AUTOMAKE([foreign subdir-objects])
13
14AM_MAINTAINER_MODE
15 13
16AC_CANONICAL_HOST 14AC_CANONICAL_HOST
17 15
@@ -35,6 +33,9 @@ case "$host" in
35 *-*-freebsd*) 33 *-*-freebsd*)
36 os_freebsd=yes 34 os_freebsd=yes
37 ;; 35 ;;
36 *-*-darwin*)
37 os_darwin=yes
38 ;;
38esac 39esac
39 40
40# If CXXFLAGS and CFLAGS are unset, default to -O2 41# If CXXFLAGS and CFLAGS are unset, default to -O2
@@ -53,9 +54,20 @@ AM_PROG_LIBTOOL
53AC_PROG_INSTALL 54AC_PROG_INSTALL
54AM_PROG_CC_STDC 55AM_PROG_CC_STDC
55AC_PROG_CXX 56AC_PROG_CXX
56AC_PROG_CXX_C_O
57AM_PROG_CC_C_O 57AM_PROG_CC_C_O
58 58
59# check for -fvisibility=hidden compiler support (GCC >= 4)
60saved_CFLAGS="$CFLAGS"
61CFLAGS="$CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
62AC_MSG_CHECKING([if ${CXX} supports -fvisibility=hidden -fvisibility-inlines-hidden])
63AC_COMPILE_IFELSE([char foo;],
64 [ AC_MSG_RESULT([yes])
65 SYMBOL_VISIBILITY="-fvisibility=hidden" SYMBOL_VISIBILITY_INLINES="-fvisibility-inlines-hidden" ],
66 AC_MSG_RESULT([no]))
67CFLAGS="$saved_CFLAGS"
68AC_SUBST(SYMBOL_VISIBILITY)
69AC_SUBST(SYMBOL_VISIBILITY_INLINES)
70
59AC_PATH_PROG(PERL, perl) 71AC_PATH_PROG(PERL, perl)
60if test -z "$PERL"; then 72if test -z "$PERL"; then
61 AC_MSG_ERROR([You need 'perl' to compile WebKit]) 73 AC_MSG_ERROR([You need 'perl' to compile WebKit])
@@ -101,10 +113,12 @@ AC_C_VOLATILE
101AC_HEADER_STDC 113AC_HEADER_STDC
102AC_HEADER_STDBOOL 114AC_HEADER_STDBOOL
103 115
104# pthread 116# pthread (not needed on Windows)
117if test "$os_win32" = "no"; then
105AC_CHECK_HEADERS([pthread.h], 118AC_CHECK_HEADERS([pthread.h],
106 AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exist]), 119 AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exist]),
107 AC_MSG_ERROR([pthread support is required to build WebKit])) 120 AC_MSG_ERROR([pthread support is required to build WebKit]))
121fi
108 122
109# libjpeg headers 123# libjpeg headers
110AC_CHECK_HEADERS([jpeglib.h]) 124AC_CHECK_HEADERS([jpeglib.h])
@@ -116,75 +130,126 @@ if test "$PKG_CONFIG" = "no"; then
116fi 130fi
117 131
118# check for icu-config 132# check for icu-config
133if test "$os_darwin" = "yes"; then
134ICU_CPPFLAGS="-I\$(srcdir)/JavaScriptCore/icu -I\$(srcdir)/WebCore/icu"
135ICU_LIBS="-licucore"
136else
119AC_PATH_PROG(icu_config, icu-config, no) 137AC_PATH_PROG(icu_config, icu-config, no)
120if test "$icu_config" = "no"; then 138if test "$icu_config" = "no"; then
121 AC_MSG_ERROR([Cannot find icu-config. ICU library is needed.]) 139 AC_MSG_ERROR([Cannot find icu-config. ICU library is needed.])
122fi 140fi
123ICU_CFLAGS=`$icu_config --cflags` 141
142# We don't use --cflags as this gives us a lot of things that we don't
143# necessarily want, like debugging and optimization flags
144# See man (1) icu-config for more info.
145ICU_CPPFLAGS=`$icu_config --cppflags`
124ICU_LIBS=`$icu_config --ldflags` 146ICU_LIBS=`$icu_config --ldflags`
125AC_SUBST([ICU_CFLAGS]) 147AC_SUBST([ICU_CPPFLAGS])
126AC_SUBST([ICU_LIBS]) 148AC_SUBST([ICU_LIBS])
149fi
127 150
128# determine the GDK/GTK+ target 151# determine the GDK/GTK+ target
129AC_MSG_CHECKING([the target for WebKit GTK+]) 152AC_MSG_CHECKING([the target windowing system])
130AC_ARG_WITH(webkit_target, 153AC_ARG_WITH(target,
131 AC_HELP_STRING([--with-webkit-target=@<:@x11/win32/quartz/directfb@:>@], 154 AC_HELP_STRING([--with-target=@<:@x11/win32/quartz/directfb@:>@],
132 [Select webkit target [default=x11]]), 155 [Select webkit target [default=x11]]),
133 [],[with_webkit_target="x11"]) 156 [],[with_target="x11"])
134 157
135case "$with_webkit_target" in 158case "$with_target" in
136 x11|win32|quartz|directfb) ;; 159 x11|win32|quartz|directfb) ;;
137 *) AC_MSG_ERROR([Invalid target: must be x11, quartz, win32, or directfb.]) ;; 160 *) AC_MSG_ERROR([Invalid target: must be x11, quartz, win32, or directfb.]) ;;
138esac 161esac
139 162
140AC_MSG_RESULT([$with_webkit_target]) 163AC_MSG_RESULT([$with_target])
164
165AC_MSG_CHECKING([for Hildon UI extensions])
166AC_ARG_WITH(hildon,
167 AC_HELP_STRING([--with-hildon],
168 [Use Hildon UI extensions [default=no]]),
169 [],[with_hildon="no"])
170AC_MSG_RESULT([$with_hildon])
171
172if test "$with_hildon" = "yes"; then
173 HILDON_CPPFLAGS="-DMAEMO_CHANGES"
174 PKG_CHECK_MODULES([HILDON], [hildon-1])
175 AC_SUBST([HILDON_CPPFLAGS])
176 AC_SUBST([HILDON_CFLAGS])
177 AC_SUBST([HILDON_LIBS])
178fi
179
180# determine the http backend
181AC_MSG_CHECKING([the HTTP backend to use])
182AC_ARG_WITH(http_backend,
183 AC_HELP_STRING([--with-http-backend=@<:@curl@:>@],
184 [Select HTTP backend [default=curl]]),
185 [],[http_backend="curl"])
186
187case "$http_backend" in
188 curl) ;;
189 *) AC_MSG_ERROR([Invalid HTTP backend: must be curl.]) ;;
190esac
191
192AC_MSG_RESULT([$http_backend])
141 193
142# minimum base dependencies 194# minimum base dependencies
195CAIRO_REQUIRED_VERSION=1.4
196FONTCONFIG_REQUIRED_VERSION=2.4
197FREETYPE2_REQUIRED_VERSION=9.0
198LIBXML_REQUIRED_VERSION=2.6
199
200# minimum GTK+ base dependencies
143GLIB_REQUIRED_VERSION=2.0 201GLIB_REQUIRED_VERSION=2.0
144GOBJECT_REQUIRED_VERSION=2.0 202GOBJECT_REQUIRED_VERSION=2.0
145GTHREAD_REQUIRED_VERSION=2.0 203GTHREAD_REQUIRED_VERSION=2.0
146PANGO_REQUIRED_VERSION=1.0 204PANGO_REQUIRED_VERSION=1.0
147CAIRO_REQUIRED_VERSION=1.2 205GTK_REQUIRED_VERSION=2.8
148FONTCONFIG_REQUIRED_VERSION=2.4
149FREETYPE2_REQUIRED_VERSION=9.0
150LIBCURL_REQUIRED_VERSION=7.15
151LIBXML_REQUIRED_VERSION=2.6
152 206
153# optional modules 207# optional modules
154GTK_REQUIRED_VERSION=2.0 208LIBCURL_REQUIRED_VERSION=7.15
155LIBXSLT_REQUIRED_VERSION=1.1.7 209LIBXSLT_REQUIRED_VERSION=1.1.7
156SQLITE_REQUIRED_VERSION=3.0 210SQLITE_REQUIRED_VERSION=3.0
157GSTREAMER_REQUIRED_VERSION=0.10 211GSTREAMER_REQUIRED_VERSION=0.10
158GNOME_VFS_REQUIRED_VERSION=2.0 212GNOME_VFS_REQUIRED_VERSION=2.0
159 213
160PKG_CHECK_MODULES([DEPENDENCIES], 214PKG_CHECK_MODULES([GLOBALDEPS],
161 [glib-2.0 >= $GLIB_REQUIRED_VERSION 215 [glib-2.0 >= $GLIB_REQUIRED_VERSION
162 gobject-2.0 >= $GOBJECT_REQUIRED_VERSION 216 gobject-2.0 >= $GOBJECT_REQUIRED_VERSION
163 gthread-2.0 >= $GTHREAD_REQUIRED_VERSION 217 gthread-2.0 >= $GTHREAD_REQUIRED_VERSION])
164 gtk+-2.0 >= $GTK_REQUIRED_VERSION 218AC_SUBST([GLOBALDEPS_CFLAGS])
219AC_SUBST([GLOBALDEPS_LIBS])
220
221PKG_CHECK_MODULES([WEBKITDEPS],
222 [gtk+-2.0 >= $GTK_REQUIRED_VERSION
165 pango >= $PANGO_REQUIRED_VERSION 223 pango >= $PANGO_REQUIRED_VERSION
166 libcurl >= $LIBCURL_REQUIRED_VERSION
167 cairo >= $CAIRO_REQUIRED_VERSION 224 cairo >= $CAIRO_REQUIRED_VERSION
168 cairo-ft, 225 cairo-ft,
169 fontconfig >= $FONTCONFIG_REQUIRED_VERSION 226 fontconfig >= $FONTCONFIG_REQUIRED_VERSION
170 freetype2 >= $FREETYPE2_REQUIRED_VERSION 227 freetype2 >= $FREETYPE2_REQUIRED_VERSION
171 libxml-2.0 >= $LIBXML_REQUIRED_VERSION]) 228 libxml-2.0 >= $LIBXML_REQUIRED_VERSION])
172AC_SUBST([DEPENDENCIES_CFLAGS]) 229AC_SUBST([WEBKITDEPS_CFLAGS])
173AC_SUBST([DEPENDENCIES_LIBS]) 230AC_SUBST([WEBKITDEPS_LIBS])
174 231
175# check whether to build with debugging enabled 232# check whether to build with debugging enabled
176AC_MSG_CHECKING([whether to do a debug build]) 233AC_MSG_CHECKING([whether to do a debug build])
177AC_ARG_ENABLE(debug, 234AC_ARG_ENABLE(debug,
178 AC_HELP_STRING([--enable-debug], 235 AC_HELP_STRING([--enable-debug],
179 [turn on debugging [default=no]]), 236 [turn on debugging [default=no]]),
180 [enable_debug="yes"],[enable_debug="no"]) 237 [],[enable_debug="no"])
181AC_MSG_RESULT([$enable_debug]) 238AC_MSG_RESULT([$enable_debug])
182 239
240# check whether to build with cross-document messaging support
241AC_MSG_CHECKING([whether to enable HTML5 cross-document messaging support])
242AC_ARG_ENABLE(cross_document_messaging,
243 AC_HELP_STRING([--enable-cross-document-messaging],
244 [enable HTML5 cross-document messaging support [default=yes]]),
245 [],[enable_cross_document_messaging="yes"])
246AC_MSG_RESULT([$enable_cross_document_messaging])
247
183# check whether to build with database support 248# check whether to build with database support
184AC_MSG_CHECKING([whether to enable HTML5 client-side storage support]) 249AC_MSG_CHECKING([whether to enable HTML5 client-side storage support])
185AC_ARG_ENABLE(database, 250AC_ARG_ENABLE(database,
186 AC_HELP_STRING([--enable-database], 251 AC_HELP_STRING([--enable-database],
187 [enable HTML5 client-side storage support [default=no]]), 252 [enable HTML5 client-side storage support [default=yes]]),
188 [],[enable_database="yes"]) 253 [],[enable_database="yes"])
189AC_MSG_RESULT([$enable_database]) 254AC_MSG_RESULT([$enable_database])
190 255
@@ -201,14 +266,14 @@ AC_MSG_CHECKING([whether to enable HTML5 video support])
201AC_ARG_ENABLE(video, 266AC_ARG_ENABLE(video,
202 AC_HELP_STRING([--enable-video], 267 AC_HELP_STRING([--enable-video],
203 [enable HTML5 video support [default=no]]), 268 [enable HTML5 video support [default=no]]),
204 [enable_video="yes"],[enable_video="no"]) 269 [],[enable_video="no"])
205AC_MSG_RESULT([$enable_video]) 270AC_MSG_RESULT([$enable_video])
206 271
207# check whether to enable XPath support 272# check whether to enable XPath support
208AC_MSG_CHECKING([whether to enable XPath support]) 273AC_MSG_CHECKING([whether to enable XPath support])
209AC_ARG_ENABLE(xpath, 274AC_ARG_ENABLE(xpath,
210 AC_HELP_STRING([--enable-xpath], 275 AC_HELP_STRING([--enable-xpath],
211 [enable support for XPath [default=no]]), 276 [enable support for XPath [default=yes]]),
212 [],[enable_xpath="yes"]) 277 [],[enable_xpath="yes"])
213AC_MSG_RESULT([$enable_xpath]) 278AC_MSG_RESULT([$enable_xpath])
214 279
@@ -216,10 +281,29 @@ AC_MSG_RESULT([$enable_xpath])
216AC_MSG_CHECKING([whether to enable XSLT support]) 281AC_MSG_CHECKING([whether to enable XSLT support])
217AC_ARG_ENABLE(xslt, 282AC_ARG_ENABLE(xslt,
218 AC_HELP_STRING([--enable-xslt], 283 AC_HELP_STRING([--enable-xslt],
219 [enable support for XSLT [default=no]]), 284 [enable support for XSLT [default=yes]]),
220 [],[enable_xslt="yes"]) 285 [],[enable_xslt="yes"])
221AC_MSG_RESULT([$enable_xslt]) 286AC_MSG_RESULT([$enable_xslt])
222 287
288# check whether to enable SVG experimental features
289# Enable all SVG if it is
290AC_MSG_CHECKING([whether to enable SVG experimental features])
291AC_ARG_ENABLE(svg_experimental,
292 AC_HELP_STRING([--enable-svg-experimental],
293 [enable support for SVG experimental features [default=no]]),
294 [],[enable_svg_experimental="no"])
295AC_MSG_RESULT([$enable_svg_experimental])
296
297if test "$enable_svg_experimental" = "yes"; then
298 enable_svg=yes
299 enable_svg_animation=yes
300# enable_svg_filters=yes
301 enable_svg_fonts=yes
302 enable_svg_foreign_object=yes
303 enable_svg_as_image=yes
304 enable_svg_use_element=yes
305fi
306
223# check whether to enable SVG support 307# check whether to enable SVG support
224AC_MSG_CHECKING([whether to enable SVG support]) 308AC_MSG_CHECKING([whether to enable SVG support])
225AC_ARG_ENABLE(svg, 309AC_ARG_ENABLE(svg,
@@ -229,10 +313,10 @@ AC_ARG_ENABLE(svg,
229AC_MSG_RESULT([$enable_svg]) 313AC_MSG_RESULT([$enable_svg])
230 314
231# check whether to enable support for SVG animation 315# check whether to enable support for SVG animation
232AC_MSG_CHECKING([whether to enable support for SVG animataion]) 316AC_MSG_CHECKING([whether to enable support for SVG animation])
233AC_ARG_ENABLE(svg_animation, 317AC_ARG_ENABLE(svg_animation,
234 AC_HELP_STRING([--enable-svg-animation], 318 AC_HELP_STRING([--enable-svg-animation],
235 [enable support for SVG animation feature (experimental) [default=no]]), 319 [enable support for SVG animation (experimental) [default=no]]),
236 [],[enable_svg_animation="no"]) 320 [],[enable_svg_animation="no"])
237AC_MSG_RESULT([$enable_svg_animation]) 321AC_MSG_RESULT([$enable_svg_animation])
238 322
@@ -252,6 +336,14 @@ AC_ARG_ENABLE(svg_fonts,
252 [],[enable_svg_fonts="no"]) 336 [],[enable_svg_fonts="no"])
253AC_MSG_RESULT([$enable_svg_fonts]) 337AC_MSG_RESULT([$enable_svg_fonts])
254 338
339# check whether to enable foreign objects support for SVG
340AC_MSG_CHECKING([whether to enable support for SVG foreign objects])
341AC_ARG_ENABLE(svg_foreign_object,
342 AC_HELP_STRING([--enable-svg-foreign-object],
343 [enable support for SVG foreign objects (experimental) [default=no]]),
344 [],[enable_svg_foreign_object="no"])
345AC_MSG_RESULT([$enable_svg_foreign_object])
346
255# check whether to enable SVG As Image support 347# check whether to enable SVG As Image support
256AC_MSG_CHECKING([whether to enable SVG as Image support]) 348AC_MSG_CHECKING([whether to enable SVG as Image support])
257AC_ARG_ENABLE(svg_as_image, 349AC_ARG_ENABLE(svg_as_image,
@@ -276,19 +368,35 @@ AC_ARG_ENABLE(coverage,
276 [],[enable_coverage="no"]) 368 [],[enable_coverage="no"])
277AC_MSG_RESULT([$enable_coverage]) 369AC_MSG_RESULT([$enable_coverage])
278 370
371# check whether to enable FastMalloc
372AC_MSG_CHECKING([whether to enable optimized memory allocator])
373AC_ARG_ENABLE(fast_malloc,
374 AC_HELP_STRING([--enable-fast-malloc],
375 [enable optimized memory allocator default=yes, default=no for debug builds]),
376 [],[if test "$enable_debug" = "yes"; then enable_fast_malloc="no"; else enable_fast_malloc="yes"; fi])
377AC_MSG_RESULT([$enable_fast_malloc])
378
279# Add '-g' flag to gcc if it's debug build 379# Add '-g' flag to gcc if it's debug build
280if test "$enable_debug" = "yes"; then 380if test "$enable_debug" = "yes"; then
281 CXXFLAGS="$CXXFLAGS -g" 381 CXXFLAGS="$CXXFLAGS -g"
282 CFLAGS="$CFLAGS -g" 382 CFLAGS="$CFLAGS -g"
283fi 383fi
284 384
385# check if curl is available
386if test "$http_backend" = "curl"; then
387 PKG_CHECK_MODULES([LIBCURL],
388 [libcurl >= $LIBCURL_REQUIRED_VERSION])
389 AC_SUBST([LIBCURL_CFLAGS])
390 AC_SUBST([LIBCURL_LIBS])
391fi
392
285# check if sqlite 3 is available 393# check if sqlite 3 is available
286if test "$enable_icon_database" = "yes" || test "$enable_database" = "yes"; then 394if test "$enable_icon_database" = "yes" || test "$enable_database" = "yes"; then
287 PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $SQLITE_REQUIRED_VERSION]) 395 PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $SQLITE_REQUIRED_VERSION])
288 AC_SUBST([SQLITE3_CFLAGS]) 396 AC_SUBST([SQLITE3_CFLAGS])
289 AC_SUBST([SQLITE3_LIBS]) 397 AC_SUBST([SQLITE3_LIBS])
290fi 398fi
291 399
292# check if libxslt is available 400# check if libxslt is available
293if test "$enable_xslt" = "yes"; then 401if test "$enable_xslt" = "yes"; then
294 PKG_CHECK_MODULES([LIBXSLT],[libxslt >= $LIBXSLT_REQUIRED_VERSION]) 402 PKG_CHECK_MODULES([LIBXSLT],[libxslt >= $LIBXSLT_REQUIRED_VERSION])
@@ -316,16 +424,17 @@ if test "$enable_coverage" = "yes"; then
316fi 424fi
317 425
318# check for SVG features, enabling SVG if necessary 426# check for SVG features, enabling SVG if necessary
319if test "$enable_svg" = "no" && (\ 427if test "$enable_svg_animation" = "yes" || \
320 test "$enable_svg_animation" = "yes" || \
321 test "$enable_svg_filters" = "yes" || \ 428 test "$enable_svg_filters" = "yes" || \
322 test "$enable_svg_fonts" = "yes" || \ 429 test "$enable_svg_fonts" = "yes" || \
430 test "$enable_svg_foreign_object" = "yes" || \
323 test "$enable_svg_as_image" = "yes" || \ 431 test "$enable_svg_as_image" = "yes" || \
324 test "$enable_svg_use_element" = "yes"); then 432 test "$enable_svg_use_element" = "yes"; then
325 433 svg_flags=yes
326 AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support]) 434 if test "$enable_svg" = "no"; then
327 enable_svg = yes 435 AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support])
328 svg_flags = yes 436 enable_svg=yes
437 fi
329fi 438fi
330 439
331# OS conditionals 440# OS conditionals
@@ -335,13 +444,17 @@ AM_CONDITIONAL([OS_LINUX],[test "$os_linux" = "yes"])
335AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"]) 444AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"])
336 445
337# target conditionals 446# target conditionals
338AM_CONDITIONAL([TARGET_X11], [test "$with_webkit_target" = "x11"]) 447AM_CONDITIONAL([TARGET_X11], [test "$with_target" = "x11"])
339AM_CONDITIONAL([TARGET_WIN32], [test "$with_webkit_target" = "win32"]) 448AM_CONDITIONAL([TARGET_WIN32], [test "$with_target" = "win32"])
340AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_webkit_target" = "quartz"]) 449AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"])
341AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_webkit_target" = "directfb"]) 450AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"])
451
452# HTTP backend conditionals
453AM_CONDITIONAL([USE_CURL], [test "$http_backend" = "curl"])
342 454
343# WebKit feature conditionals 455# WebKit feature conditionals
344AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"]) 456AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"])
457AM_CONDITIONAL([ENABLE_CROSS_DOCUMENT_MESSAGING],[test "$enable_cross_document_messaging" = "yes"])
345AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"]) 458AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
346AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"]) 459AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"])
347AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"]) 460AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"])
@@ -351,14 +464,16 @@ AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"])
351AM_CONDITIONAL([ENABLE_SVG_ANIMATION],[test "$enable_svg_animation" = "yes"]) 464AM_CONDITIONAL([ENABLE_SVG_ANIMATION],[test "$enable_svg_animation" = "yes"])
352AM_CONDITIONAL([ENABLE_SVG_FILTERS],[test "$enable_svg_filters" = "yes"]) 465AM_CONDITIONAL([ENABLE_SVG_FILTERS],[test "$enable_svg_filters" = "yes"])
353AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"]) 466AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"])
467AM_CONDITIONAL([ENABLE_SVG_FOREIGN_OBJECT],[test "$enable_svg_foreign_object" = "yes"])
354AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"]) 468AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"])
355AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use_element" = "yes"]) 469AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use_element" = "yes"])
356AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"]) 470AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"])
471AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"])
357AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"]) 472AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
358 473
359AC_CONFIG_FILES([ 474AC_CONFIG_FILES([
360GNUmakefile 475GNUmakefile
361WebKit/gtk/WebKitGtk.pc:WebKit/gtk/WebKitGtk.pc.in 476WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in
362] 477]
363) 478)
364 479
@@ -367,9 +482,13 @@ AC_OUTPUT
367echo " 482echo "
368WebKit was configured with the following options: 483WebKit was configured with the following options:
369 484
370 Target : $with_webkit_target 485Build configuration:
371 Enable debug : $enable_debug 486 Enable debugging (slow) : $enable_debug
372 Code coverage support : $enable_coverage 487 Code coverage support : $enable_coverage
488 HTTP backend : $http_backend
489 Optimized memory allocator : $enable_fast_malloc
490Features:
491 HTML5 cross-document messaging : $enable_cross_document_messaging
373 HTML5 client-side storage support : $enable_database 492 HTML5 client-side storage support : $enable_database
374 HTML5 video element support : $enable_video 493 HTML5 video element support : $enable_video
375 Icon database support : $enable_icon_database 494 Icon database support : $enable_icon_database
@@ -377,8 +496,12 @@ WebKit was configured with the following options:
377 SVG animation support : $enable_svg_animation 496 SVG animation support : $enable_svg_animation
378 SVG filters support : $enable_svg_filters 497 SVG filters support : $enable_svg_filters
379 SVG fonts support : $enable_svg_fonts 498 SVG fonts support : $enable_svg_fonts
499 SVG foreign object support : $enable_svg_foreign_object
380 SVG as image support : $enable_svg_as_image 500 SVG as image support : $enable_svg_as_image
381 SVG use element support : $enable_svg_use_element 501 SVG use element support : $enable_svg_use_element
382 XPATH support : $enable_xpath 502 XPATH support : $enable_xpath
383 XSLT support : $enable_xslt 503 XSLT support : $enable_xslt
504GTK+ configuration:
505 GDK target : $with_target
506 Hildon UI extensions : $with_hildon
384" 507"
diff --git a/meta/packages/webkit/webkit-gtk_svn.bb b/meta/packages/webkit/webkit-gtk_svn.bb
index 517d7e8062..4fe9cb8a00 100644
--- a/meta/packages/webkit/webkit-gtk_svn.bb
+++ b/meta/packages/webkit/webkit-gtk_svn.bb
@@ -1,33 +1,59 @@
1DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+" 1DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs flex-native gperf-native perl-native sqlite3"
2 2
3# If you activate HTML5 media support (ENABLE_VIDEO=1) you'll need: 3SRCREV_FORMAT = "webcore-rwebkit"
4# DEPENDS += " gstreamer gst-plugins-base gnome-vfs " 4
5 5# Yes, this is wrong...
6 6PV = "0.1+svnr${SRCREV}"
7WEBKIT_PORT = "gtk-port" 7PR = "r4"
8WEBKIT_EXTRA_OPTIONS = "CONFIG-=qt" 8
9 9SRC_URI = "\
10FILES_webkit-gtklauncher = "${bindir}/GtkLauncher" 10 svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
11FILES_webkit-gtklauncher-dbg += "${bindir}/.debug/GtkLauncher" 11 svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \
12 12 svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http;name=webcore \
13require webkit.inc 13 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \
14 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \
15 svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \
16 file://Makefile \
17 file://Makefile.shared \
18 file://autogen.sh \
19 file://configure.ac \
20 file://GNUmakefile.am \
21 "
22
23S = "${WORKDIR}/"
24
25inherit autotools pkgconfig
26
27EXTRA_OECONF = "\
28 --enable-debug=no \
29 --enable-svg \
30 --enable-icon-database=yes \
31 "
32
33do_compile_prepend() {
34 mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
35 mkdir -p ${S}/Programs/
36 cd ${S}/JavaScriptCore/pcre
37 if test -e dftables.c
38 then
39 ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
40 elif test -e dftables.cpp
41 then
42 ${BUILD_CXX} dftables.cpp -o dftables -I. -I../wtf
43 fi
44 cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
45 cp dftables ${S}/Programs/
46 cd ${S}
47}
14 48
15SRC_URI += "file://autogen.sh \ 49do_stage() {
16 file://configure.ac \ 50 autotools_stage_all
17 file://GNUmakefile.am \ 51}
18 file://fix_im.patch;patch=1 \
19 "
20 52
21PR = "r5" 53PACKAGES =+ "${PN}launcher-dbg ${PN}launcher libjavascriptcore"
54FILES_${PN}launcher = "${bindir}/GtkLauncher"
55FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher"
56FILES_libjavascriptcore = "${libdir}/libJavaScriptCore.so.*"
22 57
23do_install() {
24 install -d ${D}${bindir}
25 install -d ${D}${libdir}
26 install -d ${D}${libdir}/pkgconfig
27 58
28 install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GtkLauncher/GtkLauncher ${D}${bindir}
29 cd ${S}/WebKitBuilds/Debug
30 PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir} $PWD/../../WebKit.pro
31 oe_runmake install
32}
33 59
diff --git a/meta/packages/webkit/webkit.inc b/meta/packages/webkit/webkit.inc
index e7820409a2..087115de09 100644
--- a/meta/packages/webkit/webkit.inc
+++ b/meta/packages/webkit/webkit.inc
@@ -1,3 +1,4 @@
1DESCRIPTION = "WebKit browser engine, GTK+ edition"
1DEPENDS += "flex-native gperf-native perl-native sqlite3" 2DEPENDS += "flex-native gperf-native perl-native sqlite3"
2SRCREV_FORMAT = "webcore-rwebkit" 3SRCREV_FORMAT = "webcore-rwebkit"
3 4
@@ -6,7 +7,7 @@ PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"
6# Yes, this is wrong... 7# Yes, this is wrong...
7PV = "0.1+svnr${SRCREV}" 8PV = "0.1+svnr${SRCREV}"
8 9
9inherit qmake2 10inherit qmake2 pkgconfig
10 11
11SRC_URI = "\ 12SRC_URI = "\
12 svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ 13 svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
@@ -51,7 +52,5 @@ do_stage() {
51 cd ${S}/WebKitBuilds/Debug 52 cd ${S}/WebKitBuilds/Debug
52 PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR} $PWD/../../WebKit.pro 53 PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR} $PWD/../../WebKit.pro
53 oe_runmake install 54 oe_runmake install
54
55#sed -i -e "s:${WORKDIR}/image/::g" ${PKG_CONFIG_DIR}/WebKitGtk.pc
56} 55}
57 56