Update to 2.4.4, the latest stable release. Based on work by

Leonardo Taccari in wip.

Changes:

=================
WebKitGTK+  2.4.4
=================

What's new in WebKitGTK+ 2.4.4?

  - Fix annoying popup shown when visiting 8tracks.com.
  - Expose links rendered as blocks to accessibility.
  - Make text inside "span" block in "a" block accessible.
  - Implement windowed plugins visibility.
  - Fix the GObject introspection annotations of webkit_web_resource_get_data_finish().
  - Fix a crash in TSymbolTableLevel::~TSymbolTableLevel when WebKit
    is built with GCC 4.9.
  - Fix a crash when playing a video in facebook.
  - Several user agent changes to fix Google Maps and a few other issues.
  - Allo to include WebKitVersion.h from web extensions API too.
  - Fix web process leak when closing pages with network process enabled.
  - Fix the build with --disable-webgl --disable-accelerated-compositing.

=================
WebKitGTK+  2.4.3
=================

What's new in WebKitGTK+ 2.4.3?

  - Fix video playback rate used when resuming in GStreamer media backend.
  - Use GstMetaVideo as announced by WebKitVideoSink to fix some
    decoders and filters that rely on buffer's meta rather that in the
    caps structures.
  - Do not pass a valid pointer as redirected-response parameter to
    WebKitWebPage::send-request signal when not redirecting.
  - Add missing files to the build required for building in Windows.

=================
WebKitGTK+  2.4.2
=================

What's new in WebKitGTK+ 2.4.2?

  - Correctly handle TLS errors in case of a server redirection.
  - Fix a crash when submitting a form.
  - Fix several JavaScriptCore crashes when browsing facebook.
  - Fix a crash when closing a page with windowed plugins.
  - Fix a crash after getting web view context property with g_object_get.
  - Fix a new[] delete[] mismatch in SocketStreamHandleSoup.

=================
WebKitGTK+  2.4.1
=================

What's new in WebKitGTK+ 2.4.1?

  - Add CORS support for media elements to GStreamer media backend.
  - Fix wrong flags used in fcntl call that failed in FreeBSD.
  - Correctly handle HTTP authentication for cross-origin requests.
  - Correctly handle cookies for cross-origin requests.
  - Fix a crash in the plugin process with some plugins that redefine
    NPN functions.
  - Fix acceletared video when the video format has an alpha component.
  - Fix sites using geolocation after reloading when using Geoclue2.
  - Append Safari version to UserAgent to fix redirections in
    www.globalforestwatch.org.

=================
WebKitGTK+  2.4.0
=================

What's new in WebKitGTK+ 2.4.0?

  - Fix infinite loop in WebProcess due to a race condition that can
    happen when the socket event source is cancelled.
  - Fix more runtime critical warnings about main loop sources not found
    when trying to remove them.
  - Lower the timeout used when waiting for the ShoulTerminate reply
    in the WebProcess to release unused processes earlier.
  - Fix the build for non X11 platforms.

=================
WebKitGTK+ 2.3.92
=================

What's new in WebKitGTK+ 2.3.92?

  - Add support for Geoclue2.
  - Always finalize the soup session object when the networking
    process finishes.
  - Make sure the web process doesn't finish if there's an ongoing
    print operation.
  - Fix runtime critical warnings about main loop sources not found
    when trying to remove them.
  - Fixed several crashes in JavaScriptCore when visiting facebook.
  - Improve CSS properties performance.
  - Fix web process leak when the WebView is leaked by the application.
  - Fix the build when using vala bindings due to UI and web process
    main headers included together.

=================
WebKitGTK+ 2.3.91
=================

What's new in WebKitGTK+ 2.3.91?

  - Use a persistent cache for plugins metadata to avoid blocking the
    UI while scanning plugins during page loads.
  - Make the web inspector always load in multiprocess mode.
  - Add a pkg-config file for WebKit2 web process extensions API.
  - Fix the generation of g_return macros for GObject DOM bindings in
    some cases where non pointer parameters were handled as pointers.
  - Enable DFG_JIT on FreeBSD.
  - Use system default compiler instead of gcc when building DOM
    generated sources.
  - Several build fixes for FreeBSD.
  - Fix the build with wayland support enabled.

=================
WebKitGTK+ 2.3.90
=================

What's new in WebKitGTK+ 2.3.90?

  - Add initial touch support to WebKit2.
  - Add API to create a WebKitWebView related to another one to share
    the same Web Process.
  - Create the inspector view using the same web process as the
    inspected page.
  - Fix wrong mix of fcntl commands and flags in WebKit2.
  - Fix marshaller used in WebKitWebPage::document-loaded signal.
  - Fix a crash in GStreamer media backend when playback rate is too high.
  - Fix the build on FreeBSD.

=================
WebKitGTK+  2.3.5
=================

What's new in WebKitGTK+ 2.3.5?

  - Add API to allow setting a multiple web process model.
  - Add API to pass initialization user data from the UI process to
    the web extensions.
  - Implement languages support with network process.
  - Implement custom URI schemes with network process.
  - Disable MemoryCache when the DOCUMENT_VIEWER cache model is set.
  - Expose aria-describedby with ATK_RELATION_DESCRIBED_BY.
  - Fix a bug that prevented from entering fullscreen again in HTML5
    videos after fullscreen was left with ESC.
  - Set playback rate when pipeline is not ready in GStreamer media backend.
  - Fix a lockup when playing Icecast radio in GStreamer media backend.
  - Fix a web process crash when a download is cancelled.
  - Fix several crashes when printing via JavaScript.

=================
WebKitGTK+  2.3.4
=================

What's new in WebKitGTK+ 2.3.4?

  - Add API to WebKitResponsePolicyDecision to check if the MIME type
    can be shown.
  - Enable fullscreen API by default.
  - Fix handling of HTTP certificates with the network process enabled.
  - Fix downloads with the network process enabled.
  - Fix handling of cookies when network process is enabled.
  - Remove the partial file downloaded when the download operation
    fails or is cancelled.
  - Make WebKitWebPage::send-request signal work after a redirect.
  - Add xdg.origin.url extended attribute to downloads in WebKit2.
  - Fix WebGL with GLES.
  - Translation updates: Dutch, Brazilian Portuguese.

=================
WebKitGTK+  2.3.3
=================

What's new in WebKitGTK+ 2.3.3?

  - Initial Network Process support disabled by default.
  - CSS regions are now enabled by default.
  - Support right-side attachment of the inspector in WebKit2.
  - Add spatial navigation setting to WebKit2 GTK+ API.
  - Add media source setting to both WebKit1 and WebKit2.
  - Support custom types for drag and drop data.
  - Avoid extra copy when drawing images in cairo backend.
  - Fix scrolling in combo boxes when the dropdown menu is larger than
    the screen.
  - Render AC layers also when using GTK+ 2 in WebKit1.
  - Fix return value of webkit_web_view_get_view_source_mode() in
    WebKit1.
  - Emit stream-start, caps and segment events in webkitwebaudiosrc
    element.
  - Fix seeking on media content provided by servers not supporting
    range requests.
  - Fix a crash when using media source in GStreamer media backend.
  - Fix an X11 error when the backing store surface is destroyed.
  - Expose splitter elements with ATK_ROLE_SEPARATOR to accessibility.
  - Expose accessibility objects WAI-ARIA landmark roles.
  - Expose accessibility objects with ATK_ROLE_ARTICLE.
  - Expose accessibility objects with ATK_ROLE_CHECK_MENU_ITEM.
  - Remove support for GStreamer 0.10.
  - Memory leak due to incorrect use of gst_tag_list_merge in
    TextCombinerGStreamer.
  - Translation updates: Brazilian Portuguese.

=================
WebKitGTK+  2.3.2
=================

What's new in WebKitGTK+ 2.3.2?

  - Add enable-media-stream setting to WebKit2 GTK+ API.
  - Fix a crash when load fails due to SSL errors in WebKit2.
  - Fix a crash when printing via JavaScript in WebKit2.
  - Add support audio and video tracks to GStreamer media backend.
  - Properly expose video and audio elements to accessibility.
  - Fix invalid cairo matrix when drawing too small surfaces.
  - Avoid extra copy when drawing images using cairo.
  - Do not omit playback rate when seeking in GStreamer media backend.
  - Several build fixes on non-linux platforms.

=================
WebKitGTK+  2.3.1
=================

What's new in WebKitGTK+ 2.3.1?

  - Add WebKit2 API for TLS errors.
  - Make EventTarget interface introspectable in GObject DOM bindings.
  - Expose WheelEvent in the GObject DOM bindings API.
  - Generate API documentation for GObject DOM bindings.
  - Respect image orientation by default.
  - Enable text edition undo/redo operations support in WebKit2.
  - Add suppport for blob URLs to GStreamer media backend.
  - Add support for subtitles.
  - Allow running the web process with an arbitrary prefix command in
    debug builds.
  - Expose image links properly to accessibility.
  - Expose title and alternative text for links in image maps to
    accessibility.
  - Cancel the current active WebKitAuthenticationRequest on load
    fail.
  - Fix several memory leaks.

=================
WebKitGTK+  2.1.4
=================

What's new in WebKitGTK+ 2.1.4?

  - Add WebKitWebView::authenticate signal to WebKit2 GTK API.
  - Expose KeyboardEvent in GObject DOM bindings.
  - Implement attributesOfChildren() for AccessibilityUIElement.
  - Implement allAttributes() for AccessibilityUIElement.
  - Fix issues with edge cases when getting offsets for a text range
    in AtkText.
  - Remote inspector server now notifies about errors when loading
    resurces.
  - Disable HTTP request "Accept-Encoding:" header field on gstreamer
    source element to avoid receiving the wrong size when retrieving
    data.
  - Fix the final position when receiving several seek calls in a row,
    in GStreamer media backend.
  - When rendering accelerated video, upload onto the texture only the
    buffer to be painted.
  - Fix response property definition of WebKitResponsePolicyDecision.
  - Fix a crash in WebKit1 when the WebView is created and destroyed
    too fast.
  - Fix a crash in UI process when the web process crashes.
  - Fix a crash in WebKit2 when a context menu item is selected after
    the page has been closed.
  - Fix a crash when getting the editor command for a key event
    initiated by the web inspector.
  - Fix the build when building with GTK+ 2.
  - Fix several memory leaks.

=================
WebKitGTK+  2.1.3
=================

What's new in WebKitGTK+ 2.1.3?

  - Add support for preload="metadata" to GStreamer media backend.
  - Do not expose '\n' for wrapped lines with ATK_TEXT_BOUNDARY_CHAR.
  - Fix potential race condition in GStreamer media backend when
    getting the video sink caps.
  - Fix performance issues rendering a page with animations.
  - Several fixes and improvements in GStreamer video accelerated
    compositing support.
  - Adjust internal size on GStreamer HTTP source element when
    receiving data if necessary.
  - Actually disable the memory cache when DOCUMENT_VIEWER cache model
    is used in WebKit1.
  - Fix runtime critical warning in WebKit2 when unloading a module
    that failed to load.
  - Fix several memory leaks.

=================
WebKitGTK+  2.1.2
=================

What's new in WebKitGTK+ 2.1.2?

  - Set the subresources load priority using new libsoup API available
    in 2.43.
  - Do not use X11 WidgetBackingStore implementation in Wayland.
  - Support using GLContext from multiple threads.
  - Make sure gstreamer source element is thread-safe.
  - Prevent race condition when pad caps is set on gstreamer player.
  - Invalidate the ProcessLauncher when the process is terminated
    before it has finished launching
  - Use custom cairo code instead of Pango API for highlighting
    misspelled words.
  - Respect PKG_CONFIG env variable when generating gtk-doc.
  - Fix a crash due to an assert in gstreamer backend when seeking.
  - Fix memory leak when web process is terminated.
  - Translation updates: Telugu, Hindi, Kannada, Odia.

=================
WebKitGTK+  2.1.1
=================

What's new in WebKitGTK+ 2.1.1?

  - Add webkit_uri_scheme_request_finish_error to WebKit2 GTK+ API.
  - Add a setting to control whether or not accelerated 2D canvas is
    enabled in WebKit2.
  - Add a setting to WebKit2 to allow sending console log messages to
    stdout.
  - Always use EGL to create the GL context when running on Wayland.
  - Fix rendering of WebKitWebView child widgets with recent GTK+.
  - Notify the web process in WebKitURISchemeRequest when we fail to read
    from the user InputStream.
  - Fixed race conditions closing the socket descriptor when the web
    process crashes.
  - Add video accelerated compositing support to the GStreamer backend.
  - Add support for audio/speex MIME type to the GStreamer backend.
  - Fix seek after video finished in GStreamer backend.
  - Initialize WebKitWebPlugin path to prevent double-free in WebKit1.
  - Fix several GObject instrospection warnings.
  - Fixed several memory leaks.

35 files changed, 678 insertions, 1085 deletions

diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 888639fbf1c..a63ee90444a 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2014/06/09 14:18:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.86 2014/08/03 22:30:05 wiz Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
-PKGREVISION=	17
 
 COMMENT=	GTK2 port of the WebKit browser engine
 
diff --git a/www/webkit-gtk/Makefile.common b/www/webkit-gtk/Makefile.common
index 79eb27eb528..ecd7b2cf4dd 100644
--- a/www/webkit-gtk/Makefile.common
+++ b/www/webkit-gtk/Makefile.common
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile.common,v 1.32 2014/05/09 07:37:26 wiz Exp $
+# $NetBSD: Makefile.common,v 1.33 2014/08/03 22:30:05 wiz Exp $
 # used by www/webkit-gtk/Makefile
-# used by www/webkit-gtk3/Makefile
 
-DISTNAME=	webkitgtk-1.10.2
+DISTNAME=	webkitgtk-2.4.4
 CATEGORIES=	www
 MASTER_SITES=	http://www.webkitgtk.org/releases/
 EXTRACT_SUFX=	.tar.xz
@@ -15,29 +14,37 @@ PATCHDIR=		${.CURDIR}/../../www/webkit-gtk/patches
 
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
-USE_TOOLS+=	bison gmake perl:build pkg-config msgfmt
+USE_TOOLS+=	automake bison gmake perl:build pkg-config msgfmt
+# GCC >= 4.7 or Clang >= 3.3
+GCC_REQD=4.8
 
 PKGCONFIG_OVERRIDE=	Source/WebKit/gtk/webkit.pc.in
 
 MAKE_FILE=	GNUmakefile
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS+=	--with-target=x11 \
-			--with-font-backend=freetype
-CONFIGURE_ARGS+=	--disable-geolocation
+CONFIGURE_ARGS+=	--enable-x11-target \
+			--disable-geolocation \
+			--disable-optimizations \
+			--disable-gtk-doc-html
 
 .include "options.mk"
 
 REPLACE_PERL+=	Source/JavaScriptCore/create_hash_table \
-		Source/WebCore/bindings/scripts/generate-bindings.pl \
+		Source/WebCore/bindings/scripts/*.pl \
+		Source/WebCore/bindings/scripts/InFilesCompiler.pm \
 		Source/WebCore/bindings/scripts/InFilesParser.pm \
-		Source/WebCore/platform/text/mac/make-charset-table.pl \
 		Source/WebCore/css/*.pl \
 		Source/WebCore/dom/*.pl \
-		Source/WebCore/inspector/xxd.pl \
 		Source/WebCore/make-hash-tools.pl \
 		Source/WebCore/platform/text/mac/*.pl
 
+REPLACE_PYTHON+=	Tools/gtk/*.py \
+			Tools/gtk/generate-feature-defines-files \
+			Tools/gtk/generate-gtkdoc \
+			Tools/gtk/generate-webkitdom-doc-files
+
+
 .include "../../lang/ruby/rubyversion.mk"
 BUILD_DEPENDS+=	${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 CONFIGURE_ENV+=	RUBY=${RUBY}
@@ -72,15 +79,17 @@ CONFIGURE_ARGS+=	--enable-introspection
 #.include "../../devel/pango/buildlink3.mk"
 # A correct Webkit build requires flex 2.5.33
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 BUILDLINK_API_DEPENDS.png+= png>=1.5.1beta08
 .include "../../graphics/png/buildlink3.mk"
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.30
-.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gstreamer1+=	gstreamer1>=1.0.3
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gst-plugins1-base+=	gst-plugins1-base>=1.0.3
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.42.2nb3
 .include "../../net/libsoup24/buildlink3.mk"
-.include "../../textproc/enchant/buildlink3.mk"
+.include "../../security/libsecret/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/libXdamage/buildlink3.mk"
diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST
index 57118ea09fb..c7d8a84b556 100644
--- a/www/webkit-gtk/PLIST
+++ b/www/webkit-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2013/06/09 13:22:55 obache Exp $
+@comment $NetBSD: PLIST,v 1.22 2014/08/03 22:30:05 wiz Exp $
 bin/jsc-1
 include/webkitgtk-1.0/JavaScriptCore/JSBase.h
 include/webkitgtk-1.0/JavaScriptCore/JSContextRef.h
@@ -7,148 +7,10 @@ include/webkitgtk-1.0/JavaScriptCore/JSStringRef.h
 include/webkitgtk-1.0/JavaScriptCore/JSValueRef.h
 include/webkitgtk-1.0/JavaScriptCore/JavaScript.h
 include/webkitgtk-1.0/JavaScriptCore/WebKitAvailability.h
-include/webkitgtk-1.0/webkit/WebKitDOMAttr.h
-include/webkitgtk-1.0/webkit/WebKitDOMBarInfo.h
-include/webkitgtk-1.0/webkit/WebKitDOMBlob.h
-include/webkitgtk-1.0/webkit/WebKitDOMCDATASection.h
-include/webkitgtk-1.0/webkit/WebKitDOMCSSRule.h
-include/webkitgtk-1.0/webkit/WebKitDOMCSSRuleList.h
-include/webkitgtk-1.0/webkit/WebKitDOMCSSStyleDeclaration.h
-include/webkitgtk-1.0/webkit/WebKitDOMCSSStyleSheet.h
-include/webkitgtk-1.0/webkit/WebKitDOMCSSValue.h
-include/webkitgtk-1.0/webkit/WebKitDOMCharacterData.h
-include/webkitgtk-1.0/webkit/WebKitDOMComment.h
-include/webkitgtk-1.0/webkit/WebKitDOMConsole.h
-include/webkitgtk-1.0/webkit/WebKitDOMCustom.h
-include/webkitgtk-1.0/webkit/WebKitDOMDOMApplicationCache.h
-include/webkitgtk-1.0/webkit/WebKitDOMDOMImplementation.h
-include/webkitgtk-1.0/webkit/WebKitDOMDOMMimeType.h
-include/webkitgtk-1.0/webkit/WebKitDOMDOMMimeTypeArray.h
-include/webkitgtk-1.0/webkit/WebKitDOMDOMPlugin.h
-include/webkitgtk-1.0/webkit/WebKitDOMDOMPluginArray.h
-include/webkitgtk-1.0/webkit/WebKitDOMDOMSecurityPolicy.h
-include/webkitgtk-1.0/webkit/WebKitDOMDOMSelection.h
-include/webkitgtk-1.0/webkit/WebKitDOMDOMSettableTokenList.h
-include/webkitgtk-1.0/webkit/WebKitDOMDOMStringList.h
-include/webkitgtk-1.0/webkit/WebKitDOMDOMStringMap.h
-include/webkitgtk-1.0/webkit/WebKitDOMDOMTokenList.h
-include/webkitgtk-1.0/webkit/WebKitDOMDOMWindow.h
-include/webkitgtk-1.0/webkit/WebKitDOMDatabase.h
-include/webkitgtk-1.0/webkit/WebKitDOMDocument.h
-include/webkitgtk-1.0/webkit/WebKitDOMDocumentFragment.h
-include/webkitgtk-1.0/webkit/WebKitDOMDocumentType.h
-include/webkitgtk-1.0/webkit/WebKitDOMElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMEntityReference.h
-include/webkitgtk-1.0/webkit/WebKitDOMEvent.h
-include/webkitgtk-1.0/webkit/WebKitDOMEventTarget.h
-include/webkitgtk-1.0/webkit/WebKitDOMFile.h
-include/webkitgtk-1.0/webkit/WebKitDOMFileList.h
-include/webkitgtk-1.0/webkit/WebKitDOMGamepad.h
-include/webkitgtk-1.0/webkit/WebKitDOMGamepadList.h
-include/webkitgtk-1.0/webkit/WebKitDOMGeolocation.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLAnchorElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLAppletElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLAreaElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLAudioElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLBRElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLBaseElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLBaseFontElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLBodyElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLButtonElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLCanvasElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLCollection.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLDListElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLDetailsElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLDirectoryElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLDivElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLDocument.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLEmbedElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLFieldSetElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLFontElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLFormElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLFrameElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLFrameSetElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLHRElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLHeadElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLHeadingElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLHtmlElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLIFrameElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLImageElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLInputElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLKeygenElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLLIElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLLabelElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLLegendElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLLinkElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLMapElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLMarqueeElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLMediaElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLMenuElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLMetaElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLModElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLOListElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLObjectElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLOptGroupElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLOptionElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLOptionsCollection.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLParagraphElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLParamElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLPreElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLQuoteElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLScriptElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLSelectElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLStyleElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLTableCaptionElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLTableCellElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLTableColElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLTableElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLTableRowElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLTableSectionElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLTextAreaElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLTitleElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLUListElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHTMLVideoElement.h
-include/webkitgtk-1.0/webkit/WebKitDOMHistory.h
-include/webkitgtk-1.0/webkit/WebKitDOMLocation.h
-include/webkitgtk-1.0/webkit/WebKitDOMMediaError.h
-include/webkitgtk-1.0/webkit/WebKitDOMMediaList.h
-include/webkitgtk-1.0/webkit/WebKitDOMMediaQueryList.h
-include/webkitgtk-1.0/webkit/WebKitDOMMemoryInfo.h
-include/webkitgtk-1.0/webkit/WebKitDOMMessagePort.h
-include/webkitgtk-1.0/webkit/WebKitDOMMouseEvent.h
-include/webkitgtk-1.0/webkit/WebKitDOMNamedNodeMap.h
-include/webkitgtk-1.0/webkit/WebKitDOMNavigator.h
-include/webkitgtk-1.0/webkit/WebKitDOMNode.h
-include/webkitgtk-1.0/webkit/WebKitDOMNodeFilter.h
-include/webkitgtk-1.0/webkit/WebKitDOMNodeIterator.h
-include/webkitgtk-1.0/webkit/WebKitDOMNodeList.h
-include/webkitgtk-1.0/webkit/WebKitDOMObject.h
-include/webkitgtk-1.0/webkit/WebKitDOMProcessingInstruction.h
-include/webkitgtk-1.0/webkit/WebKitDOMRange.h
-include/webkitgtk-1.0/webkit/WebKitDOMScreen.h
-include/webkitgtk-1.0/webkit/WebKitDOMStorage.h
-include/webkitgtk-1.0/webkit/WebKitDOMStorageInfo.h
-include/webkitgtk-1.0/webkit/WebKitDOMStyleMedia.h
-include/webkitgtk-1.0/webkit/WebKitDOMStyleSheet.h
-include/webkitgtk-1.0/webkit/WebKitDOMStyleSheetList.h
-include/webkitgtk-1.0/webkit/WebKitDOMText.h
-include/webkitgtk-1.0/webkit/WebKitDOMTimeRanges.h
-include/webkitgtk-1.0/webkit/WebKitDOMTreeWalker.h
-include/webkitgtk-1.0/webkit/WebKitDOMUIEvent.h
-include/webkitgtk-1.0/webkit/WebKitDOMValidityState.h
-include/webkitgtk-1.0/webkit/WebKitDOMWebKitAnimation.h
-include/webkitgtk-1.0/webkit/WebKitDOMWebKitAnimationList.h
-include/webkitgtk-1.0/webkit/WebKitDOMWebKitNamedFlow.h
-include/webkitgtk-1.0/webkit/WebKitDOMWebKitPoint.h
-include/webkitgtk-1.0/webkit/WebKitDOMXPathExpression.h
-include/webkitgtk-1.0/webkit/WebKitDOMXPathNSResolver.h
-include/webkitgtk-1.0/webkit/WebKitDOMXPathResult.h
 include/webkitgtk-1.0/webkit/webkit.h
 include/webkitgtk-1.0/webkit/webkitapplicationcache.h
 include/webkitgtk-1.0/webkit/webkitdefines.h
 include/webkitgtk-1.0/webkit/webkitdom.h
-include/webkitgtk-1.0/webkit/webkitdomdefines.h
 include/webkitgtk-1.0/webkit/webkitdownload.h
 include/webkitgtk-1.0/webkit/webkitenumtypes.h
 include/webkitgtk-1.0/webkit/webkiterror.h
@@ -179,112 +41,26 @@ include/webkitgtk-1.0/webkit/webkitwebresource.h
 include/webkitgtk-1.0/webkit/webkitwebsettings.h
 include/webkitgtk-1.0/webkit/webkitwebview.h
 include/webkitgtk-1.0/webkit/webkitwebwindowfeatures.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKAPICast.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKAPICastGtk.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKAPICastSoup.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKApplicationCacheManager.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKArray.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKAuthenticationChallenge.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKAuthenticationDecisionListener.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKBackForwardList.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKBackForwardListItem.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKBase.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKBaseGtk.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKBaseSoup.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKBatteryManager.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKBatteryStatus.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKCertificateInfo.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKConnectionRef.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKContext.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKContextMenuItem.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKContextMenuItemTypes.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKContextPrivate.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKContextSoup.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKCookieManager.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKCredential.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKCredentialTypes.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKData.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKDatabaseManager.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKDictionary.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKDownload.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKError.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKEvent.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKFindOptions.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKFormSubmissionListener.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKFrame.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKFramePolicyListener.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKFullScreenClientGtk.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKGeolocationManager.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKGeolocationPermissionRequest.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKGeolocationPosition.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKGeometry.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKGrammarDetail.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKGraphicsContext.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKGraphicsContextGtk.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKHitTestResult.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKImage.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKInspector.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKInspectorClientGtk.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKIntentData.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKIntentServiceInfo.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKKeyValueStorageManager.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKMediaCacheManager.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKMutableArray.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKMutableDictionary.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKNativeEvent.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKNavigationData.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKNetworkInfo.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKNetworkInfoManager.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKNotification.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKNotificationManager.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKNotificationPermissionRequest.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKNotificationProvider.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKNumber.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKOpenPanelParameters.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKOpenPanelResultListener.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKPage.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKPageGroup.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKPageLoadTypes.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKPagePrivate.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKPluginSiteDataManager.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKPreferences.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKPreferencesPrivate.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKProtectionSpace.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKProtectionSpaceTypes.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKRenderLayer.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKRenderObject.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKResourceCacheManager.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKRetainPtr.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKSecurityOrigin.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKSerializedScriptValue.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKSerializedScriptValuePrivate.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKSharedAPICast.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKSoupRequestManager.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKString.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKStringPrivate.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKTextChecker.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKType.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKURL.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKURLRequest.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKURLResponse.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKUserContentURLPattern.h
-include/webkitgtk-1.0/webkit2/WebKit2/WKVibration.cpp
-include/webkitgtk-1.0/webkit2/WebKit2/WKView.h
-include/webkitgtk-1.0/webkit2/WebKit2/WebKit2_C.h
+include/webkitgtk-1.0/webkit2/WebKitAuthenticationRequest.h
 include/webkitgtk-1.0/webkit2/WebKitBackForwardList.h
 include/webkitgtk-1.0/webkit2/WebKitBackForwardListItem.h
+include/webkitgtk-1.0/webkit2/WebKitCertificateInfo.h
 include/webkitgtk-1.0/webkit2/WebKitContextMenu.h
 include/webkitgtk-1.0/webkit2/WebKitContextMenuActions.h
 include/webkitgtk-1.0/webkit2/WebKitContextMenuItem.h
 include/webkitgtk-1.0/webkit2/WebKitCookieManager.h
+include/webkitgtk-1.0/webkit2/WebKitCredential.h
 include/webkitgtk-1.0/webkit2/WebKitDefines.h
 include/webkitgtk-1.0/webkit2/WebKitDownload.h
 include/webkitgtk-1.0/webkit2/WebKitEditingCommands.h
 include/webkitgtk-1.0/webkit2/WebKitEnumTypes.h
 include/webkitgtk-1.0/webkit2/WebKitError.h
+include/webkitgtk-1.0/webkit2/WebKitFaviconDatabase.h
 include/webkitgtk-1.0/webkit2/WebKitFileChooserRequest.h
 include/webkitgtk-1.0/webkit2/WebKitFindController.h
 include/webkitgtk-1.0/webkit2/WebKitFormSubmissionRequest.h
+include/webkitgtk-1.0/webkit2/WebKitForwardDeclarations.h
+include/webkitgtk-1.0/webkit2/WebKitFrame.h
 include/webkitgtk-1.0/webkit2/WebKitGeolocationPermissionRequest.h
 include/webkitgtk-1.0/webkit2/WebKitHitTestResult.h
 include/webkitgtk-1.0/webkit2/WebKitJavascriptResult.h
@@ -296,62 +72,486 @@ include/webkitgtk-1.0/webkit2/WebKitPolicyDecision.h
 include/webkitgtk-1.0/webkit2/WebKitPrintOperation.h
 include/webkitgtk-1.0/webkit2/WebKitResponsePolicyDecision.h
 include/webkitgtk-1.0/webkit2/WebKitScriptDialog.h
+include/webkitgtk-1.0/webkit2/WebKitScriptWorld.h
+include/webkitgtk-1.0/webkit2/WebKitSecurityManager.h
 include/webkitgtk-1.0/webkit2/WebKitSettings.h
 include/webkitgtk-1.0/webkit2/WebKitURIRequest.h
 include/webkitgtk-1.0/webkit2/WebKitURIResponse.h
 include/webkitgtk-1.0/webkit2/WebKitURISchemeRequest.h
 include/webkitgtk-1.0/webkit2/WebKitVersion.h
 include/webkitgtk-1.0/webkit2/WebKitWebContext.h
+include/webkitgtk-1.0/webkit2/WebKitWebExtension.h
 include/webkitgtk-1.0/webkit2/WebKitWebInspector.h
+include/webkitgtk-1.0/webkit2/WebKitWebPage.h
 include/webkitgtk-1.0/webkit2/WebKitWebResource.h
 include/webkitgtk-1.0/webkit2/WebKitWebView.h
 include/webkitgtk-1.0/webkit2/WebKitWebViewBase.h
+include/webkitgtk-1.0/webkit2/WebKitWebViewGroup.h
 include/webkitgtk-1.0/webkit2/WebKitWindowProperties.h
+include/webkitgtk-1.0/webkit2/webkit-web-extension.h
 include/webkitgtk-1.0/webkit2/webkit2.h
-lib/girepository-1.0/JSCore-1.0.typelib
+include/webkitgtk-1.0/webkitdom/WebKitDOMAttr.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMAudioTrack.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMAudioTrackList.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMBarProp.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMBatteryManager.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMBlob.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMCDATASection.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMCSSRule.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMCSSRuleList.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMCSSStyleDeclaration.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMCSSStyleSheet.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMCSSValue.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMCharacterData.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMComment.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMConsole.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMCustom.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDOMApplicationCache.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDOMImplementation.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDOMMimeType.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDOMMimeTypeArray.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDOMNamedFlowCollection.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDOMPlugin.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDOMPluginArray.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDOMSecurityPolicy.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDOMSelection.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDOMSettableTokenList.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDOMStringList.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDOMStringMap.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDOMTokenList.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDOMWindow.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDOMWindowCSS.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDatabase.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDeprecated.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDocument.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDocumentFragment.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMDocumentType.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMEntityReference.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMEvent.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMEventTarget.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMFile.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMFileList.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMGamepad.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMGamepadList.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMGeolocation.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLAnchorElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLAppletElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLAreaElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLAudioElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLBRElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLBaseElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLBaseFontElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLBodyElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLButtonElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLCanvasElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLCollection.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLDListElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLDetailsElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLDirectoryElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLDivElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLDocument.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLEmbedElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLFieldSetElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLFontElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLFormElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLFrameElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLFrameSetElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLHRElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLHeadElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLHeadingElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLHtmlElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLIFrameElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLImageElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLInputElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLKeygenElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLLIElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLLabelElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLLegendElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLLinkElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLMapElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLMarqueeElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLMediaElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLMenuElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLMetaElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLModElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLOListElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLObjectElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLOptGroupElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLOptionElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLOptionsCollection.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLParagraphElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLParamElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLPreElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLQuoteElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLScriptElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLSelectElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLStyleElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLTableCaptionElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLTableCellElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLTableColElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLTableElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLTableRowElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLTableSectionElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLTextAreaElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLTitleElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLUListElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHTMLVideoElement.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMHistory.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMKeyboardEvent.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMLocation.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMMediaController.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMMediaError.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMMediaList.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMMediaQueryList.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMMessagePort.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMMouseEvent.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMNamedNodeMap.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMNavigator.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMNode.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMNodeFilter.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMNodeIterator.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMNodeList.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMObject.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMPerformance.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMPerformanceEntry.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMPerformanceEntryList.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMPerformanceNavigation.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMPerformanceTiming.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMProcessingInstruction.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMRange.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMScreen.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMShadowRoot.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMStorage.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMStorageInfo.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMStorageQuota.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMStyleMedia.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMStyleSheet.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMStyleSheetList.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMText.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMTextTrack.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMTextTrackCue.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMTextTrackCueList.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMTextTrackList.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMTimeRanges.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMTouch.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMTrackEvent.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMTreeWalker.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMUIEvent.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMValidityState.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMVideoPlaybackQuality.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMVideoTrack.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMVideoTrackList.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMWebKitNamedFlow.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMWebKitPoint.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMWheelEvent.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMXPathExpression.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMXPathNSResolver.h
+include/webkitgtk-1.0/webkitdom/WebKitDOMXPathResult.h
+include/webkitgtk-1.0/webkitdom/webkitdom.h
+include/webkitgtk-1.0/webkitdom/webkitdomdefines.h
+lib/girepository-1.0/JavaScriptCore-1.0.typelib
 lib/girepository-1.0/WebKit-1.0.typelib
 lib/libjavascriptcoregtk-1.0.la
 lib/libwebkitgtk-1.0.la
 lib/pkgconfig/javascriptcoregtk-1.0.pc
 lib/pkgconfig/webkit-1.0.pc
-share/gir-1.0/JSCore-1.0.gir
+share/gir-1.0/JavaScriptCore-1.0.gir
 share/gir-1.0/WebKit-1.0.gir
-share/locale/ar/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/bg/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/cs/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/de/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/el/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/en_CA/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/en_GB/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/eo/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/es/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/et/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/eu/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/fr/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/gl/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/gu/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/he/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/hu/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/id/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/it/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/ko/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/lt/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/lv/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/mr/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/nb/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/nl/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/pa/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/pl/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/pt/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/ru/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/sl/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/sr/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/sr@latin/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/sv/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/uk/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/vi/LC_MESSAGES/webkitgtk-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/webkitgtk-2.0.mo
+share/gtk-doc/html/webkitdomgtk/WebKitDOMAttr.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMAudioTrack.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMAudioTrackList.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMBarProp.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMBatteryManager.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMBlob.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMCDATASection.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMCSSRule.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMCSSRuleList.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMCSSStyleDeclaration.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMCSSStyleSheet.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMCSSValue.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMCharacterData.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMComment.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMConsole.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDOMApplicationCache.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDOMImplementation.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDOMMimeType.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDOMMimeTypeArray.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDOMNamedFlowCollection.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDOMPlugin.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDOMPluginArray.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDOMSecurityPolicy.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDOMSelection.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDOMSettableTokenList.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDOMStringList.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDOMStringMap.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDOMTokenList.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDOMWindow.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDOMWindowCSS.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDatabase.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDocument.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDocumentFragment.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMDocumentType.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMEntityReference.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMEvent.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMEventTarget.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMFile.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMFileList.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMGamepad.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMGamepadList.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMGeolocation.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLAnchorElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLAppletElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLAreaElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLAudioElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLBRElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLBaseElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLBaseFontElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLBodyElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLButtonElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLCanvasElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLCollection.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLDListElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLDetailsElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLDirectoryElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLDivElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLDocument.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLEmbedElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLFieldSetElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLFontElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLFormElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLFrameElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLFrameSetElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLHRElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLHeadElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLHeadingElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLHtmlElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLIFrameElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLImageElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLInputElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLKeygenElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLLIElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLLabelElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLLegendElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLLinkElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLMapElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLMarqueeElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLMediaElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLMenuElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLMetaElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLModElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLOListElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLObjectElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLOptGroupElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLOptionElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLOptionsCollection.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLParagraphElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLParamElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLPreElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLQuoteElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLScriptElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLSelectElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLStyleElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLTableCaptionElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLTableCellElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLTableColElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLTableElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLTableRowElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLTableSectionElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLTextAreaElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLTitleElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLUListElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHTMLVideoElement.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMHistory.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMKeyboardEvent.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMLocation.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMMediaController.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMMediaError.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMMediaList.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMMediaQueryList.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMMessagePort.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMMouseEvent.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMNamedNodeMap.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMNavigator.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMNode.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMNodeFilter.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMNodeIterator.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMNodeList.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMObject.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMPerformance.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMPerformanceEntry.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMPerformanceEntryList.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMPerformanceNavigation.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMPerformanceTiming.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMProcessingInstruction.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMRange.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMScreen.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMShadowRoot.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMStorage.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMStorageInfo.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMStorageQuota.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMStyleMedia.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMStyleSheet.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMStyleSheetList.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMText.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMTextTrack.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMTextTrackCue.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMTextTrackCueList.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMTextTrackList.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMTimeRanges.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMTouch.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMTrackEvent.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMTreeWalker.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMUIEvent.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMValidityState.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMVideoPlaybackQuality.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMVideoTrack.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMVideoTrackList.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMWebKitNamedFlow.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMWebKitPoint.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMWheelEvent.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMXPathExpression.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMXPathNSResolver.html
+share/gtk-doc/html/webkitdomgtk/WebKitDOMXPathResult.html
+share/gtk-doc/html/webkitdomgtk/annotation-glossary.html
+share/gtk-doc/html/webkitdomgtk/api-index-deprecated.html
+share/gtk-doc/html/webkitdomgtk/ch01.html
+share/gtk-doc/html/webkitdomgtk/home.png
+share/gtk-doc/html/webkitdomgtk/index-all.html
+share/gtk-doc/html/webkitdomgtk/index.html
+share/gtk-doc/html/webkitdomgtk/index.sgml
+share/gtk-doc/html/webkitdomgtk/left-insensitive.png
+share/gtk-doc/html/webkitdomgtk/left.png
+share/gtk-doc/html/webkitdomgtk/right-insensitive.png
+share/gtk-doc/html/webkitdomgtk/right.png
+share/gtk-doc/html/webkitdomgtk/style.css
+share/gtk-doc/html/webkitdomgtk/up-insensitive.png
+share/gtk-doc/html/webkitdomgtk/up.png
+share/gtk-doc/html/webkitdomgtk/webkitdomgtk-WebKitDOMBarInfo.html
+share/gtk-doc/html/webkitdomgtk/webkitdomgtk-WebKitDOMCustom.html
+share/gtk-doc/html/webkitdomgtk/webkitdomgtk-WebKitDOMHTMLPropertiesCollection.html
+share/gtk-doc/html/webkitdomgtk/webkitdomgtk-WebKitDOMMemoryInfo.html
+share/gtk-doc/html/webkitdomgtk/webkitdomgtk-WebKitDOMMicroDataItemValue.html
+share/gtk-doc/html/webkitdomgtk/webkitdomgtk-WebKitDOMPropertyNodeList.html
+share/gtk-doc/html/webkitdomgtk/webkitdomgtk.devhelp2
+share/gtk-doc/html/webkitgtk/WebKitFaviconDatabase.html
+share/gtk-doc/html/webkitgtk/WebKitFileChooserRequest.html
+share/gtk-doc/html/webkitgtk/WebKitGeolocationPolicyDecision.html
+share/gtk-doc/html/webkitgtk/WebKitHitTestResult.html
+share/gtk-doc/html/webkitgtk/WebKitIconDatabase.html
+share/gtk-doc/html/webkitgtk/WebKitNetworkRequest.html
+share/gtk-doc/html/webkitgtk/WebKitNetworkResponse.html
+share/gtk-doc/html/webkitgtk/WebKitSecurityOrigin.html
+share/gtk-doc/html/webkitgtk/WebKitSoupAuthDialog.html
+share/gtk-doc/html/webkitgtk/WebKitSpellChecker.html
+share/gtk-doc/html/webkitgtk/WebKitViewportAttributes.html
+share/gtk-doc/html/webkitgtk/WebKitWebBackForwardList.html
+share/gtk-doc/html/webkitgtk/WebKitWebDataSource.html
+share/gtk-doc/html/webkitgtk/WebKitWebDatabase.html
+share/gtk-doc/html/webkitgtk/WebKitWebFrame.html
+share/gtk-doc/html/webkitgtk/WebKitWebHistoryItem.html
+share/gtk-doc/html/webkitgtk/WebKitWebInspector.html
+share/gtk-doc/html/webkitgtk/WebKitWebNavigationAction.html
+share/gtk-doc/html/webkitgtk/WebKitWebPlugin.html
+share/gtk-doc/html/webkitgtk/WebKitWebPluginDatabase.html
+share/gtk-doc/html/webkitgtk/WebKitWebPolicyDecision.html
+share/gtk-doc/html/webkitgtk/WebKitWebResource.html
+share/gtk-doc/html/webkitgtk/WebKitWebSettings.html
+share/gtk-doc/html/webkitgtk/WebKitWebWindowFeatures.html
+share/gtk-doc/html/webkitgtk/annotation-glossary.html
+share/gtk-doc/html/webkitgtk/ch01.html
+share/gtk-doc/html/webkitgtk/ch02.html
+share/gtk-doc/html/webkitgtk/ch03.html
+share/gtk-doc/html/webkitgtk/home.png
+share/gtk-doc/html/webkitgtk/index-1.0.1.html
+share/gtk-doc/html/webkitgtk/index-1.0.2.html
+share/gtk-doc/html/webkitgtk/index-1.0.3.html
+share/gtk-doc/html/webkitgtk/index-1.1.1.html
+share/gtk-doc/html/webkitgtk/index-1.1.10.html
+share/gtk-doc/html/webkitgtk/index-1.1.11.html
+share/gtk-doc/html/webkitgtk/index-1.1.13.html
+share/gtk-doc/html/webkitgtk/index-1.1.14.html
+share/gtk-doc/html/webkitgtk/index-1.1.15.html
+share/gtk-doc/html/webkitgtk/index-1.1.16.html
+share/gtk-doc/html/webkitgtk/index-1.1.17.html
+share/gtk-doc/html/webkitgtk/index-1.1.18.html
+share/gtk-doc/html/webkitgtk/index-1.1.2.html
+share/gtk-doc/html/webkitgtk/index-1.1.20.html
+share/gtk-doc/html/webkitgtk/index-1.1.23.html
+share/gtk-doc/html/webkitgtk/index-1.1.3.html
+share/gtk-doc/html/webkitgtk/index-1.1.4.html
+share/gtk-doc/html/webkitgtk/index-1.1.5.html
+share/gtk-doc/html/webkitgtk/index-1.1.6.html
+share/gtk-doc/html/webkitgtk/index-1.1.7.html
+share/gtk-doc/html/webkitgtk/index-1.1.8.html
+share/gtk-doc/html/webkitgtk/index-1.3.1.html
+share/gtk-doc/html/webkitgtk/index-1.3.2.html
+share/gtk-doc/html/webkitgtk/index-1.3.3.html
+share/gtk-doc/html/webkitgtk/index-1.3.4.html
+share/gtk-doc/html/webkitgtk/index-1.3.8.html
+share/gtk-doc/html/webkitgtk/index-all.html
+share/gtk-doc/html/webkitgtk/index-deprecated.html
+share/gtk-doc/html/webkitgtk/index.html
+share/gtk-doc/html/webkitgtk/index.sgml
+share/gtk-doc/html/webkitgtk/left-insensitive.png
+share/gtk-doc/html/webkitgtk/left.png
+share/gtk-doc/html/webkitgtk/right-insensitive.png
+share/gtk-doc/html/webkitgtk/right.png
+share/gtk-doc/html/webkitgtk/style.css
+share/gtk-doc/html/webkitgtk/up-insensitive.png
+share/gtk-doc/html/webkitgtk/up.png
+share/gtk-doc/html/webkitgtk/webkit-environment.html
+share/gtk-doc/html/webkitgtk/webkitgtk-Global-functions.html
+share/gtk-doc/html/webkitgtk/webkitgtk-webkitdownload.html
+share/gtk-doc/html/webkitgtk/webkitgtk-webkitwebview.html
+share/gtk-doc/html/webkitgtk/webkitgtk.devhelp2
+share/locale/ar/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/as/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/bg/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/cs/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/de/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/el/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/en_CA/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/en_GB/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/eo/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/es/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/et/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/eu/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/fr/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/gl/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/gu/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/he/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/hi/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/hu/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/id/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/it/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/kn/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/ko/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/lt/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/lv/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/ml/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/mr/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/nb/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/nl/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/or/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/pa/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/pl/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/pt/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/ro/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/ru/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/sl/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/sr/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/sv/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/ta/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/te/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/uk/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/vi/LC_MESSAGES/WebKitGTK-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/WebKitGTK-2.0.mo
 share/webkitgtk-1.0/images/deleteButton.png
 share/webkitgtk-1.0/images/inputSpeech.png
 share/webkitgtk-1.0/images/missingImage.png
@@ -359,371 +559,5 @@ share/webkitgtk-1.0/images/nullPlugin.png
 share/webkitgtk-1.0/images/panIcon.png
 share/webkitgtk-1.0/images/textAreaResizeCorner.png
 share/webkitgtk-1.0/images/urlIcon.png
+share/webkitgtk-1.0/resources/audio/Composite.wav
 share/webkitgtk-1.0/resources/error.html
-share/webkitgtk-1.0/webinspector/AdvancedSearchController.js
-share/webkitgtk-1.0/webinspector/ApplicationCacheItemsView.js
-share/webkitgtk-1.0/webinspector/ApplicationCacheModel.js
-share/webkitgtk-1.0/webinspector/AuditCategories.js
-share/webkitgtk-1.0/webinspector/AuditFormatters.js
-share/webkitgtk-1.0/webinspector/AuditLauncherView.js
-share/webkitgtk-1.0/webinspector/AuditResultView.js
-share/webkitgtk-1.0/webinspector/AuditRules.js
-share/webkitgtk-1.0/webinspector/AuditsPanel.js
-share/webkitgtk-1.0/webinspector/BottomUpProfileDataGridTree.js
-share/webkitgtk-1.0/webinspector/BreakpointManager.js
-share/webkitgtk-1.0/webinspector/BreakpointsSidebarPane.js
-share/webkitgtk-1.0/webinspector/CPUProfileView.js
-share/webkitgtk-1.0/webinspector/CSSCompletions.js
-share/webkitgtk-1.0/webinspector/CSSKeywordCompletions.js
-share/webkitgtk-1.0/webinspector/CSSSelectorProfileView.js
-share/webkitgtk-1.0/webinspector/CSSStyleModel.js
-share/webkitgtk-1.0/webinspector/CallStackSidebarPane.js
-share/webkitgtk-1.0/webinspector/Checkbox.js
-share/webkitgtk-1.0/webinspector/CodeMirrorTextEditor.js
-share/webkitgtk-1.0/webinspector/Color.js
-share/webkitgtk-1.0/webinspector/CompilerScriptMapping.js
-share/webkitgtk-1.0/webinspector/ConsoleMessage.js
-share/webkitgtk-1.0/webinspector/ConsoleModel.js
-share/webkitgtk-1.0/webinspector/ConsolePanel.js
-share/webkitgtk-1.0/webinspector/ConsoleView.js
-share/webkitgtk-1.0/webinspector/ContentProvider.js
-share/webkitgtk-1.0/webinspector/ContentProviders.js
-share/webkitgtk-1.0/webinspector/ContextMenu.js
-share/webkitgtk-1.0/webinspector/CookieItemsView.js
-share/webkitgtk-1.0/webinspector/CookieParser.js
-share/webkitgtk-1.0/webinspector/CookiesTable.js
-share/webkitgtk-1.0/webinspector/DOMAgent.js
-share/webkitgtk-1.0/webinspector/DOMBreakpointsSidebarPane.js
-share/webkitgtk-1.0/webinspector/DOMExtension.js
-share/webkitgtk-1.0/webinspector/DOMPresentationUtils.js
-share/webkitgtk-1.0/webinspector/DOMStorage.js
-share/webkitgtk-1.0/webinspector/DOMStorageItemsView.js
-share/webkitgtk-1.0/webinspector/DOMSyntaxHighlighter.js
-share/webkitgtk-1.0/webinspector/DataGrid.js
-share/webkitgtk-1.0/webinspector/Database.js
-share/webkitgtk-1.0/webinspector/DatabaseQueryView.js
-share/webkitgtk-1.0/webinspector/DatabaseTableView.js
-share/webkitgtk-1.0/webinspector/DebuggerModel.js
-share/webkitgtk-1.0/webinspector/DebuggerScriptMapping.js
-share/webkitgtk-1.0/webinspector/DefaultTextEditor.js
-share/webkitgtk-1.0/webinspector/Dialog.js
-share/webkitgtk-1.0/webinspector/DirectoryContentView.js
-share/webkitgtk-1.0/webinspector/Drawer.js
-share/webkitgtk-1.0/webinspector/ElementsPanel.js
-share/webkitgtk-1.0/webinspector/ElementsTreeOutline.js
-share/webkitgtk-1.0/webinspector/EmptyView.js
-share/webkitgtk-1.0/webinspector/EventListenersSidebarPane.js
-share/webkitgtk-1.0/webinspector/ExtensionAPI.js
-share/webkitgtk-1.0/webinspector/ExtensionAuditCategory.js
-share/webkitgtk-1.0/webinspector/ExtensionPanel.js
-share/webkitgtk-1.0/webinspector/ExtensionRegistryStub.js
-share/webkitgtk-1.0/webinspector/ExtensionServer.js
-share/webkitgtk-1.0/webinspector/ExtensionView.js
-share/webkitgtk-1.0/webinspector/FileContentView.js
-share/webkitgtk-1.0/webinspector/FileManager.js
-share/webkitgtk-1.0/webinspector/FileSystemModel.js
-share/webkitgtk-1.0/webinspector/FileSystemView.js
-share/webkitgtk-1.0/webinspector/FileUtils.js
-share/webkitgtk-1.0/webinspector/FilteredItemSelectionDialog.js
-share/webkitgtk-1.0/webinspector/FontView.js
-share/webkitgtk-1.0/webinspector/GoToLineDialog.js
-share/webkitgtk-1.0/webinspector/HAREntry.js
-share/webkitgtk-1.0/webinspector/HandlerRegistry.js
-share/webkitgtk-1.0/webinspector/HeapSnapshot.js
-share/webkitgtk-1.0/webinspector/HeapSnapshotDataGrids.js
-share/webkitgtk-1.0/webinspector/HeapSnapshotGridNodes.js
-share/webkitgtk-1.0/webinspector/HeapSnapshotLoader.js
-share/webkitgtk-1.0/webinspector/HeapSnapshotProxy.js
-share/webkitgtk-1.0/webinspector/HeapSnapshotView.js
-share/webkitgtk-1.0/webinspector/HeapSnapshotWorker.js
-share/webkitgtk-1.0/webinspector/HeapSnapshotWorkerDispatcher.js
-share/webkitgtk-1.0/webinspector/HelpScreen.js
-share/webkitgtk-1.0/webinspector/ImageView.js
-share/webkitgtk-1.0/webinspector/Images/applicationCache.png
-share/webkitgtk-1.0/webinspector/Images/back.png
-share/webkitgtk-1.0/webinspector/Images/breakpointBorder.png
-share/webkitgtk-1.0/webinspector/Images/breakpointConditionalBorder.png
-share/webkitgtk-1.0/webinspector/Images/breakpointConditionalCounterBorder.png
-share/webkitgtk-1.0/webinspector/Images/breakpointCounterBorder.png
-share/webkitgtk-1.0/webinspector/Images/checker.png
-share/webkitgtk-1.0/webinspector/Images/closeButtons.png
-share/webkitgtk-1.0/webinspector/Images/cookie.png
-share/webkitgtk-1.0/webinspector/Images/database.png
-share/webkitgtk-1.0/webinspector/Images/databaseTable.png
-share/webkitgtk-1.0/webinspector/Images/debuggerContinue.png
-share/webkitgtk-1.0/webinspector/Images/debuggerPause.png
-share/webkitgtk-1.0/webinspector/Images/debuggerStepInto.png
-share/webkitgtk-1.0/webinspector/Images/debuggerStepOut.png
-share/webkitgtk-1.0/webinspector/Images/debuggerStepOver.png
-share/webkitgtk-1.0/webinspector/Images/deleteIcon.png
-share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallDown.png
-share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallDownBlack.png
-share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallDownWhite.png
-share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRight.png
-share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightBlack.png
-share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightDown.png
-share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightDownBlack.png
-share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightDownWhite.png
-share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightWhite.png
-share/webkitgtk-1.0/webinspector/Images/domain.png
-share/webkitgtk-1.0/webinspector/Images/errorIcon.png
-share/webkitgtk-1.0/webinspector/Images/errorMediumIcon.png
-share/webkitgtk-1.0/webinspector/Images/errorRedDot.png
-share/webkitgtk-1.0/webinspector/Images/fileSystem.png
-share/webkitgtk-1.0/webinspector/Images/forward.png
-share/webkitgtk-1.0/webinspector/Images/frame.png
-share/webkitgtk-1.0/webinspector/Images/glossyHeader.png
-share/webkitgtk-1.0/webinspector/Images/glossyHeaderPressed.png
-share/webkitgtk-1.0/webinspector/Images/glossyHeaderSelected.png
-share/webkitgtk-1.0/webinspector/Images/glossyHeaderSelectedPressed.png
-share/webkitgtk-1.0/webinspector/Images/goArrow.png
-share/webkitgtk-1.0/webinspector/Images/graphLabelCalloutLeft.png
-share/webkitgtk-1.0/webinspector/Images/graphLabelCalloutRight.png
-share/webkitgtk-1.0/webinspector/Images/indexedDB.png
-share/webkitgtk-1.0/webinspector/Images/indexedDBIndex.png
-share/webkitgtk-1.0/webinspector/Images/indexedDBObjectStore.png
-share/webkitgtk-1.0/webinspector/Images/localStorage.png
-share/webkitgtk-1.0/webinspector/Images/navigatorShowHideButton.png
-share/webkitgtk-1.0/webinspector/Images/paneAddButtons.png
-share/webkitgtk-1.0/webinspector/Images/paneBottomGrow.png
-share/webkitgtk-1.0/webinspector/Images/paneBottomGrowActive.png
-share/webkitgtk-1.0/webinspector/Images/paneElementStateButtons.png
-share/webkitgtk-1.0/webinspector/Images/paneFilterButtons.png
-share/webkitgtk-1.0/webinspector/Images/paneGrowHandleLine.png
-share/webkitgtk-1.0/webinspector/Images/paneRefreshButtons.png
-share/webkitgtk-1.0/webinspector/Images/paneSettingsButtons.png
-share/webkitgtk-1.0/webinspector/Images/popoverArrows.png
-share/webkitgtk-1.0/webinspector/Images/popoverBackground.png
-share/webkitgtk-1.0/webinspector/Images/profileGroupIcon.png
-share/webkitgtk-1.0/webinspector/Images/profileIcon.png
-share/webkitgtk-1.0/webinspector/Images/profileSmallIcon.png
-share/webkitgtk-1.0/webinspector/Images/profilesSilhouette.png
-share/webkitgtk-1.0/webinspector/Images/programCounterBorder.png
-share/webkitgtk-1.0/webinspector/Images/radioDot.png
-share/webkitgtk-1.0/webinspector/Images/resourceCSSIcon.png
-share/webkitgtk-1.0/webinspector/Images/resourceDocumentIcon.png
-share/webkitgtk-1.0/webinspector/Images/resourceDocumentIconSmall.png
-share/webkitgtk-1.0/webinspector/Images/resourceJSIcon.png
-share/webkitgtk-1.0/webinspector/Images/resourcePlainIcon.png
-share/webkitgtk-1.0/webinspector/Images/resourcePlainIconSmall.png
-share/webkitgtk-1.0/webinspector/Images/resourcesSizeGraphIcon.png
-share/webkitgtk-1.0/webinspector/Images/resourcesTimeGraphIcon.png
-share/webkitgtk-1.0/webinspector/Images/scriptsSilhouette.png
-share/webkitgtk-1.0/webinspector/Images/searchNext.png
-share/webkitgtk-1.0/webinspector/Images/searchPrev.png
-share/webkitgtk-1.0/webinspector/Images/searchSmallBlue.png
-share/webkitgtk-1.0/webinspector/Images/searchSmallBrightBlue.png
-share/webkitgtk-1.0/webinspector/Images/searchSmallGray.png
-share/webkitgtk-1.0/webinspector/Images/searchSmallWhite.png
-share/webkitgtk-1.0/webinspector/Images/segment.png
-share/webkitgtk-1.0/webinspector/Images/segmentEnd.png
-share/webkitgtk-1.0/webinspector/Images/segmentHover.png
-share/webkitgtk-1.0/webinspector/Images/segmentHoverEnd.png
-share/webkitgtk-1.0/webinspector/Images/segmentSelected.png
-share/webkitgtk-1.0/webinspector/Images/segmentSelectedEnd.png
-share/webkitgtk-1.0/webinspector/Images/sessionStorage.png
-share/webkitgtk-1.0/webinspector/Images/spinner.gif
-share/webkitgtk-1.0/webinspector/Images/spinnerActive.gif
-share/webkitgtk-1.0/webinspector/Images/spinnerActiveSelected.gif
-share/webkitgtk-1.0/webinspector/Images/spinnerInactive.gif
-share/webkitgtk-1.0/webinspector/Images/spinnerInactiveSelected.gif
-share/webkitgtk-1.0/webinspector/Images/splitviewDimple.png
-share/webkitgtk-1.0/webinspector/Images/splitviewDividerBackground.png
-share/webkitgtk-1.0/webinspector/Images/statusbarButtonGlyphs.png
-share/webkitgtk-1.0/webinspector/Images/statusbarResizerHorizontal.png
-share/webkitgtk-1.0/webinspector/Images/statusbarResizerVertical.png
-share/webkitgtk-1.0/webinspector/Images/successGreenDot.png
-share/webkitgtk-1.0/webinspector/Images/thumbActiveHoriz.png
-share/webkitgtk-1.0/webinspector/Images/thumbActiveVert.png
-share/webkitgtk-1.0/webinspector/Images/thumbHoriz.png
-share/webkitgtk-1.0/webinspector/Images/thumbHoverHoriz.png
-share/webkitgtk-1.0/webinspector/Images/thumbHoverVert.png
-share/webkitgtk-1.0/webinspector/Images/thumbVert.png
-share/webkitgtk-1.0/webinspector/Images/tickMark.png
-share/webkitgtk-1.0/webinspector/Images/timelineHollowPillBlue.png
-share/webkitgtk-1.0/webinspector/Images/timelineHollowPillGray.png
-share/webkitgtk-1.0/webinspector/Images/timelineHollowPillGreen.png
-share/webkitgtk-1.0/webinspector/Images/timelineHollowPillOrange.png
-share/webkitgtk-1.0/webinspector/Images/timelineHollowPillPurple.png
-share/webkitgtk-1.0/webinspector/Images/timelineHollowPillRed.png
-share/webkitgtk-1.0/webinspector/Images/timelineHollowPillYellow.png
-share/webkitgtk-1.0/webinspector/Images/timelinePillBlue.png
-share/webkitgtk-1.0/webinspector/Images/timelinePillGray.png
-share/webkitgtk-1.0/webinspector/Images/timelinePillGreen.png
-share/webkitgtk-1.0/webinspector/Images/timelinePillOrange.png
-share/webkitgtk-1.0/webinspector/Images/timelinePillPurple.png
-share/webkitgtk-1.0/webinspector/Images/timelinePillRed.png
-share/webkitgtk-1.0/webinspector/Images/timelinePillYellow.png
-share/webkitgtk-1.0/webinspector/Images/toolbarIcons.png
-share/webkitgtk-1.0/webinspector/Images/toolbarIconsSmall.png
-share/webkitgtk-1.0/webinspector/Images/toolbarItemSelected.png
-share/webkitgtk-1.0/webinspector/Images/trackHoriz.png
-share/webkitgtk-1.0/webinspector/Images/trackVert.png
-share/webkitgtk-1.0/webinspector/Images/treeDownTriangleBlack.png
-share/webkitgtk-1.0/webinspector/Images/treeDownTriangleWhite.png
-share/webkitgtk-1.0/webinspector/Images/treeRightTriangleBlack.png
-share/webkitgtk-1.0/webinspector/Images/treeRightTriangleWhite.png
-share/webkitgtk-1.0/webinspector/Images/treeUpTriangleBlack.png
-share/webkitgtk-1.0/webinspector/Images/treeUpTriangleWhite.png
-share/webkitgtk-1.0/webinspector/Images/userInputIcon.png
-share/webkitgtk-1.0/webinspector/Images/userInputPreviousIcon.png
-share/webkitgtk-1.0/webinspector/Images/userInputResultIcon.png
-share/webkitgtk-1.0/webinspector/Images/warningIcon.png
-share/webkitgtk-1.0/webinspector/Images/warningMediumIcon.png
-share/webkitgtk-1.0/webinspector/Images/warningOrangeDot.png
-share/webkitgtk-1.0/webinspector/Images/warningsErrors.png
-share/webkitgtk-1.0/webinspector/IndexedDBModel.js
-share/webkitgtk-1.0/webinspector/IndexedDBViews.js
-share/webkitgtk-1.0/webinspector/InspectorBackend.js
-share/webkitgtk-1.0/webinspector/InspectorBackendCommands.js
-share/webkitgtk-1.0/webinspector/InspectorFrontendAPI.js
-share/webkitgtk-1.0/webinspector/InspectorFrontendHostStub.js
-share/webkitgtk-1.0/webinspector/InspectorView.js
-share/webkitgtk-1.0/webinspector/JavaScriptContextManager.js
-share/webkitgtk-1.0/webinspector/JavaScriptFormatter.js
-share/webkitgtk-1.0/webinspector/JavaScriptSource.js
-share/webkitgtk-1.0/webinspector/JavaScriptSourceFrame.js
-share/webkitgtk-1.0/webinspector/KeyboardShortcut.js
-share/webkitgtk-1.0/webinspector/Linkifier.js
-share/webkitgtk-1.0/webinspector/MemoryStatistics.js
-share/webkitgtk-1.0/webinspector/MetricsSidebarPane.js
-share/webkitgtk-1.0/webinspector/NativeBreakpointsSidebarPane.js
-share/webkitgtk-1.0/webinspector/NativeMemorySnapshotView.js
-share/webkitgtk-1.0/webinspector/NavigatorOverlayController.js
-share/webkitgtk-1.0/webinspector/NavigatorView.js
-share/webkitgtk-1.0/webinspector/NetworkItemView.js
-share/webkitgtk-1.0/webinspector/NetworkLog.js
-share/webkitgtk-1.0/webinspector/NetworkManager.js
-share/webkitgtk-1.0/webinspector/NetworkPanel.js
-share/webkitgtk-1.0/webinspector/NetworkRequest.js
-share/webkitgtk-1.0/webinspector/Object.js
-share/webkitgtk-1.0/webinspector/ObjectPopoverHelper.js
-share/webkitgtk-1.0/webinspector/ObjectPropertiesSection.js
-share/webkitgtk-1.0/webinspector/Panel.js
-share/webkitgtk-1.0/webinspector/PanelEnablerView.js
-share/webkitgtk-1.0/webinspector/Placard.js
-share/webkitgtk-1.0/webinspector/Popover.js
-share/webkitgtk-1.0/webinspector/PresentationConsoleMessageHelper.js
-share/webkitgtk-1.0/webinspector/ProfileDataGridTree.js
-share/webkitgtk-1.0/webinspector/ProfileLauncherView.js
-share/webkitgtk-1.0/webinspector/ProfilesPanel.js
-share/webkitgtk-1.0/webinspector/ProgressBar.js
-share/webkitgtk-1.0/webinspector/PropertiesSection.js
-share/webkitgtk-1.0/webinspector/PropertiesSidebarPane.js
-share/webkitgtk-1.0/webinspector/RawSourceCode.js
-share/webkitgtk-1.0/webinspector/RemoteObject.js
-share/webkitgtk-1.0/webinspector/RequestCookiesView.js
-share/webkitgtk-1.0/webinspector/RequestHTMLView.js
-share/webkitgtk-1.0/webinspector/RequestHeadersView.js
-share/webkitgtk-1.0/webinspector/RequestJSONView.js
-share/webkitgtk-1.0/webinspector/RequestPreviewView.js
-share/webkitgtk-1.0/webinspector/RequestResponseView.js
-share/webkitgtk-1.0/webinspector/RequestTimingView.js
-share/webkitgtk-1.0/webinspector/RequestView.js
-share/webkitgtk-1.0/webinspector/Resource.js
-share/webkitgtk-1.0/webinspector/ResourceScriptMapping.js
-share/webkitgtk-1.0/webinspector/ResourceTreeModel.js
-share/webkitgtk-1.0/webinspector/ResourceType.js
-share/webkitgtk-1.0/webinspector/ResourceUtils.js
-share/webkitgtk-1.0/webinspector/ResourceView.js
-share/webkitgtk-1.0/webinspector/ResourceWebSocketFrameView.js
-share/webkitgtk-1.0/webinspector/ResourcesPanel.js
-share/webkitgtk-1.0/webinspector/RevisionHistoryView.js
-share/webkitgtk-1.0/webinspector/SASSSourceMapping.js
-share/webkitgtk-1.0/webinspector/ScopeChainSidebarPane.js
-share/webkitgtk-1.0/webinspector/Script.js
-share/webkitgtk-1.0/webinspector/ScriptFormatter.js
-share/webkitgtk-1.0/webinspector/ScriptFormatterWorker.js
-share/webkitgtk-1.0/webinspector/ScriptSnippetModel.js
-share/webkitgtk-1.0/webinspector/ScriptsNavigator.js
-share/webkitgtk-1.0/webinspector/ScriptsPanel.js
-share/webkitgtk-1.0/webinspector/ScriptsSearchScope.js
-share/webkitgtk-1.0/webinspector/SearchController.js
-share/webkitgtk-1.0/webinspector/Section.js
-share/webkitgtk-1.0/webinspector/Settings.js
-share/webkitgtk-1.0/webinspector/SettingsScreen.js
-share/webkitgtk-1.0/webinspector/ShortcutsScreen.js
-share/webkitgtk-1.0/webinspector/ShowMoreDataGridNode.js
-share/webkitgtk-1.0/webinspector/SidebarOverlay.js
-share/webkitgtk-1.0/webinspector/SidebarPane.js
-share/webkitgtk-1.0/webinspector/SidebarTreeElement.js
-share/webkitgtk-1.0/webinspector/SnippetJavaScriptSourceFrame.js
-share/webkitgtk-1.0/webinspector/SnippetStorage.js
-share/webkitgtk-1.0/webinspector/SoftContextMenu.js
-share/webkitgtk-1.0/webinspector/SourceCSSTokenizer.js
-share/webkitgtk-1.0/webinspector/SourceFrame.js
-share/webkitgtk-1.0/webinspector/SourceHTMLTokenizer.js
-share/webkitgtk-1.0/webinspector/SourceJavaScriptTokenizer.js
-share/webkitgtk-1.0/webinspector/SourceMapping.js
-share/webkitgtk-1.0/webinspector/SourceTokenizer.js
-share/webkitgtk-1.0/webinspector/Spectrum.js
-share/webkitgtk-1.0/webinspector/SplitView.js
-share/webkitgtk-1.0/webinspector/StatusBarButton.js
-share/webkitgtk-1.0/webinspector/StyleSheetOutlineDialog.js
-share/webkitgtk-1.0/webinspector/StyleSource.js
-share/webkitgtk-1.0/webinspector/StylesSidebarPane.js
-share/webkitgtk-1.0/webinspector/TabbedEditorContainer.js
-share/webkitgtk-1.0/webinspector/TabbedPane.js
-share/webkitgtk-1.0/webinspector/TestController.js
-share/webkitgtk-1.0/webinspector/TextEditor.js
-share/webkitgtk-1.0/webinspector/TextEditorHighlighter.js
-share/webkitgtk-1.0/webinspector/TextEditorModel.js
-share/webkitgtk-1.0/webinspector/TextPrompt.js
-share/webkitgtk-1.0/webinspector/TimelineFrameController.js
-share/webkitgtk-1.0/webinspector/TimelineGrid.js
-share/webkitgtk-1.0/webinspector/TimelineManager.js
-share/webkitgtk-1.0/webinspector/TimelineModel.js
-share/webkitgtk-1.0/webinspector/TimelineOverviewPane.js
-share/webkitgtk-1.0/webinspector/TimelinePanel.js
-share/webkitgtk-1.0/webinspector/TimelinePresentationModel.js
-share/webkitgtk-1.0/webinspector/Toolbar.js
-share/webkitgtk-1.0/webinspector/TopDownProfileDataGridTree.js
-share/webkitgtk-1.0/webinspector/UISourceCode.js
-share/webkitgtk-1.0/webinspector/UISourceCodeFrame.js
-share/webkitgtk-1.0/webinspector/UIString.js
-share/webkitgtk-1.0/webinspector/UIUtils.js
-share/webkitgtk-1.0/webinspector/UglifyJS/parse-js.js
-share/webkitgtk-1.0/webinspector/UserAgentSupport.js
-share/webkitgtk-1.0/webinspector/UserMetrics.js
-share/webkitgtk-1.0/webinspector/View.js
-share/webkitgtk-1.0/webinspector/WatchExpressionsSidebarPane.js
-share/webkitgtk-1.0/webinspector/WorkerManager.js
-share/webkitgtk-1.0/webinspector/WorkersSidebarPane.js
-share/webkitgtk-1.0/webinspector/Workspace.js
-share/webkitgtk-1.0/webinspector/auditsPanel.css
-share/webkitgtk-1.0/webinspector/breadcrumbList.css
-share/webkitgtk-1.0/webinspector/cmdevtools.css
-share/webkitgtk-1.0/webinspector/dataGrid.css
-share/webkitgtk-1.0/webinspector/dialog.css
-share/webkitgtk-1.0/webinspector/elementsPanel.css
-share/webkitgtk-1.0/webinspector/externs.js
-share/webkitgtk-1.0/webinspector/filteredItemSelectionDialog.css
-share/webkitgtk-1.0/webinspector/heapProfiler.css
-share/webkitgtk-1.0/webinspector/helpScreen.css
-share/webkitgtk-1.0/webinspector/indexedDBViews.css
-share/webkitgtk-1.0/webinspector/inspector.css
-share/webkitgtk-1.0/webinspector/inspector.html
-share/webkitgtk-1.0/webinspector/inspector.js
-share/webkitgtk-1.0/webinspector/inspectorCommon.css
-share/webkitgtk-1.0/webinspector/inspectorSyntaxHighlight.css
-share/webkitgtk-1.0/webinspector/jsdifflib.js
-share/webkitgtk-1.0/webinspector/localizedStrings.js
-share/webkitgtk-1.0/webinspector/nativeMemoryProfiler.css
-share/webkitgtk-1.0/webinspector/navigatorView.css
-share/webkitgtk-1.0/webinspector/networkLogView.css
-share/webkitgtk-1.0/webinspector/networkPanel.css
-share/webkitgtk-1.0/webinspector/panelEnablerView.css
-share/webkitgtk-1.0/webinspector/popover.css
-share/webkitgtk-1.0/webinspector/profilesPanel.css
-share/webkitgtk-1.0/webinspector/resourceView.css
-share/webkitgtk-1.0/webinspector/resourcesPanel.css
-share/webkitgtk-1.0/webinspector/revisionHistory.css
-share/webkitgtk-1.0/webinspector/scriptsPanel.css
-share/webkitgtk-1.0/webinspector/splitView.css
-share/webkitgtk-1.0/webinspector/tabbedPane.css
-share/webkitgtk-1.0/webinspector/test-runner.html
-share/webkitgtk-1.0/webinspector/textEditor.css
-share/webkitgtk-1.0/webinspector/textPrompt.css
-share/webkitgtk-1.0/webinspector/timelinePanel.css
-share/webkitgtk-1.0/webinspector/treeoutline.js
-share/webkitgtk-1.0/webinspector/utilities.js
diff --git a/www/webkit-gtk/buildlink3.mk b/www/webkit-gtk/buildlink3.mk
index 027d2702c16..7670e055dd1 100644
--- a/www/webkit-gtk/buildlink3.mk
+++ b/www/webkit-gtk/buildlink3.mk
@@ -1,23 +1,30 @@
-# $NetBSD: buildlink3.mk,v 1.42 2014/06/10 12:34:09 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.43 2014/08/03 22:30:05 wiz Exp $
 
 BUILDLINK_TREE+=	webkit-gtk
 
 .if !defined(WEBKIT_GTK_BUILDLINK3_MK)
 WEBKIT_GTK_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.webkit-gtk+=	webkit-gtk>=1.1.3
-BUILDLINK_ABI_DEPENDS.webkit-gtk+=	webkit-gtk>=1.10.2nb14<2
+BUILDLINK_API_DEPENDS.webkit-gtk+=	webkit-gtk>=2.0
 BUILDLINK_PKGSRCDIR.webkit-gtk?=	../../www/webkit-gtk
 
+pkgbase := webkit-gtk
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.webkit-gtk:Menchant)
+.include "../../textproc/enchant/buildlink3.mk"
+.endif
+
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
-.include "../../textproc/enchant/buildlink3.mk"
+.include "../../security/libsecret/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index e295c08e6b7..ffa517b42c3 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,34 +1,17 @@
-$NetBSD: distinfo,v 1.65 2013/08/14 22:16:54 jmcneill Exp $
+$NetBSD: distinfo,v 1.66 2014/08/03 22:30:05 wiz Exp $
 
-SHA1 (webkitgtk-1.10.2.tar.xz) = 733ca23157eb8dd072d57becf325799c00bde630
-RMD160 (webkitgtk-1.10.2.tar.xz) = 91e6b8bcd4bb8234271dd6c6ebdba63dd1c0840e
-Size (webkitgtk-1.10.2.tar.xz) = 8633640 bytes
-SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 448d9a096d87c3ecd22899ab66f45587cf8d1a65
-SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = c48648f62466f47dbb37d20bee01c1d0caa54b00
-SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 08f9ca5a4adbecf7f1aea9fcbc0de17ddc125259
-SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = c5e1efdac5f6e2a4c035b6a3ce808d0e7a076703
-SHA1 (patch-Source_JavaScriptCore_wtf_Threading.h) = f166335d829aba9051c1aaf1b950ec655deef372
-SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y) = 7b96aea5a81016b8a63c7f44839704261b39cd0d
-SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = ce9766427bebd4aac0b8c7fc2c12cc0ed75150d5
-SHA1 (patch-Source_WTF_wtf_Atomics.h) = 3cc890798e7e956b75c2a181eca4a4d05cb545fc
-SHA1 (patch-Source_WTF_wtf_Compiler.h) = 9e80acdbb57be1844103fe647a017ad7e46cc513
-SHA1 (patch-Source_WTF_wtf_MathExtras.h) = f922736410d49e7d7d1a459bffd3dffd0364e85a
-SHA1 (patch-Source_WTF_wtf_Platform.h) = 9e8f4b17619da4aa89e672c9d62a567f2f98b4bd
-SHA1 (patch-Source_WTF_wtf_RefCountedLeakCounter.h) = 3cdf53f9735675bff83b48a81db59c3512f306e3
-SHA1 (patch-Source_WTF_wtf_ThreadSafeRefCounted.h) = c068f8b248b8864eeaa582fa096eca279f06890e
-SHA1 (patch-Source_WebCore_Modules_webaudio_AudioContext.h) = 121b67efd25af6982f02a19d0b9e1e26be89e782
-SHA1 (patch-Source_WebCore_Modules_webaudio_AudioNode.h) = 1d22889087504d8fd42f38f72bde777850a4e767
-SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = b331ad70a9c6a133c854b65452bad4ae3558e2e6
-SHA1 (patch-Source_WebCore_editing_Editor.h) = 43562577dd6432a86fd8ee0a1e7bb0db31f07d2d
-SHA1 (patch-Source_WebCore_platform_gtk_FileSystemGtk.cpp) = 76e6e3e662edcfb7e327f2e475709a105d146e50
-SHA1 (patch-Source_WebCore_platform_network_DNSResolveQueue.h) = ba2960eeda95189a85744112b2533e66599eb4b7
-SHA1 (patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp) = 0f33b188b242166584d5725060c5c430a819be61
-SHA1 (patch-Source_WebKit2_WebProcess_WebCoreSupport_WebPlatformStrategies.cpp) = 92f4016fe65fc6162b7f6dfcdc4c6ea2f5204b02
-SHA1 (patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp) = 816cecbcb8ddf4af65265f5e76745b93f1055904
-SHA1 (patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp) = 36013247ccbc2df274762acb49304511c06cb0f7
-SHA1 (patch-ai) = 8df303ffde5c4398e56601c524e9ab4aff52096c
-SHA1 (patch-aj) = 930d1b5d73028b2f2e5abb33c15f72befadc64ce
-SHA1 (patch-ak) = 64ad843164f1c12968e933080e0966a9019abfdf
-SHA1 (patch-al) = e2041fda38ad0a4d8d5e4c31f184a812f5332b6b
-SHA1 (patch-am) = 9516994b630b43c7c234f61debf8d762cf7aee97
-SHA1 (patch-configure) = 448caea068344fe987e566f73b3f567dad7b93ed
+SHA1 (webkitgtk-2.4.4.tar.xz) = 0f7690bbaef69946c64793c8aa23cd2f00eac9ae
+RMD160 (webkitgtk-2.4.4.tar.xz) = ce454ad56b9a62217beaf33c0815e3ec09c10539
+Size (webkitgtk-2.4.4.tar.xz) = 9844048 bytes
+SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 69221390dd5fdac55abf341c5ae3a03267e38ae6
+SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = fdd31fcf6c745394499570397c82fe3dfce02e1d
+SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 67f66ca254f958c0650249485a64982b40f92621
+SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
+SHA1 (patch-Source_WTF_wtf_Platform.h) = 5ff82e77d1d5dea5514adbeede14fd4a8923dc9c
+SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 2835657e04cdbc0cc7be8a6793061f0b98f84224
+SHA1 (patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp) = 994d1671ff2d8e3a961b9b7ed34f69215ed46f91
+SHA1 (patch-ai) = 8e174c68e4ba06fdd6edd64fd6df3328faf9055f
+SHA1 (patch-aj) = d35a4b26e2104cdf7f3be81b020aabb4779dfaad
+SHA1 (patch-ak) = 477fd5c05abee8f47842a6ad5aba00e3e4628c45
+SHA1 (patch-am) = e0a350feb14d739010000e3887971bd535a647a7
+SHA1 (patch-configure) = 37322b62ab8f42ecf230c4be8cc27d453c8d688f
diff --git a/www/webkit-gtk/options.mk b/www/webkit-gtk/options.mk
index f730626337e..846a39af44c 100644
--- a/www/webkit-gtk/options.mk
+++ b/www/webkit-gtk/options.mk
@@ -1,27 +1,58 @@
-# $NetBSD: options.mk,v 1.4 2014/05/22 07:09:26 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2014/08/03 22:30:05 wiz Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.webkit-gtk
-PKG_SUPPORTED_OPTIONS=	webkit-jit debug
-PKG_SUGGESTED_OPTIONS=
+PKG_SUPPORTED_OPTIONS=	debug enchant opengl webkit-jit
+PKG_SUGGESTED_OPTIONS=	enchant opengl
 
 .include "../../mk/bsd.prefs.mk"
 
-# XXX JIT produces invalid code on NetBSD/i386
+# XXX JIT produces invalid code on NetBSD/i386 and NetBSD/amd64
 .if empty(MACHINE_PLATFORM:MNetBSD-*-i386) && empty(MACHINE_PLATFORM:MNetBSD-*-x86_64)
 PKG_SUGGESTED_OPTIONS+= webkit-jit
 .endif
 
 .include "../../mk/bsd.options.mk"
 
+#
+# JIT support
+#
 .if !empty(PKG_OPTIONS:Mwebkit-jit)
 CONFIGURE_ARGS+=	--enable-jit
 .else
 CONFIGURE_ARGS+=	--disable-jit
 .endif
 
+#
+# debug support
+#
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-debug
 .else
 CONFIGURE_ARGS+=	--disable-debug
 .endif
+
+#
+# OpenGL support: enable support for GLX, WebGL and accelerated compositing
+#
+# TODO: should we split them in multiple options?
+#
+.if !empty(PKG_OPTIONS:Mopengl)
+CONFIGURE_ARGS+=	--enable-glx
+CONFIGURE_ARGS+=	--enable-webgl
+CONFIGURE_ARGS+=	--enable-accelerated-compositing
+.else
+CONFIGURE_ARGS+=	--disable-glx
+CONFIGURE_ARGS+=	--disable-webgl
+CONFIGURE_ARGS+=	--disable-accelerated-compositing
+.endif
+
+#
+# Spellcheck support using enchant
+#
+.if !empty(PKG_OPTIONS:Menchant)
+CONFIGURE_ARGS+=	--enable-spellcheck
+.include "../../textproc/enchant/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-spellcheck
+.endif
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
deleted file mode 100644
index 20eeab94bc7..00000000000
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.1 2013/08/14 22:16:54 jmcneill Exp $
-
---- ./Source/JavaScriptCore/assembler/ARMAssembler.h.orig	2012-11-23 20:12:15.000000000 +0000
-+++ ./Source/JavaScriptCore/assembler/ARMAssembler.h
-@@ -27,6 +27,10 @@
- #ifndef ARMAssembler_h
- #define ARMAssembler_h
- 
-+#if OS(NETBSD)
-+#include <machine/sysarch.h>
-+#endif
-+
- #if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
- 
- #include "AssemblerBufferWithConstantPool.h"
-@@ -1041,6 +1045,11 @@ namespace JSC {
-             UNUSED_PARAM(size);
- #elif OS(QNX)
-             msync(code, size, MS_INVALIDATE_ICACHE);
-+#elif OS(NETBSD)
-+            struct arm_sync_icache_args args;
-+            args.addr = reinterpret_cast<uintptr_t>(code);
-+            args.len = size;
-+            sysarch(ARM_SYNC_ICACHE, &args);
- #else
- #error "The cacheFlush support is missing on this platform."
- #endif
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
index 4cfaa864c23..dcc74b391fa 100644
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
+++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.1 2013/08/14 22:16:54 jmcneill Exp $
+$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.2 2014/08/03 22:30:05 wiz Exp $
 
---- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig	2012-11-23 20:12:15.000000000 +0000
+--- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig	2014-03-19 11:10:05.000000000 +0000
 +++ Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp
-@@ -37,6 +37,8 @@
+@@ -42,6 +42,8 @@
  #include <unistd.h>
  #include <elf.h>
  #include <asm/hwcap.h>
@@ -11,9 +11,9 @@ $NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.1 2013/
  #endif
  
  namespace JSC {
-@@ -57,6 +59,16 @@ static bool isVFPPresent()
+@@ -62,6 +64,16 @@ static bool isVFPPresent()
      }
- #endif
+ #endif // OS(LINUX)
  
 +#if OS(NETBSD)
 +    size_t len;
@@ -23,8 +23,8 @@ $NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.1 2013/
 +    if (sysctlbyname("machdep.fpu_present", &flag, &len, NULL, 0) == 0) {
 +        return flag == 1;
 +    }
-+#endif
++#endif // OS(NETBSD)
 +
- #if (COMPILER(RVCT) && defined(__TARGET_FPU_VFP)) || (COMPILER(GCC) && defined(__VFP_FP__))
+ #if (COMPILER(GCC) && defined(__VFP_FP__))
      return true;
  #else
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h
index 7bfc21704b0..48f46a1e001 100644
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h
+++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-Source_JavaScriptCore_dfg_DFGNode.h,v 1.1 2013/08/14 22:16:54 jmcneill Exp $
+$NetBSD: patch-Source_JavaScriptCore_dfg_DFGNode.h,v 1.2 2014/08/03 22:30:05 wiz Exp $
 
---- Source/JavaScriptCore/dfg/DFGNode.h.orig	2012-11-23 20:12:15.000000000 +0000
+--- Source/JavaScriptCore/dfg/DFGNode.h.orig	2014-04-14 06:40:44.000000000 +0000
 +++ Source/JavaScriptCore/dfg/DFGNode.h
-@@ -65,7 +65,7 @@ struct StructureTransitionData {
+@@ -146,7 +146,7 @@ struct SwitchData {
  struct OpInfo {
      explicit OpInfo(int32_t value) : m_value(static_cast<uintptr_t>(value)) { }
      explicit OpInfo(uint32_t value) : m_value(static_cast<uintptr_t>(value)) { }
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp
index d94e0dd8438..3538106b94c 100644
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp
+++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.2 2012/10/30 12:46:30 drochner Exp $
+$NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.3 2014/08/03 22:30:05 wiz Exp $
 
---- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig	2012-10-16 15:22:38.000000000 +0000
+--- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig	2014-04-14 06:40:44.000000000 +0000
 +++ Source/JavaScriptCore/heap/MachineStackMarker.cpp
 @@ -20,6 +20,9 @@
   */
@@ -23,7 +23,7 @@ $NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.2 2012/10/3
  #include <thread.h>
  #else
  #include <pthread.h>
-@@ -313,6 +320,7 @@ typedef pthread_attr_t PlatformThreadReg
+@@ -310,6 +317,7 @@ typedef pthread_attr_t PlatformThreadReg
  #error Need a thread register struct for this platform
  #endif
  
@@ -31,7 +31,7 @@ $NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.2 2012/10/3
  static size_t getPlatformThreadRegisters(const PlatformThread& platformThread, PlatformThreadRegisters& regs)
  {
  #if OS(DARWIN)
-@@ -379,6 +387,7 @@ static size_t getPlatformThreadRegisters
+@@ -363,6 +371,7 @@ static size_t getPlatformThreadRegisters
  #error Need a way to get thread registers on this platform
  #endif
  }
@@ -39,15 +39,15 @@ $NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.2 2012/10/3
  
  static inline void* otherThreadStackPointer(const PlatformThreadRegisters& regs)
  {
-@@ -442,6 +451,7 @@ static inline void* otherThreadStackPoin
+@@ -425,6 +434,7 @@ static inline void* otherThreadStackPoin
  #endif
  }
  
 +#if !OS(SOLARIS)
  static void freePlatformThreadRegisters(PlatformThreadRegisters& regs)
  {
- #if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN) && !OS(QNX)
-@@ -450,20 +460,36 @@ static void freePlatformThreadRegisters(
+ #if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
+@@ -433,20 +443,36 @@ static void freePlatformThreadRegisters(
      UNUSED_PARAM(regs);
  #endif
  }
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_wtf_Threading.h b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_wtf_Threading.h
deleted file mode 100644
index 61941ab1a06..00000000000
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_wtf_Threading.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_wtf_Threading.h,v 1.3 2012/10/30 12:46:30 drochner Exp $
-
---- Source/WTF/wtf/Threading.h.orig	2012-08-27 19:05:10.000000000 +0000
-+++ Source/WTF/wtf/Threading.h
-@@ -112,6 +112,8 @@ using WTF::createThread;
- using WTF::currentThread;
- using WTF::detachThread;
- using WTF::waitForThreadCompletion;
-+#if !OS(SOLARIS)
- using WTF::yield;
-+#endif
- 
- #endif // Threading_h
diff --git a/www/webkit-gtk/patches/patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y b/www/webkit-gtk/patches/patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y
deleted file mode 100644
index 497553041f0..00000000000
--- a/www/webkit-gtk/patches/patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y,v 1.1 2013/08/01 06:14:54 wiz Exp $
-
---- Source/ThirdParty/ANGLE/src/compiler/glslang.y.orig	2012-11-23 20:12:16.000000000 +0000
-+++ Source/ThirdParty/ANGLE/src/compiler/glslang.y
-@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glsl
- %expect 1 /* One shift reduce conflict because of if | else */
- %pure-parser
- %parse-param {TParseContext* context}
-+%lex-param {TParseContext* context}
- 
- %union {
-     struct {
diff --git a/www/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h b/www/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h
index 031bf7e0031..5c27d6844ef 100644
--- a/www/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h
+++ b/www/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.2 2013/05/09 14:04:42 joerg Exp $
+$NetBSD: patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.3 2014/08/03 22:30:05 wiz Exp $
 
---- Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h.orig	2012-05-12 19:43:43.000000000 +0000
+--- Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h.orig	2013-09-09 09:20:59.000000000 +0000
 +++ Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h
 @@ -35,6 +35,7 @@
  
@@ -10,7 +10,7 @@ $NetBSD: patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.2
  
  // The user can define the following macros in the build script to
  // control Google Test's behavior.  If the user doesn't define a macro
-@@ -173,6 +174,7 @@
+@@ -175,6 +176,7 @@
  #include <stdlib.h>
  #include <stdio.h>
  #include <string.h>
@@ -18,7 +18,7 @@ $NetBSD: patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.2
  #ifndef _WIN32_WCE
  #include <sys/stat.h>
  #endif  // !_WIN32_WCE
-@@ -443,7 +445,14 @@
+@@ -448,7 +450,14 @@
  // GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header.  This does
  // not conform to the TR1 spec, which requires the header to be <tuple>.
  
@@ -27,9 +27,9 @@ $NetBSD: patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.2
 +#include <tuple>
 +namespace std {
 +  namespace tr1 {
-+    using ::std::tuple;
++     using ::std::tuple;
 +  }
-+}
++}   
 +#elif !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302
  // Until version 4.3.2, gcc has a bug that causes <tr1/functional>,
  // which is #included by <tr1/tuple>, to not compile when RTTI is
diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Atomics.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_Atomics.h
deleted file mode 100644
index bd55b914183..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Atomics.h
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_Atomics.h,v 1.1 2013/05/09 14:04:42 joerg Exp $
-
---- Source/WTF/wtf/Atomics.h.orig	2012-11-23 20:12:16.000000000 +0000
-+++ Source/WTF/wtf/Atomics.h
-@@ -72,7 +72,10 @@
- #elif OS(ANDROID)
- #include <sys/atomics.h>
- #elif COMPILER(GCC)
--#if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))) && !defined(__LSB_VERSION__)
-+#include <ciso646>
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+#include <atomic>
-+#elif ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))) && !defined(__LSB_VERSION__)
- #include <ext/atomicity.h>
- #else
- #include <bits/atomicity.h>
-@@ -112,6 +115,11 @@ inline int atomicDecrement(int volatile*
- inline int atomicIncrement(int volatile* addend) { return __atomic_inc(addend) + 1; }
- inline int atomicDecrement(int volatile* addend) { return __atomic_dec(addend) - 1; }
- 
-+#elif defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
-+inline int atomicIncrement(std::atomic<int> * addend) { return *addend++; }
-+inline int atomicDecrement(std::atomic<int> * addend) { return *addend--; }
-+
- #elif COMPILER(GCC) && !CPU(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
- #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
- 
-@@ -227,9 +235,16 @@ inline void memoryBarrierBeforeUnlock() 
- 
- #endif
- 
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+typedef std::atomic<int> atomic_int;
-+#else
-+typedef int volatile atomic_int;
-+#endif
-+
- } // namespace WTF
- 
- #if USE(LOCKFREE_THREADSAFEREFCOUNTED)
-+using WTF::atomic_int;
- using WTF::atomicDecrement;
- using WTF::atomicIncrement;
- #endif
diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Compiler.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_Compiler.h
deleted file mode 100644
index 94e3216fc4d..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Compiler.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_Compiler.h,v 1.1 2013/05/12 06:11:17 richard Exp $
-
---- Source/WTF/wtf/Compiler.h.orig	2012-11-23 20:12:16.000000000 +0000
-+++ Source/WTF/wtf/Compiler.h
-@@ -122,7 +122,7 @@
- 
- /* Specific compiler features */
- #if COMPILER(GCC) && !COMPILER(CLANG)
--#if GCC_VERSION_AT_LEAST(4, 7, 0) && __cplusplus >= 201103L
-+#if GCC_VERSION_AT_LEAST(4, 7, 0) && defined(__cplusplus) && __cplusplus >= 201103L
- #define WTF_COMPILER_SUPPORTS_CXX_RVALUE_REFERENCES 1
- #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1
- #define WTF_COMPILER_SUPPORTS_CXX_NULLPTR 1
diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h
deleted file mode 100644
index e240b1405cc..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_MathExtras.h,v 1.1 2013/02/22 23:54:07 jperkin Exp $
-
-Remove bogus Solaris check.
-
---- Source/WTF/wtf/MathExtras.h.orig	2012-10-16 15:22:38.000000000 +0000
-+++ Source/WTF/wtf/MathExtras.h
-@@ -288,7 +288,7 @@ inline bool isWithinIntRange(float x)
-     return x > static_cast<float>(std::numeric_limits<int>::min()) && x < static_cast<float>(std::numeric_limits<int>::max());
- }
- 
--#if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(SOLARIS)
-+#if !COMPILER(MSVC) && !COMPILER(RVCT)
- using std::isfinite;
- #if !COMPILER_QUIRK(GCC11_GLOBAL_ISINF_ISNAN)
- using std::isinf;
diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
index df14d442f0f..431998b1b87 100644
--- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
+++ b/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.1 2013/08/14 22:16:54 jmcneill Exp $
+$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.2 2014/08/03 22:30:05 wiz Exp $
 
---- Source/WTF/wtf/Platform.h.orig	2012-11-23 20:12:16.000000000 +0000
+--- Source/WTF/wtf/Platform.h.orig	2014-04-14 06:40:45.000000000 +0000
 +++ Source/WTF/wtf/Platform.h
-@@ -484,6 +484,11 @@
+@@ -618,6 +618,11 @@
  #define USE_SYSTEM_MALLOC 1
  #endif
  
@@ -11,6 +11,6 @@ $NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.1 2013/08/14 22:16:54 jmcneill Exp
 +#define USE_SYSTEM_MALLOC 1
 +#endif
 +
- #if PLATFORM(BLACKBERRY)
- #define WTF_USE_MERSENNE_TWISTER_19937 1
- #define WTF_USE_SKIA 1
+ #if !defined(ENABLE_GLOBAL_FASTMALLOC_NEW)
+ #define ENABLE_GLOBAL_FASTMALLOC_NEW 1
+ #endif
diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_RefCountedLeakCounter.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_RefCountedLeakCounter.h
deleted file mode 100644
index 1a6c8183cb1..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_RefCountedLeakCounter.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_RefCountedLeakCounter.h,v 1.1 2013/05/09 14:04:42 joerg Exp $
-
---- Source/WTF/wtf/RefCountedLeakCounter.h.orig	2013-05-08 07:48:32.000000000 +0000
-+++ Source/WTF/wtf/RefCountedLeakCounter.h
-@@ -38,11 +38,7 @@ namespace WTF {
- 
- #ifndef NDEBUG
-     private:
--#if COMPILER(MINGW) || COMPILER(MSVC7_OR_LOWER) || OS(WINCE)
--        int m_count;
--#else
--        volatile int m_count;
--#endif
-+        atomic_int m_count;
-         const char* m_description;
- #endif
-     };
diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_ThreadSafeRefCounted.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_ThreadSafeRefCounted.h
deleted file mode 100644
index c56a6577a47..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_ThreadSafeRefCounted.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_ThreadSafeRefCounted.h,v 1.1 2013/05/09 14:04:42 joerg Exp $
-
---- Source/WTF/wtf/ThreadSafeRefCounted.h.orig	2013-05-08 07:46:55.000000000 +0000
-+++ Source/WTF/wtf/ThreadSafeRefCounted.h
-@@ -96,7 +96,7 @@ public:
- #if !USE(LOCKFREE_THREADSAFEREFCOUNTED)
-         MutexLocker locker(m_mutex);
- #endif
--        return static_cast<int const volatile &>(m_refCount);
-+        return m_refCount;
-     }
- 
- protected:
-@@ -123,7 +123,7 @@ protected:
-     }
- 
- private:
--    int m_refCount;
-+    atomic_int m_refCount;
- #if !USE(LOCKFREE_THREADSAFEREFCOUNTED)
-     mutable Mutex m_mutex;
- #endif
diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_Modules_webaudio_AudioContext.h b/www/webkit-gtk/patches/patch-Source_WebCore_Modules_webaudio_AudioContext.h
deleted file mode 100644
index 9517bfcc937..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WebCore_Modules_webaudio_AudioContext.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Source_WebCore_Modules_webaudio_AudioContext.h,v 1.1 2013/05/09 14:04:42 joerg Exp $
-
---- Source/WebCore/Modules/webaudio/AudioContext.h.orig	2013-05-08 08:53:03.000000000 +0000
-+++ Source/WebCore/Modules/webaudio/AudioContext.h
-@@ -333,7 +333,7 @@ private:
-     enum { MaxNumberOfChannels = 32 };
- 
-     // Number of AudioBufferSourceNodes that are active (playing).
--    int m_activeSourceCount;
-+    atomic_int m_activeSourceCount;
- };
- 
- } // WebCore
diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_Modules_webaudio_AudioNode.h b/www/webkit-gtk/patches/patch-Source_WebCore_Modules_webaudio_AudioNode.h
deleted file mode 100644
index 515a94769ac..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WebCore_Modules_webaudio_AudioNode.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_WebCore_Modules_webaudio_AudioNode.h,v 1.1 2013/05/09 14:04:42 joerg Exp $
-
---- Source/WebCore/Modules/webaudio/AudioNode.h.orig	2013-05-08 08:53:26.000000000 +0000
-+++ Source/WebCore/Modules/webaudio/AudioNode.h
-@@ -178,8 +178,8 @@ private:
-     double m_lastNonSilentTime;
- 
-     // Ref-counting
--    volatile int m_normalRefCount;
--    volatile int m_connectionRefCount;
-+    atomic_int m_normalRefCount;
-+    atomic_int m_connectionRefCount;
-     
-     bool m_isMarkedForDeletion;
-     bool m_isDisabled;
diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp b/www/webkit-gtk/patches/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp
index 82e0bdf26dc..a9198ec462c 100644
--- a/www/webkit-gtk/patches/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp
+++ b/www/webkit-gtk/patches/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp
@@ -1,13 +1,13 @@
-$NetBSD: patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp,v 1.1 2013/02/02 16:59:35 jmcneill Exp $
+$NetBSD: patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp,v 1.2 2014/08/03 22:30:05 wiz Exp $
 
---- Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp.orig	2012-10-16 15:22:38.000000000 +0000
+--- Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp.orig	2014-04-14 06:40:45.000000000 +0000
 +++ Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp
 @@ -61,6 +61,8 @@ JSValue JSInspectorFrontendHost::platfor
-     DEFINE_STATIC_LOCAL(const String, platform, ("linux"));
+     DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("linux")));
  #elif OS(FREEBSD)
-     DEFINE_STATIC_LOCAL(const String, platform, ("freebsd"));
+     DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("freebsd")));
 +#elif OS(NETBSD)
-+    DEFINE_STATIC_LOCAL(const String, platform, ("netbsd"));
++    DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("netbsd")));
  #elif OS(OPENBSD)
-     DEFINE_STATIC_LOCAL(const String, platform, ("openbsd"));
+     DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("openbsd")));
  #elif OS(SOLARIS)
diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_editing_Editor.h b/www/webkit-gtk/patches/patch-Source_WebCore_editing_Editor.h
deleted file mode 100644
index 7c7de1e7491..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WebCore_editing_Editor.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Source_WebCore_editing_Editor.h,v 1.2 2012/10/30 12:46:30 drochner Exp $
-
---- Source/WebCore/editing/Editor.h.orig	2012-10-16 15:22:38.000000000 +0000
-+++ Source/WebCore/editing/Editor.h
-@@ -398,7 +398,7 @@ public:
-     Vector<String> dictationAlternativesForMarker(const DocumentMarker*);
-     void applyDictationAlternativelternative(const String& alternativeString);
- private:
--    virtual void willDetachPage() OVERRIDE;
-+    virtual void willDetachPage();
- 
-     OwnPtr<DeleteButtonController> m_deleteButtonController;
-     RefPtr<CompositeEditCommand> m_lastEditCommand;
diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_platform_gtk_FileSystemGtk.cpp b/www/webkit-gtk/patches/patch-Source_WebCore_platform_gtk_FileSystemGtk.cpp
deleted file mode 100644
index 5e571d8dce3..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WebCore_platform_gtk_FileSystemGtk.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Source_WebCore_platform_gtk_FileSystemGtk.cpp,v 1.1 2013/05/09 14:04:42 joerg Exp $
-
---- Source/WebCore/platform/gtk/FileSystemGtk.cpp.orig	2012-11-23 20:12:17.000000000 +0000
-+++ Source/WebCore/platform/gtk/FileSystemGtk.cpp
-@@ -222,7 +222,7 @@ CString sharedResourcesPath()
-     GOwnPtr<gchar> runtimeDir(g_win32_get_package_installation_directory_of_module(hmodule));
-     GOwnPtr<gchar> dataPath(g_build_filename(runtimeDir.get(), "share", "webkitgtk-"WEBKITGTK_API_VERSION_STRING, NULL));
- #else
--    GOwnPtr<gchar> dataPath(g_build_filename(DATA_DIR, "webkitgtk-"WEBKITGTK_API_VERSION_STRING, NULL));
-+    GOwnPtr<gchar> dataPath(g_build_filename(DATA_DIR, "webkitgtk-" WEBKITGTK_API_VERSION_STRING, NULL));
- #endif
- 
-     cachedPath = dataPath.get();
diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_platform_network_DNSResolveQueue.h b/www/webkit-gtk/patches/patch-Source_WebCore_platform_network_DNSResolveQueue.h
deleted file mode 100644
index fa43adfae24..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WebCore_platform_network_DNSResolveQueue.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Source_WebCore_platform_network_DNSResolveQueue.h,v 1.1 2013/05/09 14:04:42 joerg Exp $
-
---- Source/WebCore/platform/network/DNSResolveQueue.h.orig	2013-05-08 08:52:14.000000000 +0000
-+++ Source/WebCore/platform/network/DNSResolveQueue.h
-@@ -56,7 +56,7 @@ private:
-     void fired();
- 
-     HashSet<String> m_names;
--    int m_requestsInFlight;
-+    atomic_int m_requestsInFlight;
- };
- 
- }
diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp b/www/webkit-gtk/patches/patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp
deleted file mode 100644
index 5d2e6d62313..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp,v 1.1 2012/11/07 12:21:46 jperkin Exp $
-
-Fix "error: 'yield' was not declared in this scope"
-
---- Source/WebCore/platform/sql/SQLiteDatabase.cpp.orig	Wed Nov  7 07:59:38 2012
-+++ Source/WebCore/platform/sql/SQLiteDatabase.cpp	Wed Nov  7 07:59:58 2012
-@@ -125,7 +125,7 @@
-         if (!m_db)
-             return;
-         sqlite3_interrupt(m_db);
--        yield();
-+        WTF::yield();
-     }
- 
-     m_lockingMutex.unlock();
diff --git a/www/webkit-gtk/patches/patch-Source_WebKit2_WebProcess_WebCoreSupport_WebPlatformStrategies.cpp b/www/webkit-gtk/patches/patch-Source_WebKit2_WebProcess_WebCoreSupport_WebPlatformStrategies.cpp
deleted file mode 100644
index 802f0e39eff..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WebKit2_WebProcess_WebCoreSupport_WebPlatformStrategies.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Source_WebKit2_WebProcess_WebCoreSupport_WebPlatformStrategies.cpp,v 1.1 2013/05/09 14:04:42 joerg Exp $
-
---- Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp.orig	2013-05-08 08:54:13.000000000 +0000
-+++ Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
-@@ -118,7 +118,7 @@ void handleDidGetPlugins(uint64_t reques
- 
- static uint64_t generateRequestID()
- {
--    static int uniqueID;
-+    static atomic_int uniqueID;
-     return atomicIncrement(&uniqueID);
- }
- 
diff --git a/www/webkit-gtk/patches/patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp b/www/webkit-gtk/patches/patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp
index 2ab575dbab5..8b29acd6e23 100644
--- a/www/webkit-gtk/patches/patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp
+++ b/www/webkit-gtk/patches/patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp
@@ -1,12 +1,12 @@
-$NetBSD: patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp,v 1.1 2013/05/09 14:04:42 joerg Exp $
+$NetBSD: patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp,v 1.2 2014/08/03 22:30:05 wiz Exp $
 
---- Tools/DumpRenderTree/gtk/DumpRenderTree.cpp.orig	2012-11-23 20:12:19.000000000 +0000
+--- Tools/DumpRenderTree/gtk/DumpRenderTree.cpp.orig	2014-04-14 06:40:46.000000000 +0000
 +++ Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
-@@ -46,6 +46,7 @@
- #include "WorkQueueItem.h"
+@@ -47,6 +47,7 @@
  #include <JavaScriptCore/JavaScript.h>
+ #include <WebCore/platform/network/soup/GUniquePtrSoup.h>
  #include <cassert>
-+#include <clocale>
++#include <clocate>
  #include <cstdlib>
  #include <cstring>
  #include <getopt.h>
diff --git a/www/webkit-gtk/patches/patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp b/www/webkit-gtk/patches/patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp
deleted file mode 100644
index 57b4fe232a1..00000000000
--- a/www/webkit-gtk/patches/patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp,v 1.1 2013/05/09 14:04:42 joerg Exp $
-
---- Tools/DumpRenderTree/gtk/ImageDiff.cpp.orig	2013-05-02 21:03:34.000000000 +0000
-+++ Tools/DumpRenderTree/gtk/ImageDiff.cpp
-@@ -30,6 +30,7 @@
- #include <algorithm>
- #include <cmath>
- #include <cstdio>
-+#include <cstdlib>
- #include <cstring>
- #include <gdk/gdk.h>
- 
-@@ -157,7 +158,7 @@ void printImage(GdkPixbuf* image)
-         return; // Don't bail out, as we can still use the percentage output.
-     }
- 
--    printf("Content-Length: %"G_GSIZE_FORMAT"\n", bufferSize);
-+    printf("Content-Length: %" G_GSIZE_FORMAT "\n", bufferSize);
-     fwrite(buffer, 1, bufferSize, stdout);
- }
- 
diff --git a/www/webkit-gtk/patches/patch-ai b/www/webkit-gtk/patches/patch-ai
index 5ce80446d2f..335e233cf3a 100644
--- a/www/webkit-gtk/patches/patch-ai
+++ b/www/webkit-gtk/patches/patch-ai
@@ -1,17 +1,17 @@
-$NetBSD: patch-ai,v 1.3 2012/10/30 12:46:30 drochner Exp $
+$NetBSD: patch-ai,v 1.4 2014/08/03 22:30:05 wiz Exp $
 
---- Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp.orig	2012-04-24 01:38:21.000000000 +0000
+--- Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp.orig	2013-08-03 16:10:38.000000000 +0000
 +++ Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp
 @@ -39,6 +39,12 @@
- #if OS(ANDROID) || OS(HURD)
+ #if OS(HURD)
  // PTHREAD_KEYS_MAX is not defined in bionic nor in Hurd, so explicitly define it here.
  #define PTHREAD_KEYS_MAX 1024
-+#elif OS(NETBSD)
++#elif OS(NETBSD)  
 +#include <limits.h>
 +// PTHREAD_KEYS_MAX is not defined in 5.x
 +#ifndef PTHREAD_KEYS_MAX
 +#define PTHREAD_KEYS_MAX 256
-+#endif
++#endif  
  #else
  #include <limits.h>
  #endif
diff --git a/www/webkit-gtk/patches/patch-aj b/www/webkit-gtk/patches/patch-aj
index fd799101840..bd54dc5c9b8 100644
--- a/www/webkit-gtk/patches/patch-aj
+++ b/www/webkit-gtk/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.2 2012/10/30 12:46:30 drochner Exp $
+$NetBSD: patch-aj,v 1.3 2014/08/03 22:30:05 wiz Exp $
 
---- Source/WTF/wtf/InlineASM.h.orig	2012-10-16 15:22:38.000000000 +0000
+--- Source/WTF/wtf/InlineASM.h.orig	2014-04-14 06:40:45.000000000 +0000
 +++ Source/WTF/wtf/InlineASM.h
 @@ -42,7 +42,7 @@
  #define THUMB_FUNC_PARAM(name)
  #endif
  
 -#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
-+#if (OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(SOLARIS)) && CPU(X86_64) || (OS(SOLARIS) && CPU(X86))
++#if (OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(SOLARIS)) && CPU(X86_64) || (OS(SOLARIS) && CPU(X86)) 
  #define GLOBAL_REFERENCE(name) #name "@plt"
  #elif CPU(X86) && COMPILER(MINGW)
  #define GLOBAL_REFERENCE(name) "@" #name "@4"
diff --git a/www/webkit-gtk/patches/patch-ak b/www/webkit-gtk/patches/patch-ak
index 7a11a0c4cf2..e6ca19139d5 100644
--- a/www/webkit-gtk/patches/patch-ak
+++ b/www/webkit-gtk/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.3 2012/10/30 12:46:30 drochner Exp $
+$NetBSD: patch-ak,v 1.4 2014/08/03 22:30:05 wiz Exp $
 
---- Source/ThirdParty/ANGLE/src/compiler/osinclude.h.orig	2012-09-01 14:54:54.000000000 +0000
+--- Source/ThirdParty/ANGLE/src/compiler/osinclude.h.orig	2014-04-14 06:40:44.000000000 +0000
 +++ Source/ThirdParty/ANGLE/src/compiler/osinclude.h
 @@ -16,6 +16,7 @@
  #define ANGLE_OS_WIN
diff --git a/www/webkit-gtk/patches/patch-al b/www/webkit-gtk/patches/patch-al
deleted file mode 100644
index 7468c1e4e8d..00000000000
--- a/www/webkit-gtk/patches/patch-al
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-al,v 1.4 2013/05/12 06:11:17 richard Exp $
-
---- GNUmakefile.in.orig	2012-12-09 18:20:20.000000000 +0000
-+++ GNUmakefile.in
-@@ -21156,7 +21156,6 @@ Programs_minidom_CPPFLAGS = \
- 	$(javascriptcore_cppflags)
- 
- Programs_minidom_CFLAGS = \
--	-ansi \
- 	-fno-strict-aliasing \
- 	$(global_cflags) \
- 	$(GLOBALDEPS_CFLAGS)
-@@ -79732,6 +79731,8 @@ doc-maintainer-clean-local: clean
- 	-@rmdir Documentation
- 
- install-data-local:
-+
-+xinstall-data-local:
- 	@installfiles=`echo ./Documentation/webkitgtk/html/*`; \
- 	if test "$$installfiles" = './Documentation/webkitgtk/html/*'; \
- 	then echo 1>&2 'No documentation to install' ; \
-@@ -79772,7 +79773,7 @@ install-data-local:
- @ENABLE_WEBKIT2_TRUE@	      $${installdir}/webkit2gtk-$(DOC_MODULE_VERSION).devhelp2; \
- @ENABLE_WEBKIT2_TRUE@	  fi; \
- @ENABLE_WEBKIT2_TRUE@	fi
--	@$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
-+#	@$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
- 
- uninstall-local:
- 	@DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \
diff --git a/www/webkit-gtk/patches/patch-am b/www/webkit-gtk/patches/patch-am
index ff522713ace..4f637d16cf6 100644
--- a/www/webkit-gtk/patches/patch-am
+++ b/www/webkit-gtk/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.1 2012/10/30 12:46:30 drochner Exp $
+$NetBSD: patch-am,v 1.2 2014/08/03 22:30:05 wiz Exp $
 
---- Source/WTF/wtf/RAMSize.cpp.orig	2012-10-19 13:44:57.000000000 +0000
+--- Source/WTF/wtf/RAMSize.cpp.orig	2014-03-19 11:10:06.000000000 +0000
 +++ Source/WTF/wtf/RAMSize.cpp
 @@ -27,7 +27,7 @@
  #include "RAMSize.h"
@@ -11,7 +11,7 @@ $NetBSD: patch-am,v 1.1 2012/10/30 12:46:30 drochner Exp $
  #include <sys/param.h>
  #include <sys/types.h>
  #include <sys/sysctl.h>
-@@ -45,13 +45,17 @@ static const size_t ramSizeGuess = 128 *
+@@ -43,13 +43,17 @@ static const size_t ramSizeGuess = 128 *
  
  static size_t computeRAMSize()
  {
diff --git a/www/webkit-gtk/patches/patch-configure b/www/webkit-gtk/patches/patch-configure
index 133ff51dd37..7ef759e8ab4 100644
--- a/www/webkit-gtk/patches/patch-configure
+++ b/www/webkit-gtk/patches/patch-configure
@@ -1,33 +1,73 @@
-$NetBSD: patch-configure,v 1.5 2012/10/30 12:46:30 drochner Exp $
+$NetBSD: patch-configure,v 1.6 2014/08/03 22:30:05 wiz Exp $
 
---- configure.orig	2012-10-16 22:11:45.000000000 +0000
+--- configure.orig	2014-05-12 06:05:21.000000000 +0000
 +++ configure
-@@ -18587,10 +18587,6 @@ install-data-am: install-gsettings-schem
+@@ -4703,7 +4703,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -4749,7 +4749,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -4773,7 +4773,7 @@ rm -f core conftest.err conftest.$ac_obj
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -4818,7 +4818,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -4842,7 +4842,7 @@ rm -f core conftest.err conftest.$ac_obj
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -17312,10 +17312,13 @@ int
+ main ()
+ {
+   unsigned int major, minor, micro;
++  char *tmp_version;
  
- .SECONDARY: $(gsettings_SCHEMAS)
+   fclose (fopen ("conf.glibtest", "w"));
  
--gsettings__base_list = \
--  sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
--  sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
--
- install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
-@@ -18598,7 +18594,7 @@ install-gsettings-schemas: $(gsettings_S
- 	for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  echo "$$d$$p"; \
--	done | $(gsettings__base_list) | \
-+	done | \
- 	while read files; do \
- 	  echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \
- 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \
-@@ -22297,7 +22293,7 @@ fi
- fi
- 
- if test "$with_acceleration_backend" = "opengl"; then
--    OPENGL_LIBS="-lGL -ldl"
-+    OPENGL_LIBS="-lGL"
- fi
+-  if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
++  /* HP/UX 9 (%@#!) writes to sscanf strings */
++  tmp_version = g_strdup("$min_glib_version");
++  if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, &micro) != 3) {
+      printf("%s, bad version string\n", "$min_glib_version");
+      exit(1);
+    }
+@@ -21110,7 +21113,7 @@ fi
  
  
+     # On some Linux/Unix platforms, shm_* may only be available if linking against librt
+-    if test "$os_win32" = "no"; then
++    if test "$os_win32" = "no" && test "$os_openbsd" = "no" && test "$os_netbsd" = "no"; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5
+ $as_echo_n "checking for library containing shm_open... " >&6; }
+ if ${ac_cv_search_shm_open+:} false; then :