Major update to webkit 2.0.0.

- add ruby to BDEPS. Webkit build system now uses autohell, python, ruby and perl \o/ - set MODRUBY_REV = 1.8 on sparc64 since 1.9 is broken there - disable WebKit2 support, it needs shm_open()/shm_unlink() - switch from gstreamer-0.10 to gstreamer1 - force-disable JIT/ASSEMBLER on non-jit archs, builds fails otherwise (bug #113638) - only build NumberPrototype.cpp with -O0 on sparc64, not the damn whole thing - use -Wl,--relax on ppc otherwise linking fails - move some patches around since JavaScriptCore/wtf moved to WTF/wtf - dont uselessly rerun make within make during install, gmake blows - blindly backport upstream r144077 to fix mips64 build - backport bits of #103128 & r145551 to fix powerpc build - backport r147967 & more to fix bashisms in configure - bug #109932 forced the use of gcc >= 4.7 or clang >= 3.0, but this is only for WebKit2 so loosen the check atm Tested working fine on amd64 & i386, went in bulk builds, known broken at runtime on ppc (being worked on. or not.) should build on mips64el (and maybe even run!) and sparc64 (wont run! ever! nothing new here..), but 'someone' will care about the poor exotic archs and fix'em, right ? After too much prodding from the gnome maintainers who desperately need it
2013-04-13 09:11:02 +00:00 · 2013-04-13 09:11:02 +00:00 · 4631994f18
commit 4631994f18
parent 02429ff356
27 changed files with 1154 additions and 417 deletions
--- a/www/webkit/Makefile
+++ b/www/webkit/Makefile
@ -1,16 +1,16 @@
-# $OpenBSD: Makefile,v 1.80 2013/03/30 15:02:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.81 2013/04/13 09:11:02 landry Exp $

 ONLY_FOR_ARCHS=	${GCC4_ARCHS}

 COMMENT =	open source web browser engine for Gtk+

-V =		1.8.3
-DISTNAME =	webkit-${V}
+V =		2.0.0
+DISTNAME =	webkitgtk-${V}
+PKGNAME =	webkit-${V}
 EPOCH =		0
 CATEGORIES =	www
 DPB_PROPERTIES =parallel
 EXTRACT_SUFX=	.tar.xz
-REVISION=	5

 HOMEPAGE =	http://webkitgtk.org/
 MASTER_SITES =	${HOMEPAGE}/releases/
@ -27,15 +27,18 @@ USE_GMAKE =	Yes
 MODULES =	devel/gettext \
 		textproc/intltool  \
 		lang/python \
+		lang/ruby \
 		devel/dconf

 MODPY_RUNDEP =	No
+MODRUBY_RUNDEP =	No

 CONFIGURE_STYLE =	gnu

 CONFIGURE_ENV =	CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lX11" \
-		ac_cv_path_FLEX=${LOCALBASE}/bin/gflex
+		ac_cv_path_FLEX=${LOCALBASE}/bin/gflex \
+		ac_cv_path_RUBY=${RUBY}

 # If one of these tools is found at configure stage, it might be used,
 # no matter whether we use --disable-gtk-doc or not.
@ -50,42 +53,55 @@ CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
 		--enable-introspection \
 		--enable-spellcheck

+# XXX: uncomment if you want to debug the javascript engine
+# this will only build the needed libs and the shell
+# ALL_TARGET=jsc
+
+.if ${MACHINE_ARCH} == "powerpc"
+# Turns on -O0 globally, makes jsc work ?
+CONFIGURE_ARGS +=	--enable-optimizations=no
+# XXX huge hack LDFLAGS is already added a bit before
+CONFIGURE_ENV +=	COVERAGE_LDFLAGS="-Wl,--relax"
+.endif
+
+# force-disable JIT/ASSEMBLER on non-jit archs otherwise build fails
+.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "i386"
+MAKE_FLAGS +=	JSC_CPPFLAGS="-DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0"
+.endif
+
 MAKE_FILE =	GNUmakefile

-# Fix incorrect GCC output which was caused by over optimization
-# when compiling Source/JavaScriptCore/runtime/NumberPrototype.cpp
-# as it was emitting a fdtox %r8, %r7 call, whose second operand isn't even and thus invalid.
 .if ${MACHINE_ARCH:Msparc64}
-MAKE_FLAGS=	EXTRA_FLAGS="-O0"
+# until 1.9 is reliable on sparc64...
+MODRUBY_REV =	1.8
 .endif

 WANTLIB =	ICE SM X11 Xcomposite Xcursor Xdamage Xext \
 		Xfixes Xi Xinerama Xrandr Xrender Xt atk-1.0 c xcb-render \
 		expat fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0 \
-		gobject-2.0 gthread-2.0 jpeg m gstinterfaces-0.10 \
+		gobject-2.0 gthread-2.0 jpeg m \
 		Xxf86vm dbus-1 dbus-glib-1 drm geoclue \
-		gstaudio-0.10 gstfft-0.10 gdk_pixbuf-2.0 orc-0.4 \
-		gstreamer-0.10 gstbase-0.10 gstvideo-0.10 gstapp-0.10 gstpbutils-0.10 \
+		gstaudio-1.0 gstfft-1.0 gdk_pixbuf-2.0 orc-0.4 \
+		gstreamer-1.0 gstbase-1.0 gstvideo-1.0 gstapp-1.0 gstpbutils-1.0 \
 		icudata icui18n icuuc sqlite3 xslt enchant soup-2.4 \
 		pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pthread GL xcb-shm \
 		z cairo pixman-1 png pthread-stubs xcb xml2 stdc++ ffi \
-		harfbuzz icule graphite2
+		harfbuzz icule graphite2 gcrypt gpg-error gsttag-1.0 secret-1 webp

-LIB_DEPENDS =	multimedia/gstreamer-0.10/core \
-		multimedia/gstreamer-0.10/plugins-base \
+LIB_DEPENDS =	multimedia/gstreamer1/core \
+		multimedia/gstreamer1/plugins-base \
 		textproc/icu4c>=4.4 \
 		textproc/libxslt \
 		textproc/enchant \
 		geo/geoclue \
-		devel/glib2>=2.31.2 \
-		devel/libsoup>=2.37.92
+		graphics/libwebp \
+		devel/glib2>=2.36.0 \
+		devel/libsoup>=2.42.0

 BUILD_DEPENDS =	devel/bison \
 		devel/flex \
 		devel/gperf \
 		devel/gobject-introspection
-# required for parallel building
-BUILD_DEPENDS+=	gmake->=3.82p2:devel/gmake

 FLAVORS = gtk3
 FLAVOR ?=
@ -93,24 +109,29 @@ FLAVOR ?=
 SUBST_VARS =	WEBKIT_API_VERSION GTK_API_VERSION

 .if ${FLAVOR:Mgtk3}
+# needs shm_open()/shm_unlink()
+CONFIGURE_ARGS+=	--disable-webkit2
+
 FULLPKGNAME =	webkit-gtk3-${V}
 LIB_DEPENDS +=	x11/gtk+3,-main
 WANTLIB +=	cairo-gobject gailutil-3 gdk-3 gtk-3
-WANTLIB +=	atk-bridge-2.0 atspi harfbuzz icule
+WANTLIB +=	atk-bridge-2.0 atspi
 WEBKIT_API_VERSION =	3.0
 GTK_API_VERSION =	3.0
 .else
+# only works with gtk+3
+CONFIGURE_ARGS+=	--disable-webkit2
 WANTLIB +=	gailutil gdk-x11-2.0 gtk-x11-2.0
 LIB_DEPENDS +=	x11/gtk+2,-main
 WEBKIT_API_VERSION =	1.0
 GTK_API_VERSION =	2.0
 .endif
 CONFIGURE_ARGS += --with-gtk=${GTK_API_VERSION}
-SHARED_LIBS += javascriptcoregtk-${WEBKIT_API_VERSION}	2.0 #.13.2
-SHARED_LIBS += webkitgtk-${WEBKIT_API_VERSION}		4.0 #.13.2
+SHARED_LIBS += javascriptcoregtk-${WEBKIT_API_VERSION}	3.0 #.13.9
+SHARED_LIBS += webkitgtk-${WEBKIT_API_VERSION}		5.0 #.13.9

 pre-configure:
-	${SUBST_CMD} ${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp
+	${SUBST_CMD} ${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp ${WRKSRC}/configure

 .if ${FLAVOR:Mgtk3}
 post-install:
--- a/www/webkit/distinfo
+++ b/www/webkit/distinfo
@ -1,2 +1,2 @@
-SHA256 (webkit-1.8.3.tar.xz) = raAtY2r2Gu048ULTze1mLRQc5xJk9iTE64c2IadMyec=
-SIZE (webkit-1.8.3.tar.xz) = 7814028
+SHA256 (webkitgtk-2.0.0.tar.xz) = RUzcS+/8IBD4NmEFkXjjO22aB7zWDQnqvfXXzaF7iOQ=
+SIZE (webkitgtk-2.0.0.tar.xz) = 9821336
--- a/www/webkit/patches/patch-GNUmakefile_in
+++ b/www/webkit/patches/patch-GNUmakefile_in
@ -1,14 +1,24 @@
-$OpenBSD: patch-GNUmakefile_in,v 1.19 2012/08/22 07:48:37 landry Exp $
+$OpenBSD: patch-GNUmakefile_in,v 1.20 2013/04/13 09:11:02 landry Exp $

- install GtkLauncher, remove silent build lines
- install gtk-doc in a versionned dir to avoid conflicts
- dont rebase doc, python process fails
- append extra cflags for sparc64 which otherwise result in overoptimization
+- chunk 2,3,4 : install GtkLauncher, remove silent build lines
+- chunk 1,5,6,7,8,9 : add Atomics.cpp to the build (fixes mips64 ? #106739)
+- chunk 12 : install gtk-doc in a versionned dir to avoid conflicts
+- chunk 13 : dont rebase doc, python process fails
+- chunk 11 : dont rerun make within make during install, gmake blows
+- chunk 10 : append extra -O0 cflags for sparc64 which otherwise result in overoptimization
  by emitting a fdtox %r8, %r7 call, whose second operand isn't even and thus invalid.
 (on Source/JavaScriptCore/runtime/NumberPrototype.cpp)
--- GNUmakefile.in.orig	Mon Aug 20 22:37:15 2012
-+++ GNUmakefile.in	Tue Aug 21 09:40:46 2012
-@@ -11414,7 +11414,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
+--- GNUmakefile.in.orig	Tue Mar 26 20:46:27 2013
+++ GNUmakefile.in	Sat Apr 13 10:01:58 2013
+@@ -1010,6 +1010,7 @@ libWTF_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__D
+ am__objects_2 = Source/WTF/wtf/libWTF_la-ArrayBuffer.lo \
+ 	Source/WTF/wtf/libWTF_la-ArrayBufferView.lo \
+ 	Source/WTF/wtf/libWTF_la-Assertions.lo \
+	Source/WTF/wtf/libWTF_la-Atomics.lo \
+ 	Source/WTF/wtf/libWTF_la-BitVector.lo \
+ 	Source/WTF/wtf/libWTF_la-CryptographicallyRandomNumber.lo \
+ 	Source/WTF/wtf/libWTF_la-CurrentTime.lo \
+@@ -10755,7 +10756,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
@ -17,7 +27,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.19 2012/08/22 07:48:37 landry Exp $
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
-@@ -11424,22 +11424,22 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
+@@ -10765,22 +10766,22 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
@ -41,10 +51,10 @@ $OpenBSD: patch-GNUmakefile_in,v 1.19 2012/08/22 07:48:37 landry Exp $
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 -am__v_GEN_0 = @echo "  GEN   " $@;
 +am__v_GEN_0 =
- SOURCES = $(Libraries_libTestRunnerInjectedBundle_la_SOURCES) \
+ SOURCES = $(Libraries_WebExtensions_libWebExtensionTest_la_SOURCES) \
+ 	$(Libraries_libTestRunnerInjectedBundle_la_SOURCES) \
 	$(nodist_Libraries_libTestRunnerInjectedBundle_la_SOURCES) \
- 	$(Libraries_libWebKit2APITestCore_la_SOURCES) \
-@@ -11838,7 +11838,7 @@ pkgconfigdir := $(libdir)/pkgconfig
+@@ -11245,7 +11246,7 @@ pkgconfigdir := $(libdir)/pkgconfig
 libwebkitgtkincludedir := $(prefix)/include/webkitgtk-@WEBKITGTK_API_VERSION@
 
 # Libraries and support components
@ -53,25 +63,91 @@ $OpenBSD: patch-GNUmakefile_in,v 1.19 2012/08/22 07:48:37 landry Exp $
 noinst_HEADERS := 
 
 # We have a different library with only the files that require GTK+. It allows us
-@@ -62651,7 +62653,7 @@ Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WE
+@@ -11830,6 +11831,7 @@ wtf_sources := Source/WTF/config.h Source/WTF/wtf/Plat
+ 	Source/WTF/wtf/ArrayBufferView.cpp \
+ 	Source/WTF/wtf/ArrayBufferView.h Source/WTF/wtf/Assertions.cpp \
+ 	Source/WTF/wtf/Assertions.h Source/WTF/wtf/Atomics.h \
+	Source/WTF/wtf/Atomics.cpp \
+ 	Source/WTF/wtf/BitArray.h Source/WTF/wtf/BitVector.cpp \
+ 	Source/WTF/wtf/BitVector.h Source/WTF/wtf/Bitmap.h \
+ 	Source/WTF/wtf/BlockStack.h Source/WTF/wtf/BloomFilter.h \
+@@ -23525,6 +23527,9 @@ Source/WTF/wtf/libWTF_la-ArrayBufferView.lo:  \
+ Source/WTF/wtf/libWTF_la-Assertions.lo:  \
+ 	Source/WTF/wtf/$(am__dirstamp) \
+ 	Source/WTF/wtf/$(DEPDIR)/$(am__dirstamp)
+Source/WTF/wtf/libWTF_la-Atomics.lo:  \
+	Source/WTF/wtf/$(am__dirstamp) \
+	Source/WTF/wtf/$(DEPDIR)/$(am__dirstamp)
+ Source/WTF/wtf/libWTF_la-BitVector.lo: Source/WTF/wtf/$(am__dirstamp) \
+ 	Source/WTF/wtf/$(DEPDIR)/$(am__dirstamp)
+ Source/WTF/wtf/libWTF_la-CryptographicallyRandomNumber.lo:  \
+@@ -40117,6 +40122,8 @@ mostlyclean-compile:
+ 	-rm -f Source/WTF/wtf/libWTF_la-ArrayBufferView.lo
+ 	-rm -f Source/WTF/wtf/libWTF_la-Assertions.$(OBJEXT)
+ 	-rm -f Source/WTF/wtf/libWTF_la-Assertions.lo
+	-rm -f Source/WTF/wtf/libWTF_la-Atomics.$(OBJEXT)
+	-rm -f Source/WTF/wtf/libWTF_la-Atomics.lo
+ 	-rm -f Source/WTF/wtf/libWTF_la-BitVector.$(OBJEXT)
+ 	-rm -f Source/WTF/wtf/libWTF_la-BitVector.lo
+ 	-rm -f Source/WTF/wtf/libWTF_la-CryptographicallyRandomNumber.$(OBJEXT)
+@@ -47240,6 +47247,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@Source/WTF/wtf/$(DEPDIR)/libWTF_la-ArrayBuffer.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@Source/WTF/wtf/$(DEPDIR)/libWTF_la-ArrayBufferView.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@Source/WTF/wtf/$(DEPDIR)/libWTF_la-Assertions.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Source/WTF/wtf/$(DEPDIR)/libWTF_la-Atomics.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@Source/WTF/wtf/$(DEPDIR)/libWTF_la-BitVector.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@Source/WTF/wtf/$(DEPDIR)/libWTF_la-CryptographicallyRandomNumber.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@Source/WTF/wtf/$(DEPDIR)/libWTF_la-CurrentTime.Plo@am__quote@
+@@ -51929,6 +51937,13 @@ Source/WTF/wtf/libWTF_la-Assertions.lo: Source/WTF/wtf
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWTF_la_CPPFLAGS) $(CPPFLAGS) $(libWTF_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/WTF/wtf/libWTF_la-Assertions.lo `test -f 'Source/WTF/wtf/Assertions.cpp' || echo '$(srcdir)/'`Source/WTF/wtf/Assertions.cpp
+ 
+Source/WTF/wtf/libWTF_la-Atomics.lo: Source/WTF/wtf/Atomics.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWTF_la_CPPFLAGS) $(CPPFLAGS) $(libWTF_la_CXXFLAGS) $(CXXFLAGS) -MT Source/WTF/wtf/libWTF_la-Atomics.lo -MD -MP -MF Source/WTF/wtf/$(DEPDIR)/libWTF_la-Atomics.Tpo -c -o Source/WTF/wtf/libWTF_la-Atomics.lo `test -f 'Source/WTF/wtf/Atomics.cpp' || echo '$(srcdir)/'`Source/WTF/wtf/Atomics.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) Source/WTF/wtf/$(DEPDIR)/libWTF_la-Atomics.Tpo Source/WTF/wtf/$(DEPDIR)/libWTF_la-Atomics.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Source/WTF/wtf/Atomics.cpp' object='Source/WTF/wtf/libWTF_la-Atomics.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWTF_la_CPPFLAGS) $(CPPFLAGS) $(libWTF_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/WTF/wtf/libWTF_la-Atomics.lo `test -f 'Source/WTF/wtf/Atomics.cpp' || echo '$(srcdir)/'`Source/WTF/wtf/Atomics.cpp
+
+ Source/WTF/wtf/libWTF_la-BitVector.lo: Source/WTF/wtf/BitVector.cpp
+ @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libWTF_la_CPPFLAGS) $(CPPFLAGS) $(libWTF_la_CXXFLAGS) $(CXXFLAGS) -MT Source/WTF/wtf/libWTF_la-BitVector.lo -MD -MP -MF Source/WTF/wtf/$(DEPDIR)/libWTF_la-BitVector.Tpo -c -o Source/WTF/wtf/libWTF_la-BitVector.lo `test -f 'Source/WTF/wtf/BitVector.cpp' || echo '$(srcdir)/'`Source/WTF/wtf/BitVector.cpp
+ @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) Source/WTF/wtf/$(DEPDIR)/libWTF_la-BitVector.Tpo Source/WTF/wtf/$(DEPDIR)/libWTF_la-BitVector.Plo
+@@ -75198,7 +75213,7 @@ Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WE
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS) $(CPPFLAGS) $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberObject.lo `test -f 'Source/JavaScriptCore/runtime/NumberObject.cpp' || echo '$(srcdir)/'`Source/JavaScriptCore/runtime/NumberObject.cpp
 
 Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo: Source/JavaScriptCore/runtime/NumberPrototype.cpp
 -@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS) $(CPPFLAGS) $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS) $(CXXFLAGS) -MT Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo -MD -MP -MF Source/JavaScriptCore/runtime/$(DEPDIR)/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.Tpo -c -o Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo `test -f 'Source/JavaScriptCore/runtime/NumberPrototype.cpp' || echo '$(srcdir)/'`Source/JavaScriptCore/runtime/NumberPrototype.cpp
-+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS) $(CPPFLAGS) $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS) $(CXXFLAGS) $(EXTRA_FLAGS) -MT Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo -MD -MP -MF Source/JavaScriptCore/runtime/$(DEPDIR)/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.Tpo -c -o Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo `test -f 'Source/JavaScriptCore/runtime/NumberPrototype.cpp' || echo '$(srcdir)/'`Source/JavaScriptCore/runtime/NumberPrototype.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS) $(CPPFLAGS) $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS) $(CXXFLAGS) -O0 -MT Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo -MD -MP -MF Source/JavaScriptCore/runtime/$(DEPDIR)/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.Tpo -c -o Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo `test -f 'Source/JavaScriptCore/runtime/NumberPrototype.cpp' || echo '$(srcdir)/'`Source/JavaScriptCore/runtime/NumberPrototype.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) Source/JavaScriptCore/runtime/$(DEPDIR)/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.Tpo Source/JavaScriptCore/runtime/$(DEPDIR)/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.Plo
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Source/JavaScriptCore/runtime/NumberPrototype.cpp' object='Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@@ -70538,7 +70540,7 @@ install-data-local:
- 	  if test -n "$(DOC_MODULE_VERSION)"; then \
- 	    installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk-$(DOC_MODULE_VERSION)"; \
- 	  else \
-	    installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk"; \
-+	    installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk-$(WEBKITGTK_API_VERSION)"; \
- 	  fi; \
- 	  $(mkinstalldirs) $${installdir} ; \
- 	  for i in $$installfiles; do \
-@@ -70570,7 +70572,7 @@ install-data-local:
+@@ -82970,14 +82985,12 @@ installdirs:
+ 	for dir in "$(DESTDIR)$(injectedbundledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(audiodir)" "$(DESTDIR)$(audiodir)" "$(DESTDIR)$(resourcesdir)" "$(DESTDIR)$(webinspectordir)" "$(DESTDIR)$(webinspectorimagesdir)" "$(DESTDIR)$(webinspectoruglifyjsdir)" "$(DESTDIR)$(webresourcesdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(gir2dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(remoteinspectordir)" "$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(typelibs2dir)" "$(DESTDIR)$(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)" "$(DESTDIR)$(libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)" "$(DESTDIR)$(libwebkit2gtkincludedir)" "$(DESTDIR)$(libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)" "$(DESTDIR)$(libwebkit2gtkincludedir)" "$(DESTDIR)$(libwebkitdomincludedir)" "$(DESTDIR)$(libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+-install: $(BUILT_SOURCES)
+-	$(MAKE) $(AM_MAKEFLAGS) install-am
+install: $(BUILT_SOURCES) install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+ uninstall: uninstall-am
+ 
+-install-am: all-am
+-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install-am: all-am install-exec-am install-data-am
+ 
+ installcheck: installcheck-am
+ install-strip:
+@@ -84250,7 +84263,7 @@ install-data-local:
+ @ENABLE_WEBKIT1_TRUE@	  if test -n "$(DOC_MODULE_VERSION)"; then \
+ @ENABLE_WEBKIT1_TRUE@	    installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk-$(DOC_MODULE_VERSION)"; \
+ @ENABLE_WEBKIT1_TRUE@	  else \
+-@ENABLE_WEBKIT1_TRUE@	    installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk"; \
+@ENABLE_WEBKIT1_TRUE@	    installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk-$(WEBKITGTK_API_VERSION)"; \
+ @ENABLE_WEBKIT1_TRUE@	  fi; \
+ @ENABLE_WEBKIT1_TRUE@	  $(mkinstalldirs) $${installdir} ; \
+ @ENABLE_WEBKIT1_TRUE@	  for i in $$installfiles; do \
+@@ -84282,7 +84295,7 @@ install-data-local:
 @ENABLE_WEBKIT2_TRUE@	      $${installdir}/webkit2gtk-$(DOC_MODULE_VERSION).devhelp2; \
 @ENABLE_WEBKIT2_TRUE@	  fi; \
 @ENABLE_WEBKIT2_TRUE@	fi
@ -79,4 +155,4 @@ $OpenBSD: patch-GNUmakefile_in,v 1.19 2012/08/22 07:48:37 landry Exp $
 +@ENABLE_GTK_DOC_TRUE@	@$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
 
 uninstall-local:
- 	@DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \
+ @ENABLE_WEBKIT1_TRUE@	@DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \
--- a/www/webkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h
+++ b/www/webkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h
@ -0,0 +1,18 @@
+$OpenBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h,v 1.1 2013/04/13 09:11:02 landry Exp $
+./Source/JavaScriptCore/assembler/MacroAssembler.h:909: error: call of overloaded 'shouldBlindForSpecificArch(uintptr_t&)' is ambiguous
+./Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h:98: note: candidates are:
+     static bool JSC::MacroAssemblerX86Common::shouldBlindForSpecificArch(uint32_t)
+./Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h:100: note: 
+     static bool JSC::MacroAssemblerX86Common::shouldBlindForSpecificArch(uint64_t)
+
+--- Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h.orig	Fri Mar  8 09:58:35 2013
+++ Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h	Fri Mar  8 10:44:29 2013
+@@ -98,7 +98,7 @@ class MacroAssemblerX86Common : public AbstractMacroAs
+     static bool shouldBlindForSpecificArch(uint32_t value) { return value >= 0x00ffffff; }
+ #if CPU(X86_64)
+     static bool shouldBlindForSpecificArch(uint64_t value) { return value >= 0x00ffffff; }
+-#if OS(DARWIN) // On 64-bit systems other than DARWIN uint64_t and uintptr_t are the same type so overload is prohibited.
+#if OS(DARWIN) || OS(OPENBSD) // On 64-bit systems other than DARWIN uint64_t and uintptr_t are the same type so overload is prohibited.
+     static bool shouldBlindForSpecificArch(uintptr_t value) { return value >= 0x00ffffff; }
+ #endif
+ #endif
--- a/www/webkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp
+++ b/www/webkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp,v 1.2 2012/04/03 15:39:35 landry Exp $
--- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig	Wed Dec 28 09:50:13 2011
-+++ Source/JavaScriptCore/heap/MachineStackMarker.cpp	Mon Jan 16 17:54:07 2012
-@@ -365,8 +365,10 @@ static size_t getPlatformThreadRegisters(const Platfor
+$OpenBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp,v 1.3 2013/04/13 09:11:02 landry Exp $
+--- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig	Mon Oct  1 15:06:17 2012
+++ Source/JavaScriptCore/heap/MachineStackMarker.cpp	Fri Mar  8 00:56:48 2013
+@@ -372,8 +372,10 @@ static size_t getPlatformThreadRegisters(const Platfor
 #elif USE(PTHREADS)
     pthread_attr_init(&regs);
 #if HAVE(PTHREAD_NP_H) || OS(NETBSD)
@ -12,7 +12,7 @@ $OpenBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp,v 1.2 2012/04/
 #else
     // FIXME: this function is non-portable; other POSIX systems may have different np alternatives
     pthread_getattr_np(platformThread, &regs);
-@@ -430,7 +432,14 @@ static inline void* otherThreadStackPointer(const Plat
+@@ -437,7 +439,14 @@ static inline void* otherThreadStackPointer(const Plat
 #elif USE(PTHREADS)
     void* stackBase = 0;
     size_t stackSize = 0;
--- a/www/webkit/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocatorFixedVMPool_cpp
+++ b/www/webkit/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocatorFixedVMPool_cpp
@ -1,16 +0,0 @@
-$OpenBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocatorFixedVMPool_cpp,v 1.3 2011/10/13 06:52:49 jasper Exp $
-
-https://bugs.webkit.org/show_bug.cgi?id=61137
-
--- Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp.orig	Fri Oct  7 09:51:09 2011
-+++ Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp	Fri Oct  7 09:51:31 2011
-@@ -47,7 +47,8 @@ namespace JSC {
-     
- #if CPU(ARM)
- static const size_t fixedPoolSize = 16 * 1024 * 1024;
-#elif CPU(X86_64)
-+// We don't want an initial allocation of 1GB, it's above the default ulimit
-+#elif CPU(X86_64) && !defined(__OpenBSD__)
- static const size_t fixedPoolSize = 1024 * 1024 * 1024;
- #else
- static const size_t fixedPoolSize = 32 * 1024 * 1024;
--- a/www/webkit/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator_h
+++ b/www/webkit/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator_h
@ -0,0 +1,16 @@
+$OpenBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator_h,v 1.1 2013/04/13 09:11:02 landry Exp $
+
+https://bugs.webkit.org/show_bug.cgi?id=61137
+
+--- Source/JavaScriptCore/jit/ExecutableAllocator.h.orig	Thu Jan 24 13:54:55 2013
+++ Source/JavaScriptCore/jit/ExecutableAllocator.h	Fri Mar  8 00:56:48 2013
+@@ -105,7 +105,8 @@ class DemandExecutableAllocator;
+ #if ENABLE(EXECUTABLE_ALLOCATOR_FIXED)
+ #if CPU(ARM)
+ static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024;
+-#elif CPU(X86_64)
+// We don't want an initial allocation of 1GB, it's above the default ulimit
+#elif CPU(X86_64) && !defined(__OpenBSD__)
+ static const size_t fixedExecutableMemoryPoolSize = 1024 * 1024 * 1024;
+ #else
+ static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024;
--- a/www/webkit/patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
+++ b/www/webkit/patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm
@ -0,0 +1,13 @@
+$OpenBSD: patch-Source_JavaScriptCore_llint_LowLevelInterpreter32_64_asm,v 1.1 2013/04/13 09:11:02 landry Exp $
+https://bugs.webkit.org/show_bug.cgi?id=103128
+--- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.orig	Sun Mar 31 11:51:25 2013
+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm	Sun Mar 31 11:52:29 2013
+@@ -1729,7 +1729,7 @@ _llint_op_next_pname:
+     loadi 20[PC], t2
+     loadi PayloadOffset[cfr, t2, 8], t2
+     loadp JSPropertyNameIterator::m_jsStrings[t2], t3
+-    loadi [t3, t0, 8], t3
+    loadi PayloadOffset[t3, t0, 8], t3
+     addi 1, t0
+     storei t0, PayloadOffset[cfr, t1, 8]
+     loadi 4[PC], t1
--- a/www/webkit/patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter_asm
+++ b/www/webkit/patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter_asm
@ -0,0 +1,42 @@
+$OpenBSD: patch-Source_JavaScriptCore_llint_LowLevelInterpreter_asm,v 1.1 2013/04/13 09:11:02 landry Exp $
+https://bugs.webkit.org/show_bug.cgi?id=103128
+--- Source/JavaScriptCore/llint/LowLevelInterpreter.asm.orig	Sun Mar 31 11:48:40 2013
+++ Source/JavaScriptCore/llint/LowLevelInterpreter.asm	Sun Mar 31 19:00:09 2013
+@@ -87,6 +87,12 @@ else
+     const PayloadOffset = 0
+ end
+ 
+if JSVALUE64
+    const CellOffset = 0
+else
+    const CellOffset = PayloadOffset
+end
+
+ # Constant for reasoning about butterflies.
+ const IsArray                  = 1
+ const IndexingShapeMask        = 30
+@@ -263,13 +269,13 @@ macro assertNotConstant(index)
+ end
+ 
+ macro functionForCallCodeBlockGetter(targetRegister)
+-    loadp Callee[cfr], targetRegister
+    loadp Callee + CellOffset[cfr], targetRegister
+     loadp JSFunction::m_executable[targetRegister], targetRegister
+     loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister
+ end
+ 
+ macro functionForConstructCodeBlockGetter(targetRegister)
+-    loadp Callee[cfr], targetRegister
+    loadp Callee + CellOffset[cfr], targetRegister
+     loadp JSFunction::m_executable[targetRegister], targetRegister
+     loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister
+ end
+@@ -824,7 +830,7 @@ macro interpretResolveWithBase(opcodeLength, slowPath)
+     getResolveOperation(4, t0)
+     btpz t0, .slowPath
+ 
+-    loadp ScopeChain[cfr], t3
+    loadp ScopeChain + CellOffset[cfr], t3
+     # Get the base
+     loadis ResolveOperation::m_operation[t0], t2
+ 
--- a/www/webkit/patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter_cpp
+++ b/www/webkit/patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter_cpp
@ -0,0 +1,25 @@
+$OpenBSD: patch-Source_JavaScriptCore_llint_LowLevelInterpreter_cpp,v 1.1 2013/04/13 09:11:02 landry Exp $
+https://bugs.webkit.org/show_bug.cgi?id=103128
+http://trac.webkit.org/changeset/145551 fixes missing Double2Ints on ppc
+https://bugs.webkit.org/show_bug.cgi?id=113638
+tentative fix for ppc/sparc64/mips64el - LLIntAssembly.h uses isnan() without including math.h (or cmath?)
+--- Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.orig	Tue Mar 26 19:25:12 2013
+++ Source/JavaScriptCore/llint/LowLevelInterpreter.cpp	Sun Mar 31 11:47:48 2013
+@@ -117,6 +117,17 @@ static double Ints2Double(uint32_t lo, uint32_t hi)
+     u.ival64 = (static_cast<uint64_t>(hi) << 32) | lo;
+     return u.dval;
+ }
+
+static void Double2Ints(double val, uint32_t& lo, uint32_t& hi)
+{
+    union {
+        double dval;
+        uint64_t ival64;
+    } u;
+    u.dval = val;
+    hi = static_cast<uint32_t>(u.ival64 >> 32);
+    lo = static_cast<uint32_t>(u.ival64);
+}
+ #endif // USE(JSVALUE32_64)
+ 
+ } // namespace LLint
--- a/www/webkit/patches/patch-Source_JavaScriptCore_offlineasm_cloop_rb
+++ b/www/webkit/patches/patch-Source_JavaScriptCore_offlineasm_cloop_rb
@ -0,0 +1,23 @@
+$OpenBSD: patch-Source_JavaScriptCore_offlineasm_cloop_rb,v 1.1 2013/04/13 09:11:02 landry Exp $
+chunk 1: dont spit isnan()
+http://trac.webkit.org/changeset/145551
+--- Source/JavaScriptCore/offlineasm/cloop.rb.orig	Tue Feb 19 08:44:37 2013
+++ Source/JavaScriptCore/offlineasm/cloop.rb	Sat Mar 30 13:06:32 2013
+@@ -398,7 +398,7 @@ def cloopEmitUnaryOperation(operands, type, operator)
+ end
+ 
+ def cloopEmitCompareDoubleWithNaNCheckAndBranch(operands, condition)
+-    $asm.putc "if (std::isnan(#{operands[0].clValue(:double)}) || isnan(#{operands[1].clValue(:double)})"
+    $asm.putc "if (std::isnan(#{operands[0].clValue(:double)})"
+     $asm.putc "    || (#{operands[0].clValue(:double)} #{condition} #{operands[1].clValue(:double)}))"
+     $asm.putc "    goto #{operands[2].cLabel};"
+ end
+@@ -1025,7 +1025,7 @@ class Instruction
+         # 32-bit instruction: f2dii dblOp int32LoOp int32HiOp (based on ARMv7)
+         # Encode a 64-bit double into 2 32-bit ints (low and high).
+         when "fd2ii"
+-            $asm.putc "Double2Ints(#{operands[0].clValue(:double)}, #{operands[1].clValue}, #{operands[2].clValue});"
+            $asm.putc "Double2Ints(#{operands[0].clValue(:double)}, #{operands[1].clValue(:uint32)}, #{operands[2].clValue(:uint32)});"
+ 
+         # 64-bit instruction: fq2d int64Op dblOp (based on X64)
+         # Copy a bit-encoded double in a 64-bit int register to a double register.
--- a/www/webkit/patches/patch-Source_JavaScriptCore_runtime_UString_h
+++ b/www/webkit/patches/patch-Source_JavaScriptCore_runtime_UString_h
@ -1,12 +0,0 @@
-$OpenBSD: patch-Source_JavaScriptCore_runtime_UString_h,v 1.1 2012/04/03 15:39:35 landry Exp $
--- Source/JavaScriptCore/runtime/UString.h.orig	Thu Mar 29 08:51:51 2012
-+++ Source/JavaScriptCore/runtime/UString.h	Thu Mar 29 08:52:38 2012
-@@ -222,7 +222,7 @@ struct UStringHash {
- 
-         // FIXME: perhaps we should have a more abstract macro that indicates when
-         // going 4 bytes at a time is unsafe
-#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC)
-+#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC) || CPU(SPARC64) || CPU(MIPS64)
-         const UChar* aChars = a->characters();
-         const UChar* bChars = b->characters();
-         for (unsigned i = 0; i != aLength; ++i) {
--- a/www/webkit/patches/patch-Source_JavaScriptCore_wtf_NumberOfCores_cpp
+++ b/www/webkit/patches/patch-Source_JavaScriptCore_wtf_NumberOfCores_cpp
@ -1,12 +0,0 @@
-$OpenBSD: patch-Source_JavaScriptCore_wtf_NumberOfCores_cpp,v 1.1 2012/04/03 15:39:35 landry Exp $
-https://bugs.webkit.org/show_bug.cgi?id=82585
--- Source/JavaScriptCore/wtf/NumberOfCores.cpp.orig	Thu Mar 29 10:07:46 2012
-+++ Source/JavaScriptCore/wtf/NumberOfCores.cpp	Thu Mar 29 10:08:10 2012
-@@ -27,6 +27,7 @@
- #include "NumberOfCores.h"
- 
- #if OS(DARWIN) || OS(OPENBSD) || OS(NETBSD) || OS(FREEBSD)
-+#include <sys/param.h>
- #include <sys/sysctl.h>
- #include <sys/types.h>
- #elif OS(LINUX) || OS(AIX) || OS(SOLARIS)
--- a/www/webkit/patches/patch-Source_JavaScriptCore_wtf_TCSpinLock_h
+++ b/www/webkit/patches/patch-Source_JavaScriptCore_wtf_TCSpinLock_h
@ -1,22 +0,0 @@
-$OpenBSD: patch-Source_JavaScriptCore_wtf_TCSpinLock_h,v 1.2 2011/10/13 06:52:49 jasper Exp $
-
-workaround for a g++4 regression(?) on powerpc, reported as
-https://bugs.webkit.org/show_bug.cgi?id=33451 :
-JavaScriptCore/wtf/TCSpinLock.h:112: error: 'asm' operand requires impossible reload"
-also reported in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=438415
-Another option is :
-.if ${MACHINE_ARCH} == "powerpc"
-CONFIGURE_ARGS +=	--enable-optimizations=no
-.endif
-
--- Source/JavaScriptCore/wtf/TCSpinLock.h.orig	Mon Apr 25 21:26:06 2011
-+++ Source/JavaScriptCore/wtf/TCSpinLock.h	Fri May  6 10:38:17 2011
-@@ -34,7 +34,7 @@
- #ifndef TCMALLOC_INTERNAL_SPINLOCK_H__
- #define TCMALLOC_INTERNAL_SPINLOCK_H__
- 
-#if (CPU(X86) || CPU(X86_64) || CPU(PPC)) && (COMPILER(GCC) || COMPILER(MSVC))
-+#if (CPU(X86) || CPU(X86_64)) && (COMPILER(GCC) || COMPILER(MSVC))
- 
- #include <time.h>       /* For nanosleep() */
- 
--- a/www/webkit/patches/patch-Source_ThirdParty_leveldb_port_port_posix_h
+++ b/www/webkit/patches/patch-Source_ThirdParty_leveldb_port_port_posix_h
@ -0,0 +1,35 @@
+$OpenBSD: patch-Source_ThirdParty_leveldb_port_port_posix_h,v 1.1 2013/04/13 09:11:02 landry Exp $
+http://code.google.com/p/leveldb/issues/detail?id=98
+--- Source/ThirdParty/leveldb/port/port_posix.h.orig	Fri Mar  8 23:47:55 2013
+++ Source/ThirdParty/leveldb/port/port_posix.h	Sat Mar  9 00:19:53 2013
+@@ -25,10 +25,11 @@
+   #include <sys/types.h>
+   #include <sys/endian.h>
+   #define PLATFORM_IS_LITTLE_ENDIAN (_BYTE_ORDER == _LITTLE_ENDIAN)
+-#elif defined(OS_OPENBSD) || defined(OS_NETBSD) ||\
+#elif defined(__OpenBSD__) || defined(OS_NETBSD) ||\
+       defined(OS_DRAGONFLYBSD)
+   #include <sys/types.h>
+   #include <sys/endian.h>
+  #define PLATFORM_IS_LITTLE_ENDIAN (BYTE_ORDER == LITTLE_ENDIAN)
+ #elif defined(OS_HPUX)
+   #define PLATFORM_IS_LITTLE_ENDIAN false
+ #elif defined(OS_ANDROID)
+@@ -54,7 +55,7 @@
+ #endif
+ 
+ #if defined(OS_MACOSX) || defined(OS_SOLARIS) || defined(OS_FREEBSD) ||\
+-    defined(OS_NETBSD) || defined(OS_OPENBSD) || defined(OS_DRAGONFLYBSD) ||\
+    defined(OS_NETBSD) || defined(__OpenBSD__) || defined(OS_DRAGONFLYBSD) ||\
+     defined(OS_ANDROID) || defined(OS_HPUX)
+ // Use fread/fwrite/fflush on platforms without _unlocked variants
+ #define fread_unlocked fread
+@@ -63,7 +64,7 @@
+ #endif
+ 
+ #if defined(OS_MACOSX) || defined(OS_FREEBSD) ||\
+-    defined(OS_OPENBSD) || defined(OS_DRAGONFLYBSD)
+    defined(__OpenBSD__) || defined(OS_DRAGONFLYBSD)
+ // Use fsync() on platforms without fdatasync()
+ #define fdatasync fsync
+ #endif
--- a/www/webkit/patches/patch-Source_WTF_wtf_Atomics_cpp
+++ b/www/webkit/patches/patch-Source_WTF_wtf_Atomics_cpp
@ -0,0 +1,118 @@
+$OpenBSD: patch-Source_WTF_wtf_Atomics_cpp,v 1.1 2013/04/13 09:11:02 landry Exp $
+http://trac.webkit.org/browser/trunk/Source/WTF/wtf/Atomics.cpp?rev=144077
+add CPU(MIPS64) to ensure its only picked there - since we build with gcc 4.2,
+__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 is not defined on all archs
+--- Source/WTF/wtf/Atomics.cpp.orig	Sat Apr 13 09:44:20 2013
+++ Source/WTF/wtf/Atomics.cpp	Sat Apr 13 09:45:15 2013
+@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2007, 2008, 2010, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer. 
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution. 
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * Note: The implementations of InterlockedIncrement and InterlockedDecrement are based
+ * on atomic_increment and atomic_exchange_and_add from the Boost C++ Library. The license
+ * is virtually identical to the Apple license above but is included here for completeness.
+ *
+ * Boost Software License - Version 1.0 - August 17th, 2003
+ * 
+ * Permission is hereby granted, free of charge, to any person or organization
+ * obtaining a copy of the software and accompanying documentation covered by
+ * this license (the "Software") to use, reproduce, display, distribute,
+ * execute, and transmit the Software, and to prepare derivative works of the
+ * Software, and to permit third-parties to whom the Software is furnished to
+ * do so, all subject to the following:
+ * 
+ * The copyright notices in the Software and this entire statement, including
+ * the above license grant, this restriction and the following disclaimer,
+ * must be included in all copies of the Software, in whole or in part, and
+ * all derivative works of the Software, unless such copies or derivative
+ * works are solely in the form of machine-executable object code generated by
+ * a source language processor.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include "config.h"
+
+// Some architectures, like MIPS32, don't have GCC implementation for builtin __sync_* functions
+// with 64 bits variable size. Official GCC answer for the problem: If a target doesn't support
+// atomic operations on certain variable sizes, you are out of luck with atomicity in that case
+// (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56296). GCC >= 4.8 will support __atomic_* builtin
+// functions for this purpose for all the GCC targets, but for current compilers we have to include
+// our own implementation.
+#if COMPILER(GCC) && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) && USE(LOCKFREE_THREADSAFEREFCOUNTED) && USE(PTHREADS) && CPU(MIPS64)
+
+#include "Atomics.h"
+
+#include "ThreadingPrimitives.h"
+
+namespace WTF {
+
+static const size_t kSwapLockCount = 32;
+static Mutex s_swapLocks[kSwapLockCount];
+
+static inline Mutex& getSwapLock(const volatile int64_t* addr)
+{
+    return s_swapLocks[(reinterpret_cast<intptr_t>(addr) >> 3U) % kSwapLockCount];
+}
+
+static int64_t atomicStep(int64_t volatile* addend, int64_t step)
+{
+    Mutex& mutex = getSwapLock(addend);
+
+    mutex.lock();
+    int64_t value = *addend + step;
+    *addend = value;
+    mutex.unlock();
+
+    return value;
+}
+
+extern "C" {
+
+int64_t __sync_add_and_fetch_8(int64_t volatile* addend, int64_t value)
+{
+    return atomicStep(addend, value);
+}
+
+int64_t __sync_sub_and_fetch_8(int64_t volatile* addend, int64_t value)
+{
+    return atomicStep(addend, -value);
+}
+
+} // extern "C"
+
+} // namespace WTF
+
+#endif
--- a/www/webkit/patches/patch-Source_JavaScriptCore_wtf_Atomics_h
+++ b/www/webkit/patches/patch-Source_JavaScriptCore_wtf_Atomics_h
@ -1,11 +1,13 @@
-$OpenBSD: patch-Source_JavaScriptCore_wtf_Atomics_h,v 1.2 2012/05/18 09:56:04 landry Exp $
+$OpenBSD: patch-Source_WTF_wtf_Atomics_h,v 1.1 2013/04/13 09:11:02 landry Exp $
+
 https://bugs.webkit.org/show_bug.cgi?id=86835
 Fix build failure on sparc64 since 1.8.1, provide atomic{In,De}crement implems based on __sync_fetch_and_add builtin
--- Source/JavaScriptCore/wtf/Atomics.h.orig	Thu May 17 11:42:51 2012
-+++ Source/JavaScriptCore/wtf/Atomics.h	Thu May 17 11:45:22 2012
+
+--- Source/WTF/wtf/Atomics.h.orig	Tue Jan 29 11:00:42 2013
+++ Source/WTF/wtf/Atomics.h	Fri Mar  8 00:57:25 2013
@@ -116,6 +116,12 @@ inline int atomicDecrement(int volatile* addend) { ret
- inline int atomicIncrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, 1) + 1; }
- inline int atomicDecrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
+ inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_add_and_fetch(addend, 1); }
+ inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_sub_and_fetch(addend, 1); }
 
 +#elif COMPILER(GCC) && CPU(SPARC64)
 +#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
@ -15,4 +17,4 @@ Fix build failure on sparc64 since 1.8.1, provide atomic{In,De}crement implems b
 +
 #endif
 
- inline bool weakCompareAndSwap(unsigned* location, unsigned expected, unsigned newValue)
+ #if OS(WINDOWS)
--- a/www/webkit/patches/patch-Source_WTF_wtf_InlineASM_h
+++ b/www/webkit/patches/patch-Source_WTF_wtf_InlineASM_h
@ -0,0 +1,12 @@
+$OpenBSD: patch-Source_WTF_wtf_InlineASM_h,v 1.1 2013/04/13 09:11:02 landry Exp $
+--- Source/WTF/wtf/InlineASM.h.orig	Sat Mar  9 21:30:13 2013
+++ Source/WTF/wtf/InlineASM.h	Sat Mar  9 21:30:27 2013
+@@ -42,7 +42,7 @@
+ #define THUMB_FUNC_PARAM(name)
+ #endif
+ 
+-#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
+#if (OS(LINUX) || OS(FREEBSD) || OS(OPENBSD)) && CPU(X86_64)
+ #define GLOBAL_REFERENCE(name) #name "@plt"
+ #elif CPU(X86) && COMPILER(MINGW)
+ #define GLOBAL_REFERENCE(name) "@" #name "@4"
--- a/www/webkit/patches/patch-Source_JavaScriptCore_wtf_Platform_h
+++ b/www/webkit/patches/patch-Source_JavaScriptCore_wtf_Platform_h
@ -1,10 +1,9 @@
-$OpenBSD: patch-Source_JavaScriptCore_wtf_Platform_h,v 1.6 2012/10/07 09:24:18 landry Exp $
+$OpenBSD: patch-Source_WTF_wtf_Platform_h,v 1.1 2013/04/13 09:11:02 landry Exp $

 Allow webkit to build and run on mips64
-Recognize hppa

--- Source/JavaScriptCore/wtf/Platform.h.orig	Mon Aug 20 10:30:25 2012
-+++ Source/JavaScriptCore/wtf/Platform.h	Sat Oct  6 02:51:40 2012
+--- Source/WTF/wtf/Platform.h.orig	Tue Mar  5 09:57:37 2013
+++ Source/WTF/wtf/Platform.h	Fri Mar  8 00:57:25 2013
@@ -76,9 +76,14 @@
 
 /* CPU(MIPS) - MIPS 32-bit */
@ -34,7 +33,7 @@ Recognize hppa
 /* CPU(SPARC32) - SPARC 32-bit */
 #if defined(__sparc) && !defined(__arch64__) || defined(__sparcv8)
 #define WTF_CPU_SPARC32 1
-@@ -295,7 +305,7 @@
+@@ -314,7 +324,7 @@
 
 #endif /* ARM */
 
@ -43,7 +42,7 @@ Recognize hppa
 #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
 #endif
 
-@@ -899,7 +909,8 @@
+@@ -744,7 +754,8 @@
     || CPU(ALPHA) \
     || CPU(SPARC64) \
     || CPU(S390X) \
--- a/www/webkit/patches/patch-Source_WTF_wtf_RAMSize_cpp
+++ b/www/webkit/patches/patch-Source_WTF_wtf_RAMSize_cpp
@ -0,0 +1,31 @@
+$OpenBSD: patch-Source_WTF_wtf_RAMSize_cpp,v 1.1 2013/04/13 09:11:02 landry Exp $
+--- Source/WTF/wtf/RAMSize.cpp.orig	Thu Jul 19 12:02:14 2012
+++ Source/WTF/wtf/RAMSize.cpp	Sat Mar  9 21:26:30 2013
+@@ -27,7 +27,7 @@
+ #include "RAMSize.h"
+ 
+ #include "StdLibExtras.h"
+-#if OS(DARWIN)
+#if OS(DARWIN) || OS(OPENBSD)
+ #include <sys/param.h>
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+@@ -45,13 +45,17 @@ static const size_t ramSizeGuess = 128 * MB;
+ 
+ static size_t computeRAMSize()
+ {
+-#if OS(DARWIN)
+#if OS(DARWIN) || OS(OPENBSD)
+     int mib[2];
+     uint64_t ramSize;
+     size_t length;
+ 
+     mib[0] = CTL_HW;
+#if OS(DARWIN)
+     mib[1] = HW_MEMSIZE;
+#else
+    mib[1] = HW_PHYSMEM64;
+#endif
+     length = sizeof(int64_t);
+     int sysctlResult = sysctl(mib, 2, &ramSize, &length, 0, 0);
+     if (sysctlResult == -1)
--- a/www/webkit/patches/patch-Source_JavaScriptCore_wtf_dtoa_utils_h
+++ b/www/webkit/patches/patch-Source_JavaScriptCore_wtf_dtoa_utils_h
@ -1,13 +1,12 @@
-$OpenBSD: patch-Source_JavaScriptCore_wtf_dtoa_utils_h,v 1.4 2012/10/07 09:24:18 landry Exp $
-allow mips64/sparc64/hppa to go further
--- Source/JavaScriptCore/wtf/dtoa/utils.h.orig	Mon Aug 20 10:26:05 2012
-+++ Source/JavaScriptCore/wtf/dtoa/utils.h	Sat Oct  6 02:52:04 2012
+$OpenBSD: patch-Source_WTF_wtf_dtoa_utils_h,v 1.1 2013/04/13 09:11:02 landry Exp $
+--- Source/WTF/wtf/dtoa/utils.h.orig	Thu Jun 14 12:23:17 2012
+++ Source/WTF/wtf/dtoa/utils.h	Mon Oct  8 10:56:08 2012
@@ -49,7 +49,7 @@
 defined(__ARMEL__) || \
 defined(_MIPS_ARCH_MIPS32R2)
 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
 -#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA)
-+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(MIPS64) || CPU(SPARC64) || CPU(HPPA) || CPU(ALPHA)
+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) || CPU(SPARC64) || CPU(HPPA)
 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
 #elif defined(_M_IX86) || defined(__i386__)
 #if defined(_WIN32)
--- a/www/webkit/patches/patch-Source_WebCore_platform_text_TextBreakIterator_h
+++ b/www/webkit/patches/patch-Source_WebCore_platform_text_TextBreakIterator_h
@ -1,16 +0,0 @@
-$OpenBSD: patch-Source_WebCore_platform_text_TextBreakIterator_h,v 1.2 2011/10/13 06:52:49 jasper Exp $
-
-https://bugs.webkit.org/show_bug.cgi?id=36381
-http://bugs.gentoo.org/show_bug.cgi?id=308699
-
--- Source/WebCore/platform/text/TextBreakIterator.h.orig	Mon Sep 26 22:55:00 2011
-+++ Source/WebCore/platform/text/TextBreakIterator.h	Fri Oct  7 10:03:03 2011
-@@ -27,7 +27,7 @@
- 
- namespace WebCore {
- 
-    class TextBreakIterator;
-+    typedef struct UBreakIterator TextBreakIterator;
- 
-     // Note: The returned iterator is good only until you get another iterator, with the exception of acquireLineBreakIterator.
- 
--- a/www/webkit/patches/patch-Source_WebCore_plugins_PluginDatabase_cpp
+++ b/www/webkit/patches/patch-Source_WebCore_plugins_PluginDatabase_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-Source_WebCore_plugins_PluginDatabase_cpp,v 1.1 2011/05/11 06:00:08 ajacoutot Exp $
--- Source/WebCore/plugins/PluginDatabase.cpp.orig	Mon Apr 25 21:26:35 2011
-+++ Source/WebCore/plugins/PluginDatabase.cpp	Sun May  8 10:44:03 2011
-@@ -376,7 +376,7 @@ Vector<String> PluginDatabase::defaultPluginDirectorie
+$OpenBSD: patch-Source_WebCore_plugins_PluginDatabase_cpp,v 1.2 2013/04/13 09:11:02 landry Exp $
+--- Source/WebCore/plugins/PluginDatabase.cpp.orig	Sun Dec 16 11:24:45 2012
+++ Source/WebCore/plugins/PluginDatabase.cpp	Fri Mar  8 00:57:25 2013
+@@ -403,7 +403,7 @@ Vector<String> PluginDatabase::defaultPluginDirectorie
     paths.append(userPluginPath);
 
     paths.append("/usr/lib/browser/plugins");
--- a/www/webkit/patches/patch-Source_WebKit2_Platform_CoreIPC_unix_ConnectionUnix_cpp
+++ b/www/webkit/patches/patch-Source_WebKit2_Platform_CoreIPC_unix_ConnectionUnix_cpp
@ -0,0 +1,15 @@
+$OpenBSD: patch-Source_WebKit2_Platform_CoreIPC_unix_ConnectionUnix_cpp,v 1.1 2013/04/13 09:11:02 landry Exp $
+Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp:317: error: elements of array 'iovec iov [1]' have incomplete type
+Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp:317: error: storage size of 'iov' isn't known
+Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp:481: error: elements of array 'iovec iov [3]' have incomplete type
+Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp:481: error: storage size of 'iov' isn't known
+--- Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp.orig	Fri Feb  1 11:46:15 2013
+++ Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp	Fri Mar  8 00:57:25 2013
+@@ -31,6 +31,7 @@
+ #include "DataReference.h"
+ #include "SharedMemory.h"
+ #include <sys/socket.h>
+#include <sys/uio.h>
+ #include <unistd.h>
+ #include <errno.h>
+ #include <fcntl.h>
--- a/www/webkit/patches/patch-Source_WebKit_gtk_resources_error_html
+++ b/www/webkit/patches/patch-Source_WebKit_gtk_resources_error_html
@ -1,19 +0,0 @@
-$OpenBSD: patch-Source_WebKit_gtk_resources_error_html,v 1.2 2012/03/14 20:23:57 landry Exp $
-https://bugs.webkit.org/show_bug.cgi?id=39232
--- Source/WebKit/gtk/resources/error.html.orig	Thu May  5 14:40:23 2011
-+++ Source/WebKit/gtk/resources/error.html	Thu May  5 14:40:34 2011
-@@ -21,12 +21,12 @@ body {
- }
- 
- #errorTitleText {
- font-size: 120%;
-+ font-size: 120%%;
-  font-weight: bold;
- }
- 
- #errorMessageText {
- font-size: 80%;
-+ font-size: 80%%;
- }
- 
- </style>
--- a/www/webkit/patches/patch-configure
+++ b/www/webkit/patches/patch-configure
@ -1,28 +1,44 @@
-$OpenBSD: patch-configure,v 1.11 2012/08/22 07:48:37 landry Exp $
+$OpenBSD: patch-configure,v 1.12 2013/04/13 09:11:02 landry Exp $

-GNOME Bug 627126 - gsettings schema files don't get installed on FreeBSD
+- Chunk 1, 2 & 6 : https://bugs.webkit.org/show_bug.cgi?id=109932
+Only webkit2 requires c++11 features atm, so let's relax the check until we have webkit2
+
+- Chunk 3 : GNOME Bug 627126 - gsettings schema files don't get installed on FreeBSD
 glib commit 136e705e8383ff8848e425ac01278102d7badc52

-Don't force the use of -O2, the ports infrastructure
+- Chunk 4 & 5 & 8 : fix bashisms
+https://bugs.webkit.org/show_bug.cgi?id=113349
+
+- Chunk 7 : Don't force the use of -O2, the ports infrastructure
 takes care of that

-OpenBSD doesnt have libdl
-
-Fix gstreamer detection : https://bugs.webkit.org/show_bug.cgi?id=82580
--- configure.orig	Tue Aug 21 04:57:19 2012
-+++ configure	Tue Aug 21 09:36:54 2012
-@@ -18629,8 +18629,8 @@ GSTREAMER_0_11_REQUIRED_VERSION=0.11
- GSTREAMER_0_11_PLUGINS_BASE_REQUIRED_VERSION=0.11.0.2
+- Chunk 9 : use MODPY_BIN when calling the generator
+--- configure.orig	Tue Mar 26 20:46:03 2013
+++ configure	Thu Apr 11 19:46:57 2013
+@@ -4717,7 +4717,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 
- case "$with_gstreamer" in
-     0.10) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_10_REQUIRED_VERSION
-           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION
-+     0.10) GSTREAMER_REQUIRED_VERSION=$GSTREAMER_0_10_REQUIRED_VERSION
-+           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION
-            GST_API_VERSION=0.10
-            ;;
-      0.11) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_11_REQUIRED_VERSION
-@@ -19227,22 +19227,10 @@ install-data-am: install-gsettings-schemas
+-#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7) \
+#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 2) \
+     && !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 0)
+ #error Unsupported compiler
+ #endif
+@@ -4754,7 +4754,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7) \
+#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 2) \
+     && !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 0)
+ #error Unsupported compiler
+ #endif
+@@ -17479,26 +17479,14 @@ gsettings__enum_file = $(addsuffix .enums.xml,$(gsetti
+ 
+ all-am: $(gsettings_SCHEMAS:.xml=.valid)
+ uninstall-am: uninstall-gsettings-schemas
+-install-data-am: install-gsettings-schemas
+install-data-am:
 
 .SECONDARY: $(gsettings_SCHEMAS)
 
@ -47,23 +63,262 @@ Fix gstreamer detection : https://bugs.webkit.org/show_bug.cgi?id=82580
 	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
 
 uninstall-gsettings-schemas:
-@@ -20524,7 +20512,7 @@ fi
+@@ -20218,18 +20206,18 @@ fi
 
- done
+ if test "$with_acceleration_backend" = "opengl"; then
+     if test "$enable_gles2" = "yes"; then
+-        acceleration_backend_description+= "(gles2"
+        acceleration_backend_description= "(gles2"
+         OPENGL_LIBS="-lGLESv2"
+     else
+-        acceleration_backend_description+="(gl"
+        acceleration_backend_description="(gl"
+         OPENGL_LIBS="-lGL"
+     fi
+     if test "$enable_egl" = "yes"; then
+-        acceleration_backend_description+=", egl"
+-        OPENGL_LIBS+=" -lEGL"
+        acceleration_backend_description="$acceleration_backend_description, egl"
+        OPENGL_LIBS="$OPENGL_LIBS -lEGL"
+     fi
+     if test "$enable_glx" = "yes"; then
+-        acceleration_backend_description+=", glx"
+        acceleration_backend_description="$acceleration_backend_description, glx"
+     fi
 
-    OPENGL_LIBS="-lGL -ldl"
-+    OPENGL_LIBS="-lGL"
+     # Check whether dlopen() is in the core libc like on FreeBSD, or in a separate
+@@ -20282,8 +20270,8 @@ fi
+ 
+ 
+ 
+-    OPENGL_LIBS+=" $DLOPEN_LIBS"
+-    acceleration_backend_description+=")"
+    OPENGL_LIBS="$OPENGL_LIBS $DLOPEN_LIBS"
+    acceleration_backend_description="$acceleration_backend_description)"
 fi
 
 
-@@ -21660,8 +21648,8 @@ fi
+@@ -21037,7 +21025,7 @@ fi
+ # Use C99 as the language standard for C code.
+ CFLAGS="$CFLAGS -std=c99"
+ # Do not warn about C++11 incompatibilities.
+-CXXFLAGS="$CXXFLAGS -Wno-c++11-compat"
+# CXXFLAGS="$CXXFLAGS -Wno-c++11-compat"
 
- # Add the appropriate 'O' level for optimized builds
+ # Clang requires suppression of unused arguments warning.
+ if test "$CC" = "clang"; then
+@@ -21065,8 +21053,8 @@ fi
+ 
+ # Add the appropriate 'O' level for optimized builds.
 if test "$enable_optimizations" = "yes"; then
-   CXXFLAGS="$CXXFLAGS -O2"
-   CFLAGS="$CFLAGS -O2"
-+   CXXFLAGS="$CXXFLAGS"
-+   CFLAGS="$CFLAGS"
+-    CXXFLAGS="$CXXFLAGS -O2"
+-    CFLAGS="$CFLAGS -O2"
+    CXXFLAGS="$CXXFLAGS"
+    CFLAGS="$CFLAGS"
 else
-    CXXFLAGS="$CXXFLAGS -O0"
-    CFLAGS="$CFLAGS -O0"
+     CXXFLAGS="$CXXFLAGS -O0"
+     CFLAGS="$CFLAGS -O0"
+@@ -21336,100 +21324,100 @@ fi
+ # This list of features represents those selected for release builds.
+ # If you are adding a new or unstable feature, you should mark it
+ # disabled here.
+-read -d '' DEFAULT_FEATURE_DEFINES <<"EOF"
+-	ENABLE_ACCELERATED_2D_CANVAS=0
+-	ENABLE_BATTERY_STATUS=0
+-	ENABLE_BLOB=1
+-	ENABLE_CANVAS_PATH=0
+-	ENABLE_CANVAS_PROXY=0
+-	ENABLE_CHANNEL_MESSAGING=1
+-	ENABLE_CSP_NEXT=0
+-	ENABLE_CSS3_TEXT=0
+-	ENABLE_CSS_BOX_DECORATION_BREAK=1
+-	ENABLE_CSS_COMPOSITING=0
+-	ENABLE_CSS_DEVICE_ADAPTATION=0
+-	ENABLE_CSS_EXCLUSIONS=1
+-	ENABLE_CSS_IMAGE_ORIENTATION=0
+-	ENABLE_CSS_IMAGE_RESOLUTION=0
+-	ENABLE_CSS_IMAGE_SET=0
+-	ENABLE_CSS_REGIONS=0
+-	ENABLE_CSS_STICKY_POSITION=0
+-	ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=0
+-	ENABLE_CSS_VARIABLES=0
+-	ENABLE_CSS3_CONDITIONAL_RULES=0
+-	ENABLE_CUSTOM_SCHEME_HANDLER=0
+-	ENABLE_DASHBOARD_SUPPORT=0
+-	ENABLE_DATALIST_ELEMENT=0
+-	ENABLE_DATA_TRANSFER_ITEMS=0
+-	ENABLE_DETAILS_ELEMENT=1
+-	ENABLE_DEVICE_ORIENTATION=0
+-	ENABLE_DIALOG_ELEMENT=0
+-	ENABLE_DIRECTORY_UPLOAD=0
+-	ENABLE_DOM4_EVENTS_CONSTRUCTOR=0
+-	ENABLE_DOWNLOAD_ATTRIBUTE=0
+-	ENABLE_FILE_SYSTEM=0
+-	ENABLE_FILTERS=1
+-	ENABLE_FTPDIR=0
+-	ENABLE_FULLSCREEN_API=1
+-	ENABLE_HIGH_DPI_CANVAS=0
+-	ENABLE_ICONDATABASE=1
+-	ENABLE_IFRAME_SEAMLESS=1
+-	ENABLE_INDEXED_DATABASE=0
+-	ENABLE_INPUT_SPEECH=0
+-	ENABLE_INPUT_TYPE_COLOR=0
+-	ENABLE_INPUT_TYPE_DATE=0
+-	ENABLE_INPUT_TYPE_DATETIME=0
+-	ENABLE_INPUT_TYPE_DATETIMELOCAL=0
+-	ENABLE_INPUT_TYPE_MONTH=0
+-	ENABLE_INPUT_TYPE_TIME=0
+-	ENABLE_INPUT_TYPE_WEEK=0
+-	ENABLE_INSPECTOR=1
+-	ENABLE_JAVASCRIPT_DEBUGGER=1
+-	ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0
+-	ENABLE_LEGACY_NOTIFICATIONS=0
+-	ENABLE_LEGACY_VENDOR_PREFIXES=1
+-	ENABLE_LEGACY_WEB_AUDIO=0
+-	ENABLE_LINK_PREFETCH=0
+-	ENABLE_LINK_PRERENDER=0
+-	ENABLE_MATHML=0
+-	ENABLE_MEDIA_CAPTURE=0
+-	ENABLE_MEDIA_SOURCE=0
+-	ENABLE_MEDIA_STATISTICS=0
+-	ENABLE_MEDIA_STREAM=0
+-	ENABLE_METER_ELEMENT=1
+-	ENABLE_MHTML=1
+-	ENABLE_MICRODATA=0
+-	ENABLE_MOUSE_CURSOR_SCALE=0
+-	ENABLE_NAVIGATOR_CONTENT_UTILS=0
+-	ENABLE_NETSCAPE_PLUGIN_API=1
+-	ENABLE_NETWORK_INFO=0
+-	ENABLE_NOTIFICATIONS=0
+-	ENABLE_ORIENTATION_EVENTS=0
+-	ENABLE_PAGE_VISIBILITY_API=0
+-	ENABLE_PERFORMANCE_TIMELINE=0
+-	ENABLE_PROGRESS_ELEMENT=1
+-	ENABLE_PROXIMITY_EVENTS=0
+-	ENABLE_QUOTA=0
+-	ENABLE_RESOURCE_TIMING=0
+-	ENABLE_REQUEST_ANIMATION_FRAME=1
+-	ENABLE_SCRIPTED_SPEECH=0
+-	ENABLE_SHADOW_DOM=1
+-	ENABLE_SHARED_WORKERS=1
+-	ENABLE_SMOOTH_SCROLLING=1
+-	ENABLE_SQL_DATABASE=1
+-	ENABLE_STYLE_SCOPED=0
+-	ENABLE_SVG_DOM_OBJC_BINDINGS=0
+-	ENABLE_TEMPLATE_ELEMENT=0
+-	ENABLE_TEXT_AUTOSIZING=0
+-	ENABLE_TOUCH_EVENTS=0
+-	ENABLE_TOUCH_ICON_LOADING=0
+-	ENABLE_USER_TIMING=0
+-	ENABLE_VIBRATION=0
+-	ENABLE_VIDEO_TRACK=0
+-	ENABLE_WEB_AUDIO=0
+-	ENABLE_WEB_SOCKETS=1
+-	ENABLE_WEB_TIMING=1
+-	ENABLE_WORKERS=1
+read DEFAULT_FEATURE_DEFINES <<"EOF"
+	ENABLE_ACCELERATED_2D_CANVAS=0 \
+	ENABLE_BATTERY_STATUS=0 \
+	ENABLE_BLOB=1 \
+	ENABLE_CANVAS_PATH=0 \
+	ENABLE_CANVAS_PROXY=0 \
+	ENABLE_CHANNEL_MESSAGING=1 \
+	ENABLE_CSP_NEXT=0 \
+	ENABLE_CSS3_TEXT=0 \
+	ENABLE_CSS_BOX_DECORATION_BREAK=1 \
+	ENABLE_CSS_COMPOSITING=0 \
+	ENABLE_CSS_DEVICE_ADAPTATION=0 \
+	ENABLE_CSS_EXCLUSIONS=1 \
+	ENABLE_CSS_IMAGE_ORIENTATION=0 \
+	ENABLE_CSS_IMAGE_RESOLUTION=0 \
+	ENABLE_CSS_IMAGE_SET=0 \
+	ENABLE_CSS_REGIONS=0 \
+	ENABLE_CSS_STICKY_POSITION=0 \
+	ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=0 \
+	ENABLE_CSS_VARIABLES=0 \
+	ENABLE_CSS3_CONDITIONAL_RULES=0 \
+	ENABLE_CUSTOM_SCHEME_HANDLER=0 \
+	ENABLE_DASHBOARD_SUPPORT=0 \
+	ENABLE_DATALIST_ELEMENT=0 \
+	ENABLE_DATA_TRANSFER_ITEMS=0 \
+	ENABLE_DETAILS_ELEMENT=1 \
+	ENABLE_DEVICE_ORIENTATION=0 \
+	ENABLE_DIALOG_ELEMENT=0 \
+	ENABLE_DIRECTORY_UPLOAD=0 \
+	ENABLE_DOM4_EVENTS_CONSTRUCTOR=0 \
+	ENABLE_DOWNLOAD_ATTRIBUTE=0 \
+	ENABLE_FILE_SYSTEM=0 \
+	ENABLE_FILTERS=1 \
+	ENABLE_FTPDIR=0 \
+	ENABLE_FULLSCREEN_API=1 \
+	ENABLE_HIGH_DPI_CANVAS=0 \
+	ENABLE_ICONDATABASE=1 \
+	ENABLE_IFRAME_SEAMLESS=1 \
+	ENABLE_INDEXED_DATABASE=0 \
+	ENABLE_INPUT_SPEECH=0 \
+	ENABLE_INPUT_TYPE_COLOR=0 \
+	ENABLE_INPUT_TYPE_DATE=0 \
+	ENABLE_INPUT_TYPE_DATETIME=0 \
+	ENABLE_INPUT_TYPE_DATETIMELOCAL=0 \
+	ENABLE_INPUT_TYPE_MONTH=0 \
+	ENABLE_INPUT_TYPE_TIME=0 \
+	ENABLE_INPUT_TYPE_WEEK=0 \
+	ENABLE_INSPECTOR=1 \
+	ENABLE_JAVASCRIPT_DEBUGGER=1 \
+	ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \
+	ENABLE_LEGACY_NOTIFICATIONS=0 \
+	ENABLE_LEGACY_VENDOR_PREFIXES=1 \
+	ENABLE_LEGACY_WEB_AUDIO=0 \
+	ENABLE_LINK_PREFETCH=0 \
+	ENABLE_LINK_PRERENDER=0 \
+	ENABLE_MATHML=0 \
+	ENABLE_MEDIA_CAPTURE=0 \
+	ENABLE_MEDIA_SOURCE=0 \
+	ENABLE_MEDIA_STATISTICS=0 \
+	ENABLE_MEDIA_STREAM=0 \
+	ENABLE_METER_ELEMENT=1 \
+	ENABLE_MHTML=1 \
+	ENABLE_MICRODATA=0 \
+	ENABLE_MOUSE_CURSOR_SCALE=0 \
+	ENABLE_NAVIGATOR_CONTENT_UTILS=0 \
+	ENABLE_NETSCAPE_PLUGIN_API=1 \
+	ENABLE_NETWORK_INFO=0 \
+	ENABLE_NOTIFICATIONS=0 \
+	ENABLE_ORIENTATION_EVENTS=0 \
+	ENABLE_PAGE_VISIBILITY_API=0 \
+	ENABLE_PERFORMANCE_TIMELINE=0 \
+	ENABLE_PROGRESS_ELEMENT=1 \
+	ENABLE_PROXIMITY_EVENTS=0 \
+	ENABLE_QUOTA=0 \
+	ENABLE_RESOURCE_TIMING=0 \
+	ENABLE_REQUEST_ANIMATION_FRAME=1 \
+	ENABLE_SCRIPTED_SPEECH=0 \
+	ENABLE_SHADOW_DOM=1 \
+	ENABLE_SHARED_WORKERS=1 \
+	ENABLE_SMOOTH_SCROLLING=1 \
+	ENABLE_SQL_DATABASE=1 \
+	ENABLE_STYLE_SCOPED=0 \
+	ENABLE_SVG_DOM_OBJC_BINDINGS=0 \
+	ENABLE_TEMPLATE_ELEMENT=0 \
+	ENABLE_TEXT_AUTOSIZING=0 \
+	ENABLE_TOUCH_EVENTS=0 \
+	ENABLE_TOUCH_ICON_LOADING=0 \
+	ENABLE_USER_TIMING=0 \
+	ENABLE_VIBRATION=0 \
+	ENABLE_VIDEO_TRACK=0 \
+	ENABLE_WEB_AUDIO=0 \
+	ENABLE_WEB_SOCKETS=1 \
+	ENABLE_WEB_TIMING=1 \
+	ENABLE_WORKERS=1 \
+ 	ENABLE_XHR_TIMEOUT=1
+ EOF
+ 
+@@ -21501,7 +21489,7 @@ fi
+ 
+ # We need to run this command now rather than use AC_CONFIG_COMMANDS
+ # because automake rules depend on the output file (WebKitFeatures.txt).
+-$srcdir/Tools/gtk/generate-feature-defines-files $DEFAULT_FEATURE_DEFINES
+${MODPY_BIN} $srcdir/Tools/gtk/generate-feature-defines-files $DEFAULT_FEATURE_DEFINES
+ 
+ 
+ 
--- a/www/webkit/pkg/PLIST
+++ b/www/webkit/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.17 2012/04/03 15:39:35 landry Exp $
+@comment $OpenBSD: PLIST,v 1.18 2013/04/13 09:11:02 landry Exp $
 %%gtk3%%
 !%%gtk3%%
 include/webkitgtk-${WEBKIT_API_VERSION}/
@ -7,155 +7,19 @@ include/webkitgtk-${WEBKIT_API_VERSION}/JavaScriptCore/JSBase.h
 include/webkitgtk-${WEBKIT_API_VERSION}/JavaScriptCore/JSContextRef.h
 include/webkitgtk-${WEBKIT_API_VERSION}/JavaScriptCore/JSObjectRef.h
 include/webkitgtk-${WEBKIT_API_VERSION}/JavaScriptCore/JSStringRef.h
-include/webkitgtk-${WEBKIT_API_VERSION}/JavaScriptCore/JSStringRefBSTR.h
-include/webkitgtk-${WEBKIT_API_VERSION}/JavaScriptCore/JSStringRefCF.h
 include/webkitgtk-${WEBKIT_API_VERSION}/JavaScriptCore/JSValueRef.h
 include/webkitgtk-${WEBKIT_API_VERSION}/JavaScriptCore/JavaScript.h
-include/webkitgtk-${WEBKIT_API_VERSION}/JavaScriptCore/JavaScriptCore.h
 include/webkitgtk-${WEBKIT_API_VERSION}/JavaScriptCore/WebKitAvailability.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit/
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMAttr.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMBarInfo.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMBlob.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMCDATASection.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMCSSRule.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMCSSRuleList.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMCSSStyleDeclaration.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMCSSStyleSheet.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMCSSValue.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMCharacterData.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMComment.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMConsole.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMCustom.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMDOMApplicationCache.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMDOMImplementation.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMDOMMimeType.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMDOMMimeTypeArray.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMDOMPlugin.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMDOMPluginArray.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMDOMSelection.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMDOMSettableTokenList.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMDOMStringList.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMDOMStringMap.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMDOMTokenList.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMDOMWindow.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMDatabase.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMDocument.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMDocumentFragment.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMDocumentType.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMEntityReference.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMEvent.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMEventTarget.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMFile.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMFileList.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMGeolocation.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLAnchorElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLAppletElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLAreaElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLAudioElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLBRElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLBaseElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLBaseFontElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLBodyElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLButtonElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLCanvasElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLCollection.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLDListElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLDetailsElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLDirectoryElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLDivElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLDocument.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLEmbedElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLFieldSetElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLFontElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLFormElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLFrameElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLFrameSetElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLHRElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLHeadElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLHeadingElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLHtmlElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLIFrameElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLImageElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLInputElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLKeygenElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLLIElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLLabelElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLLegendElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLLinkElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLMapElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLMarqueeElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLMediaElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLMenuElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLMetaElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLModElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLOListElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLObjectElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLOptGroupElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLOptionElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLOptionsCollection.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLParagraphElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLParamElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLPreElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLQuoteElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLScriptElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLSelectElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLStyleElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLTableCaptionElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLTableCellElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLTableColElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLTableElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLTableRowElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLTableSectionElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLTextAreaElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLTitleElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLUListElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHTMLVideoElement.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMHistory.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMLocation.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMMediaError.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMMediaList.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMMediaQueryList.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMMemoryInfo.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMMessagePort.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMMouseEvent.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMNamedNodeMap.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMNavigator.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMNode.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMNodeFilter.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMNodeIterator.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMNodeList.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMObject.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMProcessingInstruction.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMRange.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMScreen.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMStorage.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMStyleMedia.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMStyleSheet.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMStyleSheetList.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMText.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMTimeRanges.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMTreeWalker.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMUIEvent.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMValidityState.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMWebKitAnimation.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMWebKitAnimationList.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMWebKitNamedFlow.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMWebKitPoint.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMXPathExpression.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMXPathNSResolver.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/WebKitDOMXPathResult.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit/webkit.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit/webkitapplicationcache.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit/webkitdefines.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit/webkitdom.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit/webkitdomdefines.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit/webkitdownload.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit/webkitenumtypes.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit/webkiterror.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit/webkitfavicondatabase.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit/webkitfilechooserrequest.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit/webkitgeolocationpolicydecision.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit/webkitglobals.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit/webkithittestresult.h
@ -185,6 +49,7 @@ include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKAPICast.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKAPICastGtk.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKAPICastSoup.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKApplicationCacheManager.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKArray.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKAuthenticationChallenge.h
@ -193,12 +58,17 @@ include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKBackForwardList.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKBackForwardListItem.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKBase.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKBaseGtk.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKBaseSoup.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKBatteryManager.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKBatteryStatus.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKCertificateInfo.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKColorPickerResultListener.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKConnectionRef.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKContext.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKContextMenuItem.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKContextMenuItemTypes.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKContextPrivate.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKContextSoup.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKCookieManager.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKCredential.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKCredentialTypes.h
@ -212,6 +82,7 @@ include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKFindOptions.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKFormSubmissionListener.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKFrame.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKFramePolicyListener.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKFullScreenClientGtk.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKGeolocationManager.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKGeolocationPermissionRequest.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKGeolocationPosition.h
@ -222,12 +93,15 @@ include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKGraphicsContextGtk.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKHitTestResult.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKImage.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKInspector.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKInspectorClientGtk.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKKeyValueStorageManager.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKMediaCacheManager.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKMutableArray.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKMutableDictionary.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKNativeEvent.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKNavigationData.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKNetworkInfo.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKNetworkInfoManager.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKNotification.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKNotificationManager.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKNotificationPermissionRequest.h
@ -239,17 +113,21 @@ include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKPage.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKPageGroup.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKPageLoadTypes.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKPagePrivate.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKPageVisibilityTypes.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKPluginSiteDataManager.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKPreferences.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKPreferencesPrivate.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKProtectionSpace.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKProtectionSpaceTypes.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKRenderLayer.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKRenderObject.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKResourceCacheManager.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKRetainPtr.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKSecurityOrigin.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKSerializedScriptValue.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKSerializedScriptValuePrivate.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKSharedAPICast.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKSoupRequestManager.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKString.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKStringPrivate.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKTextChecker.h
@ -258,29 +136,207 @@ include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKURL.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKURLRequest.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKURLResponse.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKUserContentURLPattern.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKVibration.cpp
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WKView.h
-include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WebKit2.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKit2/WebKit2_C.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitBackForwardList.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitBackForwardListItem.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitContextMenu.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitContextMenuActions.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitContextMenuItem.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitCookieManager.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitDefines.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitDownload.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitEditingCommands.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitEnumTypes.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitError.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitFaviconDatabase.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitFileChooserRequest.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitFindController.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitFormSubmissionRequest.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitForwardDeclarations.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitGeolocationPermissionRequest.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitHitTestResult.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitJavascriptResult.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitMimeInfo.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitNavigationPolicyDecision.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitPermissionRequest.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitPlugin.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitPolicyDecision.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitPrintOperation.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitResponsePolicyDecision.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitScriptDialog.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitSecurityManager.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitSettings.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitURIRequest.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitURIResponse.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitURISchemeRequest.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitVersion.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitWebContext.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitWebExtension.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitWebInspector.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitWebPage.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitWebResource.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitWebView.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitWebViewBase.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitWebViewGroup.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/WebKitWindowProperties.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/webkit-web-extension.h
 include/webkitgtk-${WEBKIT_API_VERSION}/webkit2/webkit2.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMAttr.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMBarInfo.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMBlob.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMCDATASection.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMCSSRule.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMCSSRuleList.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMCSSStyleDeclaration.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMCSSStyleSheet.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMCSSValue.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMCharacterData.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMComment.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMConsole.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMCustom.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDOMApplicationCache.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDOMImplementation.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDOMMimeType.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDOMMimeTypeArray.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDOMNamedFlowCollection.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDOMPlugin.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDOMPluginArray.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDOMSecurityPolicy.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDOMSelection.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDOMSettableTokenList.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDOMStringList.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDOMStringMap.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDOMTokenList.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDOMWindow.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDOMWindowCSS.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDatabase.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDocument.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDocumentFragment.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMDocumentType.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMEntityReference.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMEvent.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMEventTarget.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMFile.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMFileList.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMGamepad.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMGamepadList.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMGeolocation.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLAnchorElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLAppletElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLAreaElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLAudioElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLBRElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLBaseElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLBaseFontElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLBodyElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLButtonElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLCanvasElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLCollection.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLDListElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLDetailsElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLDirectoryElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLDivElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLDocument.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLEmbedElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLFieldSetElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLFontElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLFormElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLFrameElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLFrameSetElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLHRElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLHeadElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLHeadingElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLHtmlElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLIFrameElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLImageElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLInputElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLKeygenElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLLIElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLLabelElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLLegendElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLLinkElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLMapElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLMarqueeElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLMediaElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLMenuElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLMetaElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLModElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLOListElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLObjectElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLOptGroupElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLOptionElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLOptionsCollection.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLParagraphElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLParamElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLPreElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLPropertiesCollection.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLQuoteElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLScriptElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLSelectElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLStyleElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLTableCaptionElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLTableCellElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLTableColElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLTableElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLTableRowElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLTableSectionElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLTextAreaElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLTitleElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLUListElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHTMLVideoElement.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMHistory.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMLocation.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMMediaError.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMMediaList.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMMediaQueryList.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMMemoryInfo.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMMessagePort.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMMicroDataItemValue.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMMouseEvent.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMNamedNodeMap.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMNavigator.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMNode.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMNodeFilter.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMNodeIterator.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMNodeList.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMObject.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMPerformance.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMPerformanceEntry.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMPerformanceEntryList.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMPerformanceNavigation.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMPerformanceTiming.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMProcessingInstruction.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMPropertyNodeList.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMRange.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMScreen.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMShadowRoot.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMStorage.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMStorageInfo.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMStyleMedia.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMStyleSheet.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMStyleSheetList.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMText.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMTextTrack.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMTextTrackCue.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMTextTrackCueList.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMTextTrackList.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMTimeRanges.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMTrackEvent.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMTreeWalker.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMUIEvent.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMValidityState.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMWebKitNamedFlow.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMWebKitPoint.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMXPathExpression.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMXPathNSResolver.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/WebKitDOMXPathResult.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/webkitdom.h
+include/webkitgtk-${WEBKIT_API_VERSION}/webkitdom/webkitdomdefines.h
 lib/girepository-1.0/JSCore-${WEBKIT_API_VERSION}.typelib
 lib/girepository-1.0/WebKit-${WEBKIT_API_VERSION}.typelib
 lib/libjavascriptcoregtk-${WEBKIT_API_VERSION}.la
@ -290,6 +346,7 @@ share/gir-1.0/JSCore-${WEBKIT_API_VERSION}.gir
 share/gir-1.0/WebKit-${WEBKIT_API_VERSION}.gir
 share/gtk-doc/html/webkitgtk-${WEBKIT_API_VERSION}/
 share/gtk-doc/html/webkitgtk-${WEBKIT_API_VERSION}/WebKitFaviconDatabase.html
+share/gtk-doc/html/webkitgtk-${WEBKIT_API_VERSION}/WebKitFileChooserRequest.html
 share/gtk-doc/html/webkitgtk-${WEBKIT_API_VERSION}/WebKitGeolocationPolicyDecision.html
 share/gtk-doc/html/webkitgtk-${WEBKIT_API_VERSION}/WebKitHitTestResult.html
 share/gtk-doc/html/webkitgtk-${WEBKIT_API_VERSION}/WebKitIconDatabase.html
@ -356,42 +413,48 @@ share/gtk-doc/html/webkitgtk-${WEBKIT_API_VERSION}/webkitgtk-Global-functions.ht
 share/gtk-doc/html/webkitgtk-${WEBKIT_API_VERSION}/webkitgtk-webkitdownload.html
 share/gtk-doc/html/webkitgtk-${WEBKIT_API_VERSION}/webkitgtk-webkitwebview.html
 share/gtk-doc/html/webkitgtk-${WEBKIT_API_VERSION}/webkitgtk.devhelp2
-share/locale/ar/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/bg/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/cs/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/de/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/el/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/en_CA/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/en_GB/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/eo/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/es/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/et/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/eu/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/fr/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/gl/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/gu/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/he/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/hu/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/id/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/it/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/ko/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/lt/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/lv/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/mr/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/nb/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/nl/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/pa/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/pl/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/pt/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/pt_BR/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/ru/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/sl/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/sr/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/sr@latin/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/sv/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/uk/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/vi/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
-share/locale/zh_CN/LC_MESSAGES/webkit-${GTK_API_VERSION}.mo
+share/locale/ar/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/as/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/bg/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/cs/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/de/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/el/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/en_CA/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/en_GB/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/eo/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/es/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/et/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/eu/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/fr/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/gl/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/gu/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/he/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/hi/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/hu/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/id/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/it/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/kn/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/ko/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/lt/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/lv/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/mr/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/nb/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/nl/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/or/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/pa/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/pl/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/pt/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/pt_BR/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/ro/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/ru/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/sl/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/sr/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/sr@latin/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/sv/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/te/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/uk/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/vi/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
+share/locale/zh_CN/LC_MESSAGES/WebKitGTK-${GTK_API_VERSION}.mo
 share/webkitgtk-${WEBKIT_API_VERSION}/
 share/webkitgtk-${WEBKIT_API_VERSION}/images/
 share/webkitgtk-${WEBKIT_API_VERSION}/images/deleteButton.png
@ -413,22 +476,26 @@ share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/AuditLauncherView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/AuditResultView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/AuditRules.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/AuditsPanel.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/BinarySearch.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/BottomUpProfileDataGridTree.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/BreakpointManager.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/BreakpointsSidebarPane.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/CSSCompletions.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/CSSKeywordCompletions.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/CPUProfileView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/CSSMetadata.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/CSSNamedFlowCollectionsView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/CSSNamedFlowView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/CSSSelectorProfileView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/CSSStyleModel.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/CallStackSidebarPane.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/CanvasProfileView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Checkbox.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/CodeMirrorTextEditor.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Color.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/CompilerSourceMapping.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/CompilerScriptMapping.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ConsoleMessage.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ConsoleModel.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ConsolePanel.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ConsoleView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ContentProvider.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ContentProviders.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ContextMenu.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/CookieItemsView.js
@ -436,6 +503,8 @@ share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/CookieParser.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/CookiesTable.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DOMAgent.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DOMBreakpointsSidebarPane.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DOMCountersGraph.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DOMExtension.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DOMPresentationUtils.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DOMStorage.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DOMStorageItemsView.js
@ -445,12 +514,15 @@ share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Database.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DatabaseQueryView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DatabaseTableView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DebuggerModel.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DebuggerPresentationModel.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DetailedHeapshotGridNodes.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DetailedHeapshotView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DebuggerScriptMapping.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DefaultScriptMapping.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DefaultTextEditor.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Dialog.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DirectoryContentView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/DockController.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Drawer.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ElementsPanel.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ElementsPanelDescriptor.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ElementsTreeOutline.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/EmptyView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/EventListenersSidebarPane.js
@ -459,18 +531,32 @@ share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ExtensionAuditCategory.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ExtensionPanel.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ExtensionRegistryStub.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ExtensionServer.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ExtensionView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/FileContentView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/FileManager.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/FileMapping.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/FileSystemMapping.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/FileSystemModel.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/FileSystemProjectDelegate.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/FileSystemView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/FileUtils.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/FilteredItemSelectionDialog.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/FontView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/GoToLineDialog.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/HAREntry.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/HandlerRegistry.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/HeapSnapshot.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/HeapSnapshotDataGrids.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/HeapSnapshotGridNodes.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/HeapSnapshotLoader.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/HeapSnapshotProxy.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/HeapSnapshotView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/HeapSnapshotWorker.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/HeapSnapshotWorkerDispatcher.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/HelpScreen.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ImageView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/addIcon.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/applicationCache.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/back.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/breakpointBorder.png
@ -501,6 +587,7 @@ share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/domain.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/errorIcon.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/errorMediumIcon.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/errorRedDot.png
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/fileSystem.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/forward.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/frame.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/glossyHeader.png
@ -514,7 +601,7 @@ share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/indexedDB.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/indexedDBIndex.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/indexedDBObjectStore.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/localStorage.png
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/navigatorPinButton.png
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/namedFlowOverflow.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/navigatorShowHideButton.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/paneAddButtons.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/paneBottomGrow.png
@ -532,6 +619,9 @@ share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/profileSmallIcon.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/profilesSilhouette.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/programCounterBorder.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/radioDot.png
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/regionEmpty.png
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/regionFit.png
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/regionOverset.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/resourceCSSIcon.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/resourceDocumentIcon.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/resourceDocumentIconSmall.png
@ -541,6 +631,8 @@ share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/resourcePlainIconSmall
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/resourcesSizeGraphIcon.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/resourcesTimeGraphIcon.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/scriptsSilhouette.png
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/searchNext.png
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/searchPrev.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/searchSmallBlue.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/searchSmallBrightBlue.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/searchSmallGray.png
@ -559,12 +651,8 @@ share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/spinnerInactive.gif
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/spinnerInactiveSelected.gif
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/splitviewDimple.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/splitviewDividerBackground.png
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/statusbarBackground.png
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/statusbarBottomBackground.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/statusbarButtonGlyphs.png
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/statusbarButtons.png
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/statusbarMenuButton.png
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/statusbarMenuButtonSelected.png
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/statusbarButtonGlyphs2x.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/statusbarResizerHorizontal.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/statusbarResizerVertical.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/successGreenDot.png
@ -574,15 +662,7 @@ share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/thumbHoriz.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/thumbHoverHoriz.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/thumbHoverVert.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/thumbVert.png
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/timelineBarBlue.png
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/timelineBarGray.png
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/timelineBarGreen.png
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/timelineBarOrange.png
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/timelineBarPurple.png
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/timelineBarRed.png
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/timelineBarYellow.png
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/timelineCheckmarks.png
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/timelineDots.png
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/tickMark.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/timelineHollowPillBlue.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/timelineHollowPillGray.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/timelineHollowPillGreen.png
@ -616,57 +696,82 @@ share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/warningMediumIcon.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/warningOrangeDot.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Images/warningsErrors.png
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/IndexedDBModel.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/InjectedFakeWorker.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/IndexedDBViews.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/InspectorBackend.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/InspectorBackendStub.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/InspectorBackendCommands.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/InspectorFrontendAPI.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/InspectorFrontendHostStub.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/InspectorView.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/JavaScriptContextManager.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/IsolatedFileSystem.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/IsolatedFileSystemManager.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/JSHeapSnapshot.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/JavaScriptFormatter.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/JavaScriptSourceFrame.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/KeyboardShortcut.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Linkifier.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/LiveEditSupport.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/MemoryStatistics.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/MetricsSidebarPane.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/NativeBreakpointsSidebarPane.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/NativeHeapSnapshot.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/NativeMemoryGraph.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/NativeMemorySnapshotView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/NavigatorOverlayController.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/NavigatorView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/NetworkItemView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/NetworkLog.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/NetworkManager.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/NetworkPanel.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/NetworkPanelDescriptor.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/NetworkRequest.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/NetworkUISourceCodeProvider.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Object.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ObjectPopoverHelper.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ObjectPropertiesSection.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/OverridesView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Panel.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/PanelEnablerView.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/PartialQuickSort.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ParsedURL.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Placard.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Popover.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/PresentationConsoleMessageHelper.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ProfileDataGridTree.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ProfileLauncherView.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ProfileView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ProfilesPanel.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ProfilesPanelDescriptor.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Progress.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ProgressIndicator.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/PropertiesSection.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/PropertiesSidebarPane.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/RawSourceCode.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/RemoteObject.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/RequestCookiesView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/RequestHTMLView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/RequestHeadersView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/RequestJSONView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/RequestPreviewView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/RequestResponseView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/RequestTimingView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/RequestView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Resource.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ResourceCategory.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ResourceCookiesView.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ResourceHTMLView.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ResourceHeadersView.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ResourceJSONView.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ResourcePreviewView.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ResourceResponseView.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ResourceTimingView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ResourceScriptMapping.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ResourceTreeModel.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ResourceType.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ResourceUtils.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ResourceView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ResourceWebSocketFrameView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ResourcesPanel.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/RevisionHistoryView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/RuntimeModel.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SASSSourceMapping.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ScopeChainSidebarPane.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Script.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ScriptFormatter.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ScriptFormatterWorker.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ScriptSnippetModel.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ScriptsNavigator.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ScriptsPanel.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ScriptsPanelDescriptor.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ScriptsSearchScope.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SearchController.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Section.js
@ -677,40 +782,61 @@ share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ShowMoreDataGridNode.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SidebarOverlay.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SidebarPane.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SidebarTreeElement.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SidebarView.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SimpleWorkspaceProvider.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SnippetJavaScriptSourceFrame.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SnippetStorage.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SoftContextMenu.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SourceCSSTokenizer.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SourceFrame.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SourceHTMLTokenizer.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SourceJavaScriptTokenizer.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SourceMap.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SourceMapping.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SourceTokenizer.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Spectrum.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SplitView.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/StatusBarButton.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/StyleSheetOutlineDialog.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/StylesSidebarPane.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/StylesSourceMapping.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/SuggestBox.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TabbedEditorContainer.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TabbedPane.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TestController.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TextEditor.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TextEditorHighlighter.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TextEditorModel.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TextPrompt.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TextViewer.js
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TimelineAgent.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TextUtils.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TimelineFrameController.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TimelineGrid.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TimelineManager.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TimelineModel.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TimelineOverviewPane.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TimelinePanel.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TimelinePanelDescriptor.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TimelinePresentationModel.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Toolbar.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/TopDownProfileDataGridTree.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/UISourceCode.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/UISourceCodeFrame.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/UIString.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/UIUtils.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/UglifyJS/
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/UglifyJS/parse-js.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/UserAgentSupport.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/UserMetrics.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/View.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/ViewportControl.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/WatchExpressionsSidebarPane.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/WorkerManager.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/WorkersSidebarPane.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/Workspace.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/auditsPanel.css
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/breadcrumbList.css
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/canvasProfiler.css
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/cssNamedFlows.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/dataGrid.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/dialog.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/elementsPanel.css
@ -718,12 +844,17 @@ share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/externs.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/filteredItemSelectionDialog.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/heapProfiler.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/helpScreen.css
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/indexedDBViews.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/inspector.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/inspector.html
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/inspector.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/inspectorCommon.css
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/inspectorPageIndex.html
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/inspectorSyntaxHighlight.css
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/jsdifflib.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/localizedStrings.js
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/nativeMemoryProfiler.css
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/navigatorView.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/networkLogView.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/networkPanel.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/panelEnablerView.css
@ -731,11 +862,14 @@ share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/popover.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/profilesPanel.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/resourceView.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/resourcesPanel.css
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/revisionHistory.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/scriptsPanel.css
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/spectrum.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/splitView.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/tabbedPane.css
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/test-runner.html
+share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/textEditor.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/textPrompt.css
-share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/textViewer.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/timelinePanel.css
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/treeoutline.js
 share/webkitgtk-${WEBKIT_API_VERSION}/webinspector/utilities.js