CVS commit: pkgsrc/www/webkit-gtk

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/webkit-gtk
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Mon, 9 Apr 2018 08:33:48 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Apr  9 08:33:48 UTC 2018

Modified Files:
        pkgsrc/www/webkit-gtk: Makefile PLIST distinfo options.mk
        pkgsrc/www/webkit-gtk/patches: patch-CMakeLists.txt
            patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp
            patch-Source_cmake_OptionsCommon.cmake
            patch-Source_cmake_OptionsGTK.cmake patch-aj
Added Files:
        pkgsrc/www/webkit-gtk/patches:
            patch-Source_JavaScriptCore_CMakeLists.txt
            patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp
            patch-Source_WTF_wtf_Platform.h
            patch-Source_WTF_wtf_ThreadSpecific.h
            patch-Source_WTF_wtf_dtoa_utils.h
            patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp
Removed Files:
        pkgsrc/www/webkit-gtk/patches:
            patch-Source_JavaScriptCore_API_JSStringRef.cpp
            patch-Source_JavaScriptCore_dfg_DFGNode.h
            patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp
            patch-Source_WTF_wtf_Compiler.h patch-Source_WebKit2_CMakeLists.txt
            patch-Source_WebKit2_Shared_API_c_WKString.cpp
            patch-Source_WebKit2_UIProcess_UserContent_WebUserContentControllerProxy.cpp
            patch-ai

Log Message:
webkit-gtk: Update www/webkit-gtk to 2.18.6

Based on the wip package mostly worked on by leot@
with support by yhardy and a host of others.

pkgsrc changes:
 - Add GCC_REQD to 5.0 as requested by webkit-gtk. Previously we had local
   kludges/patches to disable IndexedDB support. Unfortunately in the last
   releases is not so trivial to keep such patches so bump GCC_REQD as requested
   by upstream to avoid further problems.
 - Avoid `-DUSE_SYSTEM_MALLOC=ON'. It is no longer supported, at least on
   NetBSD/amd64 due unsupported part of sysinfo() in Source/WTF/wtf/RAMSize.cpp
   (add an XXX comment to document that)
 - Add an `introspection' option (enabled by default) to permit to build
   of webkit-gtk without gobject-introspection.
 - Add patches to fix support for ppc, add support for sparc64.
   From FreeBSD and OpenBSD ports.
 - Address `Error sending IPC message: Message too long' that appears at least
   on NetBSD via
   patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp.

Changes:
==================
WebKitGTK+  2.18.6
==================

What's new in WebKitGTK+ 2.18.6?

  - Fix deadlock in GStreamer video sink during shutdown when accelerated compositing is disabled.
  - Several fixes and improvements in WebDriver.
  - Security fixes: CVE-2018-4088, CVE-2017-13885, CVE-2017-7165, CVE-2017-13884, CVE-2017-7160,
    CVE-2017-7153, CVE-2017-7153, CVE-2017-7161, CVE-2018-4096.

==================
WebKitGTK+  2.18.5
==================

What's new in WebKitGTK+ 2.18.5?

  - Disable SharedArrayBuffers from Web API.
  - Reduce the precision of "high" resolution time to 1ms.
  - Fix API documentation generation with newer gtk-doc.
  - Security fixes: includes improvements to mitigate the effects of Spectre (CVE-2017-5753 and CVE-2017-5715).

==================
WebKitGTK+  2.18.4
==================

What's new in WebKitGTK+ 2.18.4?

  - Make WebDriver implementation more spec compliant.
  - Fix a bug when trying to remove cookies before a web process is spawned.
  - WebKitWebDriver process no longer links to libjavascriptcoregtk.
  - Fix several memory leaks in GStreamer media backend.
  - Security fixes: CVE-2017-13866, CVE-2017-13870, CVE-2017-7156, CVE-2017-13856.

==================
WebKitGTK+  2.18.3
==================

What's new in WebKitGTK+ 2.18.3?

  - Improve calculation of font metrics to prevent scrollbars from being shown unnecessarily in some cases.
  - Fix handling of null capabilities in WebDriver implementation.
  - Security fixes: CVE-2017-13798, CVE-2017-13788, CVE-2017-13803.

==================
WebKitGTK+  2.18.2
==================

What's new in WebKitGTK+ 2.18.2?

  - Fix rendering of arabic text.
  - Fix a crash in the web process when decoding GIF images.
  - Fix rendering of wind in Windy.com.
  - Fix several crashes and rendering issues.

==================
WebKitGTK+  2.18.1
==================

What's new in WebKitGTK+ 2.18.1?

  - Improve performance of GIF animations.
  - Fix garbled display in GMail.
  - Fix rendering of several material design icons when using the web font.
  - Fix flickering when resizing the window in Wayland.
  - Prevent default kerberos authentication credentials from being used in ephemeral sessions.
  - Fix a crash when webkit_web_resource_get_data() is cancelled.
  - Correctly handle touchmove and touchend events in WebKitWebView.
  - Fix the build with enchant 2.1.1.
  - Fix the build in HPPA and Alpha.
  - Fix several crashes and rendering issues.

==================
WebKitGTK+  2.18.0
==================

What's new in WebKitGTK+ 2.18.0?

  - Fix the API documentation generation.
  - Fix the build in ARM with NEON.
  - Fix the build for Clang with libc++.

==================
WebKitGTK+ 2.17.92
==================

What's new in WebKitGTK+ 2.17.92?

  - Improve CPU usage when rendering under Wayland in accelerated compositing mode.
  - Improve the memory consumption of the UI process under Wayland.
  - Fix rendering issues in some web sites with accelerated compositing enabled.
  - Fix a web process crash when closing the WebView.
  - Initialize libgcrypt in the network process too.
  - Show controls if a video element isn't allowed to play inline.
  - Add support for cookies and screenshots commands in WebDriver.
  - Fix several crashes and rendering issues.
  - Translation updates: Brazilian Portuguese, Polish.

==================
WebKitGTK+ 2.17.91
==================

What's new in WebKitGTK+ 2.17.91?

  - Fix proxy HTTP authentication for HTTPS requests.
  - Stop kinetic scrolling when a zero movement is reached.
  - Fix UI process crash when selecting text.
  - Fix UI process crash when loading a favicon.
  - Properly handle WebDriver click command on option elements.
  - Fix web process crash when resizing the window with accelerated compositing enabled.
  - Fix crashes in 32 bit systems due to incorrect use of GVariant.
  - Fix several crashes and rendering issues.

==================
WebKitGTK+ 2.17.90
==================

What's new in WebKitGTK+ 2.17.90?

  - WebCrypto API support is now enabled by default.
  - Add API to provide browser information required by automation.
  - Fix the expiration date of manually added cookies.
  - Add support for alerts in WebDriver.
  - WebKitDatabaseProcess binary has been renamed to WebKitStorageProcess.
  - Fix several crashes and rendering issues.

=================
WebKitGTK+ 2.17.5
=================

What's new in WebKitGTK+ 2.17.5?

  - Add initial implementation of WebDriver.
  - Enable GStreamerGL by default when building with GStreamer >= 1.10.
  - Fix position of context menu in Wayland.
  - Properly close cookies database at network process exit.
  - Fix several crashes and rendering issues.
  - Translation updates: Ukrainian.

=================
WebKitGTK+ 2.17.4
=================

What's new in WebKitGTK+ 2.17.4?

  - Add API to allow overriding popup menus.
  - Add kinetic scrolling support.
  - Improve theme rendering performance when using GTK+ >= 3.20.
  - Improve error message when webkit_web_view_run_javascript() fails due to a JavaScript exception.
  - Fix artifacts when rendering large images.
  - Fix blob downloads.
  - Fix web process deadlock when seeking youtube videos.
  - Fix alpha premultiplying when using cairo to draw the video frames.
  - Fix web process deadlock when closing the remote inspector frontend.
  - Update several web inspector icons.
  - Fix several crashes and rendering issues.
  - Translation updates: Spanish.

=================
WebKitGTK+ 2.17.3
=================

What's new in WebKitGTK+ 2.17.3?

  - Add new API to create a WebKitContextMenuItem from a GAction.
  - Fix graphics repaint hungs in accelerated compositing mode after a resize.
  - Fix rendering glitches in HiDPI in long GitHub Gist pages when focusing the comments textarea.
  - Remove Firefox user agent quirk for Google domains.
  - Remove LATEST_RECORD_VERSION from GnuTLS priority string.
  - Improve colors of inspector SVG icons.
  - Fix several crashes and rendering issues.
  - Translation updates: French.

=================
WebKitGTK+ 2.17.2
=================

What's new in WebKitGTK+ 2.17.2?

  - Update user agent quirks to make Youtube and new Google login page work.
  - Fix URL shown in the title of beforeunload dialogs.
  - Focus first input field of HTTP authentication dialog.
  - Fix rendering of PNG images when decoded in more than one chunk.
  - Update several web inspector icons.
  - Fix the build with OpenGL disabled.
  - Fix several crashes and rendering issues.

=================
WebKitGTK+ 2.17.1
=================

What's new in WebKitGTK+ 2.17.1?

  - Switch to use new remote inspector infraestructure instead of legacy Web Sockets based one.
  - Add API to enable and handle Web Automation.
  - Load large images asynchronously off the main theead.
  - Use GtkFileChooserNative for open/save dialogs when available.
  - Make file chooser run as modal by default if possible.
  - Fix position of dropdown menus in Wayland.
  - Keep URI fragments after a server redirection.
  - Implement support for aria-haspopup and aria-autocomplete.
  - Implement aria-value support for focusable separators.
  - Fix playing of some live streams.

=================
WebKitGTK+ 2.15.4
=================

What's new in WebKitGTK+ 2.15.4?

  - Make accelerating compositing mode on-demand again. By default it will only be used for websites
    that require it, saving a lot of memory on websites that don't need it.
  - Add API to manage hardware acceleration policy.
  - Enable CSS Grid Layout by default.
  - Add API to create ephemeral WebViews to replace the legacy private browsing setting that is now
    deprecated.
  - Handle HTTP authentication for downloads having a WebView associated.
  - Add API to WebKitWebsiteDataManager to handle websites data.
  - Fix BadDamage X errors happening when resizing the WebView.
  - Fix several crashes and rendering issues.

=================
WebKitGTK+ 2.15.3
=================

What's new in WebKitGTK+ 2.15.3?

  - Add API to set network proxy settings.
  - Add API to set initial notification permissions.
  - Add WebKitSecurityOrigin to the API.
  - Add tag property to WebKitNotification.
  - Create GLX OpenGL contexts using version 3.2 (core profile) when available to reduce the memory
    consumption on Mesa based drivers.
  - Improve memory pressure handler to reduce the CPU usage on memory pressure situations.
  - Add support for key and code properties on keyboard events.
  - More user agent string improvements to improve compatibility with several websites.
  - Fix network process crashes when loading custom URI schemes.
  - Fix web process crash when closing the web view in X11.
  - Fix several crashes and rendering issues.
  - Translation updates: German.

=================
WebKitGTK+ 2.15.2
=================

What's new in WebKitGTK+ 2.15.2?

  - Add new API to notify about dynamically added forms to Web Extensions.
  - Implement selection interface and states for elements supporting aria-selected and for menu roles.
  - Expose STATE_SINGLE_LINE and STATE_MULTI_LINE for ARIA searchbox role.
  - Enable WebMemorySampler.
  - Downloads started by context menu actions now have a web view associated.
  - Fix a network process crash when main resource load is converted into a download.
  - Fix several crashes and rendering issues.

=================
WebKitGTK+ 2.15.1
=================

What's new in WebKitGTK+ 2.15.1?

  - GObject DOM bindings API marked as unstable has been removed.
  - Expose WebKitDOMHTMLInputElement APIs for form autofill.
  - Properly update WebKitWebView and WebKitWebPage URI properties when request is modified by
    WebKitWebPage:send-request signal.
  - Switch to use GMenu internally in the context menu implementation.
  - Dot not leak the default WebKitWebsiteDataManager in WebKitWebContext.
  - The network backend now always sniff contents for Downloads.
  - Use eglGetPlatformDisplay when available instead of eglGetDisplay.
  - Avoid strstr() when checking (E)GL extensions.
  - Fix the build with ENABLE_OPENGL=OFF and allow to build on Wayland without OpenGL again.
  - Fix several crashes and rendering issues.

=================
WebKitGTK+ 2.13.4
=================

What's new in WebKitGTK+ 2.13.4?

  - Switched to use the threaded compositor. Accelerated compositing mode is now always enabled by default
    and happens in a separate thread in the web process.
  - Make web view background colors work in accelerated compositing mode.
  - Fix several crashes and rendering issues.

=================
WebKitGTK+ 2.13.3
=================

What's new in WebKitGTK+ 2.13.3?

  - Fix Web Process deadlocks when loading HLS videos.
  - Make videos work when painted into a canvas when accelerated compositing is enabled.
  - Fix flickering with animated GIFs.
  - Fix a Web Process crash when video repaint is requested with GStreamer GL enabled.
  - Reduce the amount of file descriptors that the Web Process keeps open.
  - Make memory pressure handler work when cgroups are not available.
  - Fix several crashes and rendering issues.

=================
WebKitGTK+ 2.13.2
=================

What's new in WebKitGTK+ 2.13.2?

  - Properly redraw the web view when reparented in force compositing mode.
  - Flip the volume control layout in media controls on RTL.
  - Add support for video orientation to the GStreamer media backend.
  - Fix several crashes and rendering issues.

=================
WebKitGTK+ 2.13.1
=================

What's new in WebKitGTK+ 2.13.1?

  - CSS Grid Layout has been unprefixed and can be enabled as an experimental feature at runtime.
  - The HTTP disk cache implements speculative resources revalidation.
  - Add a new WebKitSetting to allow universal access from file URLs.
  - Fix several crashes and rendering issues.


To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 pkgsrc/www/webkit-gtk/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/www/webkit-gtk/PLIST
cvs rdiff -u -r1.95 -r1.96 pkgsrc/www/webkit-gtk/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/webkit-gtk/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_API_JSStringRef.cpp \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit2_CMakeLists.txt \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit2_Shared_API_c_WKString.cpp \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit2_UIProcess_UserContent_WebUserContentControllerProxy.cpp
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_CMakeLists.txt \
    pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_ThreadSpecific.h \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp
cvs rdiff -u -r1.5 -r0 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h \
    pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Compiler.h
cvs rdiff -u -r0 -r1.9 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake
cvs rdiff -u -r1.12 -r1.13 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake
cvs rdiff -u -r1.7 -r0 pkgsrc/www/webkit-gtk/patches/patch-ai
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/webkit-gtk/patches/patch-aj

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/webkit-gtk/Makefile
diff -u pkgsrc/www/webkit-gtk/Makefile:1.131 pkgsrc/www/webkit-gtk/Makefile:1.132
--- pkgsrc/www/webkit-gtk/Makefile:1.131        Mon Mar 12 11:15:48 2018
+++ pkgsrc/www/webkit-gtk/Makefile      Mon Apr  9 08:33:48 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.131 2018/03/12 11:15:48 wiz Exp $
+# $NetBSD: Makefile,v 1.132 2018/04/09 08:33:48 wiz Exp $
 
-DISTNAME=      webkitgtk-2.12.4
+DISTNAME=      webkitgtk-2.18.6
 PKGNAME=       ${DISTNAME:S/webkitgtk/webkit-gtk/}
-PKGREVISION=   10
 CATEGORIES=    www
 MASTER_SITES=  https://www.webkitgtk.org/releases/
 EXTRACT_SUFX=  .tar.xz
@@ -22,12 +21,7 @@ USE_LANGUAGES=       c c++11
 #USE_LIBTOOL=  yes
 USE_TOOLS+=    automake bison gmake perl:build pkg-config msgfmt
 
-# GCC >= 4.7 or Clang >= 3.3
-# XXX: Kludge, upstream needs GCC 4.9.0 for IndexedDB support.
-# XXX: patches/patch-Source_cmake_OptionsGTK.cmake and
-# XXX: patches/patch-Source_WTF_wtf_Compiler.h disables that to
-# XXX: avoid requiring GCC 4.9.0.
-GCC_REQD+=     4.7
+GCC_REQD+=     5.0
 
 # Using ld.gold subverts Pkgsrc wrappers, and this package also crashes buggy
 # versions of ld.gold.
@@ -37,11 +31,14 @@ PKGCONFIG_OVERRIDE+=        Source/JavaScriptCo
 PKGCONFIG_OVERRIDE+=   Source/WebKit2/webkit2gtk.pc.in
 PKGCONFIG_OVERRIDE+=   Source/WebKit2/webkit2gtk-web-extension.pc.in
 
+CMAKE_ARGS+=           -DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=           -DPORT=GTK
 CMAKE_ARGS+=           -DENABLE_X11_TARGET=ON
 CMAKE_ARGS+=           -DENABLE_MINIBROWSER=ON
 CMAKE_ARGS+=           -DENABLE_GEOLOCATION=OFF
+CMAKE_ARGS+=           -DUSE_GSTREAMER_GL=OFF
 CMAKE_ARGS+=           -DUSE_LIBHYPHEN=OFF
+#CMAKE_ARGS+=          -DUSE_SYSTEM_MALLOC=ON # XXX: needs adjustements for sysinfo() stuffs in Source/WTF/wtf/RAMSize.cpp
 
 REPLACE_PERL+= Source/JavaScriptCore/create_hash_table \
                Source/WebCore/bindings/scripts/*.pl \
@@ -70,18 +67,10 @@ CXXFLAGS.SunOS+=    -fpermissive
 CXXFLAGS+=     -Wno-c++11-narrowing
 .endif
 
-.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
-CMAKE_ARGS+=   -DUSE_SYSTEM_MALLOC=ON
-.endif
-
 .include "options.mk"
 
 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=0.9.5
-BUILDLINK_DEPMETHOD.gobject-introspection+=    build
-.include "../../devel/gobject-introspection/buildlink3.mk"
-CMAKE_ARGS+=   -DENABLE_INTROSPECTION=ON
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 # A correct Webkit build requires flex 2.5.33

Index: pkgsrc/www/webkit-gtk/PLIST
diff -u pkgsrc/www/webkit-gtk/PLIST:1.35 pkgsrc/www/webkit-gtk/PLIST:1.36
--- pkgsrc/www/webkit-gtk/PLIST:1.35    Mon Sep  5 08:06:24 2016
+++ pkgsrc/www/webkit-gtk/PLIST Mon Apr  9 08:33:48 2018
@@ -1,15 +1,17 @@
-@comment $NetBSD: PLIST,v 1.35 2016/09/05 08:06:24 leot Exp $
-bin/MiniBrowser
-bin/jsc
+@comment $NetBSD: PLIST,v 1.36 2018/04/09 08:33:48 wiz Exp $
+bin/WebKitWebDriver
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
 include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
 include/webkitgtk-4.0/JavaScriptCore/JSObjectRef.h
 include/webkitgtk-4.0/JavaScriptCore/JSStringRef.h
+include/webkitgtk-4.0/JavaScriptCore/JSTypedArray.h
 include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h
 include/webkitgtk-4.0/JavaScriptCore/JavaScript.h
 include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h
+include/webkitgtk-4.0/webkit2/WebKitApplicationInfo.h
 include/webkitgtk-4.0/webkit2/WebKitAuthenticationRequest.h
 include/webkitgtk-4.0/webkit2/WebKitAutocleanups.h
+include/webkitgtk-4.0/webkit2/WebKitAutomationSession.h
 include/webkitgtk-4.0/webkit2/WebKitBackForwardList.h
 include/webkitgtk-4.0/webkit2/WebKitBackForwardListItem.h
 include/webkitgtk-4.0/webkit2/WebKitColorChooserRequest.h
@@ -38,16 +40,21 @@ include/webkitgtk-4.0/webkit2/WebKitJava
 include/webkitgtk-4.0/webkit2/WebKitMimeInfo.h
 include/webkitgtk-4.0/webkit2/WebKitNavigationAction.h
 include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h
+include/webkitgtk-4.0/webkit2/WebKitNetworkProxySettings.h
 include/webkitgtk-4.0/webkit2/WebKitNotification.h
 include/webkitgtk-4.0/webkit2/WebKitNotificationPermissionRequest.h
+include/webkitgtk-4.0/webkit2/WebKitOptionMenu.h
+include/webkitgtk-4.0/webkit2/WebKitOptionMenuItem.h
 include/webkitgtk-4.0/webkit2/WebKitPermissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitPlugin.h
 include/webkitgtk-4.0/webkit2/WebKitPolicyDecision.h
+include/webkitgtk-4.0/webkit2/WebKitPrintCustomWidget.h
 include/webkitgtk-4.0/webkit2/WebKitPrintOperation.h
 include/webkitgtk-4.0/webkit2/WebKitResponsePolicyDecision.h
 include/webkitgtk-4.0/webkit2/WebKitScriptDialog.h
 include/webkitgtk-4.0/webkit2/WebKitScriptWorld.h
 include/webkitgtk-4.0/webkit2/WebKitSecurityManager.h
+include/webkitgtk-4.0/webkit2/WebKitSecurityOrigin.h
 include/webkitgtk-4.0/webkit2/WebKitSettings.h
 include/webkitgtk-4.0/webkit2/WebKitURIRequest.h
 include/webkitgtk-4.0/webkit2/WebKitURIResponse.h
@@ -67,79 +74,52 @@ include/webkitgtk-4.0/webkit2/WebKitWebR
 include/webkitgtk-4.0/webkit2/WebKitWebView.h
 include/webkitgtk-4.0/webkit2/WebKitWebViewBase.h
 include/webkitgtk-4.0/webkit2/WebKitWebViewSessionState.h
+include/webkitgtk-4.0/webkit2/WebKitWebsiteData.h
 include/webkitgtk-4.0/webkit2/WebKitWebsiteDataManager.h
 include/webkitgtk-4.0/webkit2/WebKitWindowProperties.h
 include/webkitgtk-4.0/webkit2/webkit-web-extension.h
 include/webkitgtk-4.0/webkit2/webkit2.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMAttr.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMAttrUnstable.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMAudioTrack.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMAudioTrackList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMBarProp.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMBatteryManager.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMBlob.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMBlobUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCDATASection.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCSSRule.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCSSRuleList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMCSSRuleUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCSSStyleDeclaration.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCSSStyleSheet.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCSSValue.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCharacterData.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMCharacterDataUnstable.h
+include/webkitgtk-4.0/webkitdom/WebKitDOMClientRect.h
+include/webkitgtk-4.0/webkitdom/WebKitDOMClientRectList.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMComment.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCustom.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCustomUnstable.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDOMApplicationCache.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDOMImplementation.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDOMMimeType.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDOMMimeTypeArray.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDOMNamedFlowCollection.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDOMPlugin.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDOMPluginArray.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDOMSelection.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDOMStringList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDOMStringMap.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDOMTokenList.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDOMWindow.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDOMWindowCSS.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDOMWindowSpeechSynthesis.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDOMWindowUnstable.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDataCue.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDatabase.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDeprecated.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDocument.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDocumentFragment.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDocumentFragmentUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDocumentType.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMDocumentTypeUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMDocumentUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMEvent.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMEventTarget.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMEventUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMFile.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMFileList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMGamepad.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMGamepadList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMGeolocation.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLAnchorElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLAnchorElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLAppletElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLAreaElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLAreaElementUnstable.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLAudioElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLBRElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLBaseElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLBodyElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLButtonElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLButtonElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLCanvasElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLCollection.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLDListElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLDetailsElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLDirectoryElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLDivElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLDocument.h
@@ -147,157 +127,94 @@ include/webkitgtk-4.0/webkitdom/WebKitDO
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLEmbedElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLFieldSetElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLFieldSetElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLFontElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLFormElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLFormElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLFrameElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLFrameSetElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLHRElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLHeadElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLHeadingElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLHtmlElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLHtmlElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLIFrameElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLIFrameElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLImageElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLImageElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLInputElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLInputElementUnstable.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLKeygenElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLLIElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLLabelElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLLabelElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLLegendElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLLinkElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLLinkElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLMapElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLMarqueeElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLMarqueeElementUnstable.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLMediaElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLMenuElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLMetaElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLModElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLOListElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLOListElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLObjectElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLObjectElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLOptGroupElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLOptionElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLOptionsCollection.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLOptionsCollectionUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLParagraphElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLParamElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLPreElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLQuoteElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLScriptElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLScriptElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLSelectElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLSelectElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLStyleElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableCaptionElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableCellElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableColElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableRowElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTableSectionElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTextAreaElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTextAreaElementUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLTitleElement.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLUListElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHTMLVideoElement.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMHistory.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMKeyboardEvent.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMLocation.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMMediaController.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMMediaDevices.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMMediaError.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMMediaList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMMediaQueryList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMMediaTrackSupportedConstraints.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMMessagePort.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMMouseEvent.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMMouseEventUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMNamedNodeMap.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMNavigator.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMNavigatorMediaDevices.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMNode.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMNodeFilter.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMNodeIterator.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMNodeList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMNodeUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMObject.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMPerformance.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMPerformanceEntry.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMPerformanceEntryList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMPerformanceNavigation.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMPerformanceTiming.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMProcessingInstruction.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMRange.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMRangeUnstable.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMScreen.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMSpeechSynthesis.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMSpeechSynthesisEvent.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMSpeechSynthesisUtterance.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMSpeechSynthesisVoice.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMStorage.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMStorageInfo.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMStorageQuota.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMStyleMedia.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMStyleSheet.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMStyleSheetList.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMText.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMTextTrack.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMTextTrackCue.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMTextTrackCueList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMTextTrackList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMTimeRanges.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMTouch.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMTrackEvent.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMTreeWalker.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMUIEvent.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMUIEventUnstable.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMUserMessageHandler.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMUserMessageHandlersNamespace.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMVTTCue.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMValidityState.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMVideoPlaybackQuality.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMVideoTrack.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMVideoTrackList.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMWebKitNamedFlow.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMWebKitNamespace.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMWebKitPoint.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEvent.h
-include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEventUnstable.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMXPathExpression.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMXPathNSResolver.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMXPathResult.h
 include/webkitgtk-4.0/webkitdom/webkitdom.h
-include/webkitgtk-4.0/webkitdom/webkitdomautocleanups-unstable.h
 include/webkitgtk-4.0/webkitdom/webkitdomautocleanups.h
-include/webkitgtk-4.0/webkitdom/webkitdomdefines-unstable.h
 include/webkitgtk-4.0/webkitdom/webkitdomdefines.h
-lib/girepository-1.0/JavaScriptCore-4.0.typelib
-lib/girepository-1.0/WebKit2-4.0.typelib
-lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
+${PLIST.introspection}lib/girepository-1.0/JavaScriptCore-4.0.typelib
+${PLIST.introspection}lib/girepository-1.0/WebKit2-4.0.typelib
+${PLIST.introspection}lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
 lib/libjavascriptcoregtk-4.0.so
 lib/libjavascriptcoregtk-4.0.so.18
-lib/libjavascriptcoregtk-4.0.so.18.3.12
+lib/libjavascriptcoregtk-4.0.so.18.6.15
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.13.10
+lib/libwebkit2gtk-4.0.so.37.24.9
 lib/pkgconfig/javascriptcoregtk-4.0.pc
 lib/pkgconfig/webkit2gtk-4.0.pc
 lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
 lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
+libexec/webkit2gtk-4.0/MiniBrowser
 libexec/webkit2gtk-4.0/WebKitNetworkProcess
 libexec/webkit2gtk-4.0/WebKitPluginProcess
 libexec/webkit2gtk-4.0/WebKitPluginProcess2
+libexec/webkit2gtk-4.0/WebKitStorageProcess
 libexec/webkit2gtk-4.0/WebKitWebProcess
-share/gir-1.0/JavaScriptCore-4.0.gir
-share/gir-1.0/WebKit2-4.0.gir
-share/gir-1.0/WebKit2WebExtension-4.0.gir
+libexec/webkit2gtk-4.0/jsc
+${PLIST.introspection}share/gir-1.0/JavaScriptCore-4.0.gir
+${PLIST.introspection}share/gir-1.0/WebKit2-4.0.gir
+${PLIST.introspection}share/gir-1.0/WebKit2WebExtension-4.0.gir
 share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/bg/LC_MESSAGES/WebKit2GTK-4.0.mo

Index: pkgsrc/www/webkit-gtk/distinfo
diff -u pkgsrc/www/webkit-gtk/distinfo:1.95 pkgsrc/www/webkit-gtk/distinfo:1.96
--- pkgsrc/www/webkit-gtk/distinfo:1.95 Tue Apr 25 10:37:26 2017
+++ pkgsrc/www/webkit-gtk/distinfo      Mon Apr  9 08:33:48 2018
@@ -1,25 +1,23 @@
-$NetBSD: distinfo,v 1.95 2017/04/25 10:37:26 wiz Exp $
+$NetBSD: distinfo,v 1.96 2018/04/09 08:33:48 wiz Exp $
 
-SHA1 (webkitgtk-2.12.4.tar.xz) = ebfe6015d81129b6a13a9596d065c54e9c1b93f6
-RMD160 (webkitgtk-2.12.4.tar.xz) = 9bccd3c05f3c6a28d36f2bb5fdb3a9a58be10539
-SHA512 (webkitgtk-2.12.4.tar.xz) = c512f36679e0f8278544faad70e3b79108ddb4cd52339c5fb784cbb83857c2d30fd240b3e91dd9ecc1b1195f3086844e0716c8284d992b75b4feffda749d73be
-Size (webkitgtk-2.12.4.tar.xz) = 11708368 bytes
-SHA1 (patch-CMakeLists.txt) = c48c0e5d33f378b7ecf31fffef609fb2501e5cd3
-SHA1 (patch-Source_JavaScriptCore_API_JSStringRef.cpp) = 419425db19f685335eab01099d0a941614a2a99c
+SHA1 (webkitgtk-2.18.6.tar.xz) = fb0daa85142cfe8822de518dfaa7bd5c3cdd6c23
+RMD160 (webkitgtk-2.18.6.tar.xz) = 20a786dee806313e7ff692178160eb0ae40ccf24
+SHA512 (webkitgtk-2.18.6.tar.xz) = 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029
+Size (webkitgtk-2.18.6.tar.xz) = 14829316 bytes
+SHA1 (patch-CMakeLists.txt) = 0ecf9070dc387b206b8c8083914c1fa0514a8ecc
+SHA1 (patch-Source_JavaScriptCore_CMakeLists.txt) = 1b3485f72d809b2a1d6ec047b36331a6489fd10d
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 99e46f9d9b26a8d9ba6b29c66d7ce5326c4ffeb6
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = f78e6150ed8901b3fe046b2ef182f50f1c7500a4
-SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 0d82552c6cc1f4885a2bcc539963c966216c977c
-SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = dd8c03f924d9b96abc9ba5d3a315fefc096be7b0
+SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 2f20d6aa8f1ec4122bee9f2f95b736ee4496812f
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
-SHA1 (patch-Source_WTF_wtf_Compiler.h) = f4f7771e4b421dddf9f73c7131e671d0c34b906c
 SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 01195978abe07154fbc28de9efc47b3f3105fd89
+SHA1 (patch-Source_WTF_wtf_Platform.h) = 3253f20593d5a92869da74774609a57eb289148b
+SHA1 (patch-Source_WTF_wtf_ThreadSpecific.h) = 38a85e10a72fe38d286a2ce747e090a2955b8791
+SHA1 (patch-Source_WTF_wtf_dtoa_utils.h) = 192bb016ef584f26967de94d29ee5e43db6fb1f0
 SHA1 (patch-Source_WebCore_platform_FileSystem.cpp) = adef1a42c4e210f0a3dcb82807e2d2039684a0ec
 SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
-SHA1 (patch-Source_WebKit2_CMakeLists.txt) = 10a3fca678095ad04ce43e6d291e3907a44f67b4
-SHA1 (patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 7fbaf11853209cbfea5bb370d35ac985eb30f7ef
-SHA1 (patch-Source_WebKit2_Shared_API_c_WKString.cpp) = 0a735e069ad6412e5c7850067ade0abe24487c1f
-SHA1 (patch-Source_WebKit2_UIProcess_UserContent_WebUserContentControllerProxy.cpp) = 8af6225e01c0fbae866110c3aad46eae5c55ac9e
-SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 09a837ee65cdc79cc22220ce713e346fe8752c50
-SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 92a0d1563eda8a30a80c4ca3e115e8320d306bf5
-SHA1 (patch-ai) = b8a45f2f5c1aa5aed178527ecd6cbd93baf76f8e
-SHA1 (patch-aj) = 8247194bd8d62fcc356650c946756898fbe22982
+SHA1 (patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 99192d0551e18f3373324d5be8bbeab00a2f79e8
+SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = 9c58253868e06b3dd3cac936651ba7e6a1437fc6
+SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 03b72552414e7114bfa7ddc2d68fd97009a5ff7d
+SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 8eb8e9c2c9aeaed86cd95c61c86e0f3786385ac9
+SHA1 (patch-aj) = cd9a280c3bbab82c1a7aeb62a27ee6eb96c67ec2

Index: pkgsrc/www/webkit-gtk/options.mk
diff -u pkgsrc/www/webkit-gtk/options.mk:1.11 pkgsrc/www/webkit-gtk/options.mk:1.12
--- pkgsrc/www/webkit-gtk/options.mk:1.11       Tue Apr 12 07:58:04 2016
+++ pkgsrc/www/webkit-gtk/options.mk    Mon Apr  9 08:33:48 2018
@@ -1,9 +1,11 @@
-# $NetBSD: options.mk,v 1.11 2016/04/12 07:58:04 leot Exp $
+# $NetBSD: options.mk,v 1.12 2018/04/09 08:33:48 wiz Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.webkit-gtk
-PKG_SUPPORTED_OPTIONS= enchant opengl webkit-jit
-PKG_SUGGESTED_OPTIONS= enchant opengl
+PKG_SUPPORTED_OPTIONS= debug enchant introspection opengl webkit-jit
+PKG_SUGGESTED_OPTIONS= enchant introspection opengl
+
+PLIST_VARS=    introspection
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -47,3 +49,25 @@ CMAKE_ARGS+= -DENABLE_SPELLCHECK=ON
 .else
 CMAKE_ARGS+=   -DENABLE_SPELLCHECK=OFF
 .endif
+
+#
+# Debug build
+#
+.if !empty(PKG_OPTIONS:Mdebug)
+CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Debug
+.else
+CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
+.endif
+
+#
+# Introspection
+#
+.if !empty(PKG_OPTIONS:Mintrospection)
+PLIST.introspection=                           yes
+BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=0.9.5
+BUILDLINK_DEPMETHOD.gobject-introspection+=    build
+.include "../../devel/gobject-introspection/buildlink3.mk"
+CMAKE_ARGS+=   -DENABLE_INTROSPECTION=ON
+.else
+CMAKE_ARGS+=   -DENABLE_INTROSPECTION=OFF
+.endif

Index: pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt
diff -u pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt:1.2 pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt:1.2      Thu Jan 21 13:42:33 2016
+++ pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt  Mon Apr  9 08:33:48 2018
@@ -1,8 +1,12 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2016/01/21 13:42:33 leot Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2018/04/09 08:33:48 wiz Exp $
 
---- CMakeLists.txt.orig        2016-01-20 12:12:59.000000000 +0000
+- Fix support for arm
+- Fix support for ppc and add support for sparc64.
+  From FreeBSD and OpenBSD ports.
+
+--- CMakeLists.txt.orig        2017-10-17 10:07:00.000000000 +0000
 +++ CMakeLists.txt
-@@ -87,6 +87,8 @@ else ()
+@@ -78,6 +78,8 @@ else ()
  endif ()
  if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
      set(WTF_CPU_ARM 1)
@@ -10,4 +14,22 @@ $NetBSD: patch-CMakeLists.txt,v 1.2 2016
 +    set(WTF_CPU_ARM 1)
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
      set(WTF_CPU_ARM64 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "alpha*")
+@@ -90,7 +92,7 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
+     set(WTF_CPU_X86_64 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
+     set(WTF_CPU_X86 1)
+-elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc|powerpc)")
+     set(WTF_CPU_PPC 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
+     set(WTF_CPU_PPC64 1)
+@@ -102,6 +104,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
+     set(WTF_CPU_S390 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
+     set(WTF_CPU_S390X 1)
++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sparc64")
++    set(WTF_CPU_SPARC64 1)
+ else ()
+     message(FATAL_ERROR "Unknown CPU '${LOWERCASE_CMAKE_SYSTEM_PROCESSOR}'")
+ endif ()

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp:1.1 
pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp:1.2
--- pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp:1.1      Thu Apr 13 16:58:14 2017
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp  Mon Apr  9 08:33:48 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp,v 1.1 2017/04/13 16:58:14 jperkin Exp $
+$NetBSD: patch-Source_WebKit2_NetworkProcess_cache_NetworkCacheFileSystem.cpp,v 1.2 2018/04/09 08:33:48 wiz Exp $
 
 SunOS does not support dirent d_type.
 
---- Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.cpp.orig        2016-07-20 12:15:24.000000000 +0000
-+++ Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.cpp
-@@ -44,6 +44,12 @@ namespace NetworkCache {
+--- Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp.orig 2017-02-20 16:20:17.000000000 +0000
++++ Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp
+@@ -52,6 +52,12 @@ namespace NetworkCache {
  
  static DirectoryEntryType directoryEntryType(uint8_t dtype)
  {
@@ -17,9 +17,9 @@ SunOS does not support dirent d_type.
      switch (dtype) {
      case DT_DIR:
          return DirectoryEntryType::Directory;
-@@ -57,12 +63,20 @@ static DirectoryEntryType directoryEntry
+@@ -65,12 +71,20 @@ static DirectoryEntryType directoryEntry
  
- void traverseDirectory(const String& path, const std::function<void (const String&, DirectoryEntryType)>& function)
+ void traverseDirectory(const String& path, const Function<void (const String&, DirectoryEntryType)>& function)
  {
 +#ifdef __sun
 +    struct stat s;
@@ -38,7 +38,7 @@ SunOS does not support dirent d_type.
              continue;
          const char* name = dp->d_name;
          if (!strcmp(name, ".") || !strcmp(name, ".."))
-@@ -70,7 +84,11 @@ void traverseDirectory(const String& pat
+@@ -78,7 +92,11 @@ void traverseDirectory(const String& pat
          auto nameString = String::fromUTF8(name);
          if (nameString.isNull())
              continue;

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake:1.3 pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake:1.4
--- pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake:1.3    Thu Jan 21 13:42:33 2016
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake        Mon Apr  9 08:33:48 2018
@@ -1,21 +1,21 @@
-$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.3 2016/01/21 13:42:33 leot Exp $
+$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.4 2018/04/09 08:33:48 wiz Exp $
 
 Using the T option of GNU ar lead to malformed .a archive on NetBSD. Disable it.
 
---- Source/cmake/OptionsCommon.cmake.orig      2016-01-20 12:13:00.000000000 +0000
+--- Source/cmake/OptionsCommon.cmake.orig      2017-02-27 07:11:15.000000000 +0000
 +++ Source/cmake/OptionsCommon.cmake
-@@ -17,10 +17,10 @@ endif ()
- 
- execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION)
- if ("${AR_VERSION}" MATCHES "^GNU ar")
--    set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
--    set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
--    set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>")
--    set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>")
-+    set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
-+    set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
-+    set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>")
-+    set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>")
+@@ -27,10 +27,10 @@ option(USE_THIN_ARCHIVES "Produce all st
+ if (USE_THIN_ARCHIVES)
+     execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION)
+     if ("${AR_VERSION}" MATCHES "^GNU ar")
+-        set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
+-        set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
+-        set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>")
+-        set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>")
++        set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
++        set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
++        set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>")
++        set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>")
+     endif ()
  endif ()
  
- set_property(GLOBAL PROPERTY USE_FOLDERS ON)

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake:1.12 pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake:1.13
--- pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake:1.12      Thu Apr 13 16:58:14 2017
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake   Mon Apr  9 08:33:48 2018
@@ -1,6 +1,5 @@
-$NetBSD: patch-Source_cmake_OptionsGTK.cmake,v 1.12 2017/04/13 16:58:14 jperkin Exp $
+$NetBSD: patch-Source_cmake_OptionsGTK.cmake,v 1.13 2018/04/09 08:33:48 wiz Exp $
 
-o Do not require GCC 4.9.0 (should be build *without* IndexedDB support)
 o Do not conflict with CMAKE_MODULE_PATH during the linking phase of
   libwebkit2gtk-4.0.so:
 
@@ -11,26 +10,11 @@ o Do not conflict with CMAKE_MODULE_PATH
    Source/WebKit2/CMakeFiles/WebKit2.dir/build.make:16139: recipe for target 'lib/libwebkit2gtk-4.0.so.37.2.6' failed
    [...]
 
-o Disable DatabaseProcess and IndexedDB support.
 o Do not use --version-script on SunOS
 
---- Source/cmake/OptionsGTK.cmake.orig 2016-08-24 06:45:01.000000000 +0000
+--- Source/cmake/OptionsGTK.cmake.orig 2017-10-27 09:31:34.000000000 +0000
 +++ Source/cmake/OptionsGTK.cmake
-@@ -6,13 +6,6 @@ set(PROJECT_VERSION_MICRO 4)
- set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
- set(WEBKITGTK_API_VERSION 4.0)
- 
--# IndexedDB support requires GCC 4.9, see https://bugs.webkit.org/show_bug.cgi?id=98932.
--if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
--    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9.0")
--        message(FATAL_ERROR "GCC 4.9.0 is required to build WebKitGTK+, use a newer GCC version or clang")
--    endif ()
--endif ()
--
- # Libtool library version, not to be confused with API version.
- # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
- CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 50 10 13)
-@@ -116,8 +109,8 @@ if (DEVELOPER_MODE)
+@@ -108,8 +108,8 @@ if (DEVELOPER_MODE)
  else ()
      WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC OFF)
      WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE OFF)
@@ -41,17 +25,3 @@ o Do not use --version-script on SunOS
      endif ()
  endif ()
  
-@@ -152,11 +145,11 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)
--WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE ${ENABLE_FTL_DEFAULT})
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PRIVATE ON)
--WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PRIVATE OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PRIVATE OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_WEB_AUDIO PRIVATE OFF)

Index: pkgsrc/www/webkit-gtk/patches/patch-aj
diff -u pkgsrc/www/webkit-gtk/patches/patch-aj:1.5 pkgsrc/www/webkit-gtk/patches/patch-aj:1.6
--- pkgsrc/www/webkit-gtk/patches/patch-aj:1.5  Sat Sep 26 10:16:38 2015
+++ pkgsrc/www/webkit-gtk/patches/patch-aj      Mon Apr  9 08:33:48 2018
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.5 2015/09/26 10:16:38 leot Exp $
+$NetBSD: patch-aj,v 1.6 2018/04/09 08:33:48 wiz Exp $
 
---- Source/WTF/wtf/InlineASM.h.orig    2015-07-22 12:37:57.000000000 +0000
+--- Source/WTF/wtf/InlineASM.h.orig    2017-02-20 16:20:15.000000000 +0000
 +++ Source/WTF/wtf/InlineASM.h
 @@ -40,7 +40,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(OPENBSD) || 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"

Added files:

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_CMakeLists.txt
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_CMakeLists.txt:1.1
--- /dev/null   Mon Apr  9 08:33:48 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_CMakeLists.txt    Mon Apr  9 08:33:48 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-Source_JavaScriptCore_CMakeLists.txt,v 1.1 2018/04/09 08:33:48 wiz Exp $
+
+Add support for sparc64.
+
+From OpenBSD ports.
+
+--- Source/JavaScriptCore/CMakeLists.txt.orig  Tue Feb 28 09:34:11 2017
++++ Source/JavaScriptCore/CMakeLists.txt       Sun Mar 26 13:55:13 2017
+@@ -1481,6 +1481,7 @@ elseif (WTF_CPU_PPC64)
+ elseif (WTF_CPU_PPC64LE)
+ elseif (WTF_CPU_S390)
+ elseif (WTF_CPU_S390X)
++elseif (WTF_CPU_SPARC64)
+ elseif (WTF_CPU_MIPS)
+ elseif (WTF_CPU_SH4)
+ elseif (WTF_CPU_X86)
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp:1.1
--- /dev/null   Mon Apr  9 08:33:48 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp       Mon Apr  9 08:33:48 2018
@@ -0,0 +1,19 @@
+$NetBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp,v 1.1 2018/04/09 08:33:48 wiz Exp $
+
+Avoid to (pre)allocate 1GB of memory:
+
+ <https://bugs.webkit.org/show_bug.cgi?id=61137>
+
+From FreeBSD and OpenBSD ports.
+
+--- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig     2017-08-09 09:13:42.000000000 +0000
++++ Source/JavaScriptCore/jit/ExecutableAllocator.cpp
+@@ -88,7 +88,7 @@ static const size_t fixedExecutableMemor
+ static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024;
+ #elif CPU(ARM64)
+ static const size_t fixedExecutableMemoryPoolSize = 64 * 1024 * 1024;
+-#elif CPU(X86_64)
++#elif CPU(X86_64) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+ static const size_t fixedExecutableMemoryPoolSize = 1024 * 1024 * 1024;
+ #else
+ static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024;
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_ThreadSpecific.h
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_ThreadSpecific.h:1.1
--- /dev/null   Mon Apr  9 08:33:48 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_ThreadSpecific.h Mon Apr  9 08:33:48 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-Source_WTF_wtf_ThreadSpecific.h,v 1.1 2018/04/09 08:33:48 wiz Exp $
+
+--- Source/WTF/wtf/ThreadSpecific.h.orig       2017-08-14 09:04:46.000000000 +0000
++++ Source/WTF/wtf/ThreadSpecific.h
+@@ -52,6 +52,11 @@
+ #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)
++// PTHREAD_KEYS_MAX is not defined in 5.x
++#ifndef PTHREAD_KEYS_MAX
++#define PTHREAD_KEYS_MAX 256
++#endif
+ #else
+ #include <limits.h>
+ #endif
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h:1.1
--- /dev/null   Mon Apr  9 08:33:48 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h     Mon Apr  9 08:33:48 2018
@@ -0,0 +1,17 @@
+$NetBSD: patch-Source_WTF_wtf_dtoa_utils.h,v 1.1 2018/04/09 08:33:48 wiz Exp $
+
+Add support for sparc64.
+
+From OpenBSD ports.
+
+--- Source/WTF/wtf/dtoa/utils.h.orig   Wed Mar  4 15:25:16 2015
++++ Source/WTF/wtf/dtoa/utils.h        Fri Mar 27 10:18:18 2015
+@@ -49,7 +49,7 @@
+ defined(__ARMEL__) || \
+ defined(_MIPS_ARCH_MIPS32R2)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(SPARC64)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(_M_IX86) || defined(__i386__)
+ #if defined(_WIN32)
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp:1.1
--- /dev/null   Mon Apr  9 08:33:48 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp      Mon Apr  9 08:33:48 2018
@@ -0,0 +1,24 @@
+$NetBSD: patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp,v 1.1 2018/04/09 08:33:48 wiz Exp $
+
+On NetBSD we see ""Error sending IPC message: Message too long" due to
+the use of sendmsg with a large message body (EMSGSIZE).
+
+WebKit already uses shared memory to communicate the message body when
+the message is too large, so force it to always use this method to avoid
+encountering EMSGSIZE.
+
+--- Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp.orig    2017-08-09 09:13:52.000000000 +0000
++++ Source/WebKit/Platform/IPC/unix/ConnectionUnix.cpp
+@@ -380,8 +380,12 @@ bool Connection::sendOutgoingMessage(std
+         return false;
+     }
+ 
++#if 0
+     size_t messageSizeWithBodyInline = sizeof(MessageInfo) + (outputMessage.attachments().size() * sizeof(AttachmentInfo)) + outputMessage.bodySize();
+     if (messageSizeWithBodyInline > messageMaxSize && outputMessage.bodySize()) {
++#else
++    {
++#endif
+         RefPtr<WebKit::SharedMemory> oolMessageBody = WebKit::SharedMemory::allocate(encoder->bufferSize());
+         if (!oolMessageBody)
+             return false;

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h:1.9
--- /dev/null   Mon Apr  9 08:33:48 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h       Mon Apr  9 08:33:48 2018
@@ -0,0 +1,51 @@
+$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.9 2018/04/09 08:33:48 wiz Exp $
+
+Add support for sparc64:
+
+ <https://bugs.webkit.org/show_bug.cgi?id=129963>
+
+From OpenBSD ports.
+
+--- Source/WTF/wtf/Platform.h.orig     2017-10-16 12:18:56.000000000 +0000
++++ Source/WTF/wtf/Platform.h
+@@ -155,6 +155,12 @@
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
+ 
++/* CPU(SPARC64) - SPARC V9 */
++#if defined(__sparc64__)
++#define WTF_CPU_SPARC64 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
+ /* CPU(X86) - i386 / x86 32-bit */
+ #if   defined(__i386__) \
+     || defined(i386)     \
+@@ -353,7 +359,7 @@
+ 
+ #endif /* ARM */
+ 
+-#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ALPHA) || CPU(HPPA)
++#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ALPHA) || CPU(HPPA) || CPU(SPARC64)
+ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
+ #endif
+ 
+@@ -713,7 +719,8 @@
+     || CPU(S390X) \
+     || CPU(MIPS64) \
+     || CPU(PPC64) \
+-    || CPU(PPC64LE)
++    || CPU(PPC64LE) \
++    || CPU(SPARC64)
+ #define USE_JSVALUE64 1
+ #else
+ #define USE_JSVALUE32_64 1
+@@ -770,7 +777,7 @@
+ 
+ #if !defined(ENABLE_DFG_JIT) && ENABLE(JIT)
+ /* Enable the DFG JIT on X86 and X86_64. */
+-#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(WINDOWS) || OS(HURD))
++#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD) || OS(WINDOWS) || OS(HURD))
+ #define ENABLE_DFG_JIT 1
+ #endif
+ /* Enable the DFG JIT on ARMv7.  Only tested on iOS and Qt/GTK+ Linux. */

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index