webkit-gtk: Update to 2.26.0

pkgsrc changes:
 - When built with gcc, 7.3.0 or newer is now needed

Changes:
WebKitGTK 2.26.0
================
 - Disable process swap on navigation.
 - Do not enable the sandbox in Snap.
 - Fix sandbox parsing DISPLAY on X11.
 - Translation updates: Brazilian Portuguese, German.

WebKitGTK 2.25.92
=================
 - Add WEBKIT_USE_SINGLE_WEB_PROCESS environment variable to force single
   process model in all WebKitWebContext.
   This is a temporary solution for applications still depending on the
   single process mode behavior. It will be only available in 2.26 series.
 - Add new API to remove a filter from an user content manager given its
   identifier.
 - Add support for HSTS.
 - Several improvements and bug fixes in MSE media player.
 - Fix building without unified sources.
 - Fix several crashes and rendering issues.
 - Translation updates: Polish, Ukrainian.

WebKitGTK 2.25.4
================
 - Switch to use libsoup WebSockets API.
 - Add support for permessage-deflate WebSocket extension.
 - Add support for datalist element in text input fields.
 - Fix a crash with empty video source.
 - Fix several crashes and rendering issues.

WebKitGTK 2.25.3
================
 - Remove support for GTK2 NPAPI plugins.
 - Fix web view updates after swapping web process if accelerated
   compositing mode is forced.
 - Make kinetic scrolling work again.
 - Fix position of emoji chooser when page is scrolled.
 - Fix web process deadlock when scrolling twitter timeline which contains
   HLS videos.
 - Make navigation gesture use dark fallback background color color on dark
   themes.
 - Make Previous/Next gesture work in RTL mode.
 - Support cancelling touchscreen back/forward gesture.
 - Add user agent quirk to make github work in FreeBSD.
 - Fix content disappearing when using CSS transforms.
 - Fix some radio streams that could not be played.
 - Fix video pause that sometimes caused to skip to finish.
 - Fix volume level changes when playing a video.
 - Fix several crashes and rendering issues.

WebKitGTK 2.25.2
================
 - Enable process switch on cross site navigation.
 - Use libwpe with fdo backend to implement accelerated compositing under
   wayland.
 - Fix rendering artifacts in youtube volume button.
 - Fix trapezoid artifact in github comment box.
 - Ensure web extensions directory is readable when sandbox is enabled.
 - Fix the executable name of WebDriver process, renamed by mistake in
   2.25.1.
 - Enable hyperlink auditing setting by default.
 - Remove the option to build without using the redirected XComposite window.
 - Fix HLS streams being slow to start.
 - Make accessibility work when sandbox is enabled.
 - Fix several crashes and rendering issues.

WebKitGTK 2.25.1
================
 - Add support for subprocess sandboxing.
 - Add API to get the web process unique identifier of a WebKitFrame.
 - Add WebKitWebPage::did-associate-form-controls-for-frame signal and
   deprecate did-associate-form-controls.
 - Implement AtkComponentIface scroll_to methods.
 - Improve rendering of form controls when GTK theme is dark and enable
   prefers-color-scheme media query.
 - Show the emoji chooser popover for editable content.
 - Fix touch capabilities detection for websites checking touch events
   properties present in window or pointer media queries.
 - Fix several crashes and rendering issues.

16 files changed, 121 insertions, 61 deletions

diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index a6221afbaa1..fd5e8aff1d7 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.171 2019/08/28 10:11:09 leot Exp $
+# $NetBSD: Makefile,v 1.172 2019/09/10 22:10:04 leot Exp $
 
-DISTNAME=	webkitgtk-2.24.4
+DISTNAME=	webkitgtk-2.26.0
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
 CATEGORIES=	www
 MASTER_SITES=	https://www.webkitgtk.org/releases/
@@ -23,8 +23,8 @@ USE_TOOLS+=	automake bash bison flex gmake perl pkg-config msgfmt
 # Enabling -gdwarf-2 hits GNU ar limits on file size.
 CTF_SUPPORTED=	no
 
-# GCC >= 6.0.0 is required, checked via CMakeLists.txt
-GCC_REQD+=		6
+# GCC >= 7.3.0 is required, checked via CMakeLists.txt
+GCC_REQD+=		7
 USE_GCC_RUNTIME=	yes
 
 # Using ld.gold subverts Pkgsrc wrappers, and this package also crashes buggy
@@ -146,8 +146,6 @@ BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.42.2nb3
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.24.17nb3
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libXdamage/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST
index 3da4c0e9632..586b1830e43 100644
--- a/www/webkit-gtk/PLIST
+++ b/www/webkit-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.52 2019/08/28 10:11:09 leot Exp $
+@comment $NetBSD: PLIST,v 1.53 2019/09/10 22:10:04 leot Exp $
 bin/WebKitWebDriver
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
 include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
@@ -45,6 +45,7 @@ include/webkitgtk-4.0/webkit2/WebKitFindController.h
 include/webkitgtk-4.0/webkit2/WebKitFormSubmissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitForwardDeclarations.h
 include/webkitgtk-4.0/webkit2/WebKitFrame.h
+include/webkitgtk-4.0/webkit2/WebKitGeolocationManager.h
 include/webkitgtk-4.0/webkit2/WebKitGeolocationPermissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitHitTestResult.h
 include/webkitgtk-4.0/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h
@@ -212,10 +213,10 @@ ${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.13.7
+lib/libjavascriptcoregtk-4.0.so.18.14.5
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.37.6
+lib/libwebkit2gtk-4.0.so.37.39.1
 lib/pkgconfig/javascriptcoregtk-4.0.pc
 lib/pkgconfig/webkit2gtk-4.0.pc
 lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
@@ -223,7 +224,6 @@ 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/WebKitWebProcess
 libexec/webkit2gtk-4.0/jsc
 ${PLIST.introspection}share/gir-1.0/JavaScriptCore-4.0.gir
diff --git a/www/webkit-gtk/buildlink3.mk b/www/webkit-gtk/buildlink3.mk
index dc14e07c4e5..fa84b6851ab 100644
--- a/www/webkit-gtk/buildlink3.mk
+++ b/www/webkit-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.73 2019/07/21 22:24:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.74 2019/09/10 22:10:04 leot Exp $
 
 BUILDLINK_TREE+=	webkit-gtk
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.webkit-gtk?=	webkit-gtk>=2.24.3nb1
 BUILDLINK_PKGSRCDIR.webkit-gtk?=	../../www/webkit-gtk
 
 # This is necessary to match the package requirement.
-GCC_REQD+=	6
+GCC_REQD+=	7.3
 
 pkgbase := webkit-gtk
 .include "../../mk/pkg-build-options.mk"
@@ -31,7 +31,6 @@ pkgbase := webkit-gtk
 .include "../../security/libsecret/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libXdamage/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index cfd25abe32d..f8959b7551d 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,24 +1,25 @@
-$NetBSD: distinfo,v 1.125 2019/08/28 10:11:09 leot Exp $
+$NetBSD: distinfo,v 1.126 2019/09/10 22:10:04 leot Exp $
 
-SHA1 (webkitgtk-2.24.4.tar.xz) = f978b967422c6b423b11062375bab6506243388c
-RMD160 (webkitgtk-2.24.4.tar.xz) = 1f18a5475cd7ad5191c4412f6a1755294ef3e473
-SHA512 (webkitgtk-2.24.4.tar.xz) = 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
-Size (webkitgtk-2.24.4.tar.xz) = 17575784 bytes
-SHA1 (patch-CMakeLists.txt) = 571c65d258b6e12503971145777a8d442578145f
-SHA1 (patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh) = 5bb44be142b474d517b2b1459f0edc7d2453aa61
+SHA1 (webkitgtk-2.26.0.tar.xz) = e0c6f707bdf9edf3d444117736cb3c040eca78e7
+RMD160 (webkitgtk-2.26.0.tar.xz) = b1edf5799ca58bf1b449b510d97515b36fa1a965
+SHA512 (webkitgtk-2.26.0.tar.xz) = 0af18d56c441b36a30dd0e5b16315ae35fad309ad1b940bed27fb615c228dbee6c2992c89ab8b76bbe924ee18f5fc11598fa882397ae29dc00ebddf4d301c228
+Size (webkitgtk-2.26.0.tar.xz) = 19321552 bytes
+SHA1 (patch-CMakeLists.txt) = 08f647f6928bf3fce0dabb02586e1447d16da297
+SHA1 (patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh) = f4f117e6c1cd8eb8e4905f74946e0367156ed528
 SHA1 (patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh) = 308a7c8f687253b4fc75de0c66016dd18666e697
 SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 2a8f28316ffd1acc0e8c746ad8c9cee9aaf8c611
-SHA1 (patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h) = 985c19ffb6a16df031bd284f7e79041adb8cd311
+SHA1 (patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h) = 70975aac175ec4131a4ed26a54dfe51e16ffb7cd
 SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = e6a23d5ef22bddd0a9606fb0e472960e4cf5673e
 SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = d600887955128cecece21ba401f6f53ba5cfbeb6
 SHA1 (patch-Source_JavaScriptCore_offlineasm_arm64.rb) = 8c05dafa317667bbf55504d05eeb8ae06fba4e93
 SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 23bc86a389f8009ec829c3ee0fe3effe3f20b012
+SHA1 (patch-Source_ThirdParty_ANGLE_adjust-angle-include-paths.sh) = b536bcbe0ac4ff158b5bc35dfa363d00120ed2f0
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = a5454eb891ad1f9d8285c28af2e9efb4ff439e6b
-SHA1 (patch-Source_WTF_wtf_FileSystem.cpp) = 9d6204ce6663f3b32d195e307540c5cc5e7a7988
+SHA1 (patch-Source_WTF_wtf_FileSystem.cpp) = 53a8e65970f15202b3cdf1f4149d35b431c32a46
 SHA1 (patch-Source_WTF_wtf_Platform.h) = 584720f4e248ff7e51166c267d08954786c28ab7
 SHA1 (patch-Source_WTF_wtf_RAMSize.cpp) = b440e7041f72e76ab840977fc4d48d6dd32ed2ed
 SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3
-SHA1 (patch-Source_WebCore_Scripts_check-xcfilelists.sh) = 2a7ff15a2ec01a77481f85a6ca613bb7a3c18355
+SHA1 (patch-Source_WebCore_Scripts_check-xcfilelists.sh) = b292baf2494bcd459d9af91386263123046c6615
 SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 740eb33931b6f9cb8008748323235f23466328dc
 SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3
 SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 16b36d2d91fd7f43156b9ee09bcafd19602ebbd9
@@ -26,11 +27,13 @@ SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d09
 SHA1 (patch-Source_WebKit_CMakeLists.txt) = 228cc4734de3b08a3877ac839b1ffa2fbf2d3aa8
 SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 8c19692e78b1cfb021b95435508a10bc6542b173
 SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 61d2b4942b83d3f3c1b642d122f109ba90bbff9d
-SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = 9c58253868e06b3dd3cac936651ba7e6a1437fc6
+SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = 35b62538d09af8725202673a2a23d814f624f8bd
 SHA1 (patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp) = 920376ec8697780637f376b2fff312b7e214a7f6
-SHA1 (patch-Source_WebKit_Scripts_check-xcfilelists.sh) = 7804dfff27dc1c26c74aae4aa7856d9bc6b895c0
+SHA1 (patch-Source_WebKit_Scripts_check-xcfilelists.sh) = 22cc5ba1ababc6395aa0ef467db0c27c2fbf6878
 SHA1 (patch-Source_WebKit_Scripts_generate-unified-sources.sh) = def930cf3f706ac657b2f8835c8c0278ade8f663
-SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = ad6c6f93732a4bb355ac2b65bff8968aae0460ba
-SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = 7bbf23f5ac92173dcce9743c5a115bdf0bf7c0ea
+SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = 28d1f657fde427062a729b26398e96825082fc4d
+SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = b1eb6ab93f2ce272cfee94a544d19806feb9a625
 SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 03b72552414e7114bfa7ddc2d68fd97009a5ff7d
+SHA1 (patch-Tools_TestWebKitAPI_Scripts_check-xcfilelists.sh) = 6e8327bf46150806910b21b298767f313e1eb3ce
+SHA1 (patch-Tools_TestWebKitAPI_Scripts_generate-unified-sources.sh) = 06747f279263558f05bb01c8da9c994a357ce74a
 SHA1 (patch-aj) = ec60907df4336b755d1d1924c026b3041805f431
diff --git a/www/webkit-gtk/patches/patch-CMakeLists.txt b/www/webkit-gtk/patches/patch-CMakeLists.txt
index f8d04c665ed..b06ba942287 100644
--- a/www/webkit-gtk/patches/patch-CMakeLists.txt
+++ b/www/webkit-gtk/patches/patch-CMakeLists.txt
@@ -1,11 +1,11 @@
-$NetBSD: patch-CMakeLists.txt,v 1.10 2019/05/17 17:57:44 leot Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.11 2019/09/10 22:10:04 leot Exp $
 
 - Fix support for arm
 - Fix support for ppc, from FreeBSD.
 
---- CMakeLists.txt.orig	2019-02-12 11:20:53.000000000 +0000
+--- CMakeLists.txt.orig	2019-08-28 11:46:12.000000000 +0000
 +++ CMakeLists.txt
-@@ -86,7 +86,7 @@ else ()
+@@ -87,7 +87,7 @@ else ()
  endif ()
  if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(^aarch64|^arm64)")
      set(WTF_CPU_ARM64 1)
@@ -14,8 +14,8 @@ $NetBSD: patch-CMakeLists.txt,v 1.10 2019/05/17 17:57:44 leot Exp $
      set(WTF_CPU_ARM 1)
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
      set(WTF_CPU_MIPS64 1)
-@@ -96,9 +96,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
-     set(WTF_CPU_X86_64 1)
+@@ -105,9 +105,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
+     endif ()
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
      set(WTF_CPU_X86 1)
 -elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh
index 50e1eee3366..b8e938b9ac2 100644
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh
+++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh
@@ -1,8 +1,8 @@
-$NetBSD: patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh,v 1.1 2019/03/13 20:49:40 leot Exp $
+$NetBSD: patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh,v 1.2 2019/09/10 22:10:04 leot Exp $
 
 Avoid unportable `==' test(1) operator.
 
---- Source/JavaScriptCore/Scripts/check-xcfilelists.sh.orig	2019-02-12 11:21:03.000000000 +0000
+--- Source/JavaScriptCore/Scripts/check-xcfilelists.sh.orig	2019-08-28 11:46:27.000000000 +0000
 +++ Source/JavaScriptCore/Scripts/check-xcfilelists.sh
 @@ -1,8 +1,8 @@
  #!/bin/sh
@@ -15,4 +15,4 @@ Avoid unportable `==' test(1) operator.
 +[ "${USE_INTERNAL_SDK}" = "YES" ] || { echo "### Not running because USE_INTERNAL_SDK is not YES"; exit 0; }
  
  SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists"
- [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists"
+ [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../../${WK_ADDITIONAL_SCRIPTS_DIR}/generate-xcfilelists"
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h
index 1ecce3ef1e0..2f20d189cfb 100644
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h
+++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h,v 1.1 2019/03/13 20:49:40 leot Exp $
+$NetBSD: patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h,v 1.2 2019/09/10 22:10:04 leot Exp $
 
 Add support for NetBSD.
 
---- Source/JavaScriptCore/assembler/ARMv7Assembler.h.orig	2019-02-12 11:21:03.000000000 +0000
+--- Source/JavaScriptCore/assembler/ARMv7Assembler.h.orig	2019-08-28 11:46:27.000000000 +0000
 +++ Source/JavaScriptCore/assembler/ARMv7Assembler.h
 @@ -28,6 +28,11 @@
  
@@ -15,8 +15,8 @@ Add support for NetBSD.
 +
  #include "AssemblerBuffer.h"
  #include "AssemblerCommon.h"
- #include <limits.h>
-@@ -2488,6 +2493,11 @@ public:
+ #include "RegisterInfo.h"
+@@ -2394,6 +2399,11 @@ public:
              linuxPageFlush(current, current + page);
  
          linuxPageFlush(current, end);
diff --git a/www/webkit-gtk/patches/patch-Source_ThirdParty_ANGLE_adjust-angle-include-paths.sh b/www/webkit-gtk/patches/patch-Source_ThirdParty_ANGLE_adjust-angle-include-paths.sh
new file mode 100644
index 00000000000..879a6f4e255
--- /dev/null
+++ b/www/webkit-gtk/patches/patch-Source_ThirdParty_ANGLE_adjust-angle-include-paths.sh
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_ThirdParty_ANGLE_adjust-angle-include-paths.sh,v 1.1 2019/09/10 22:10:04 leot Exp $
+
+Avoid unportable `==' test(1) operator.
+
+--- Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh.orig	2019-08-28 11:46:28.000000000 +0000
++++ Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh
+@@ -19,7 +19,7 @@
+ # that they refer to each other. This avoids modifying the ANGLE
+ # sources, and allows WebCore to more easily call ANGLE APIs directly.
+ 
+-if [ "$DEPLOYMENT_LOCATION" == "YES" ] ; then
++if [ "$DEPLOYMENT_LOCATION" = "YES" ] ; then
+     # Apple-internal build.
+     output_dir=$DSTROOT/$PUBLIC_HEADERS_FOLDER_PATH
+ else
diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_FileSystem.cpp b/www/webkit-gtk/patches/patch-Source_WTF_wtf_FileSystem.cpp
index 6f6b525cd8f..677e0a5941c 100644
--- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_FileSystem.cpp
+++ b/www/webkit-gtk/patches/patch-Source_WTF_wtf_FileSystem.cpp
@@ -1,16 +1,16 @@
-$NetBSD: patch-Source_WTF_wtf_FileSystem.cpp,v 1.1 2019/03/13 20:49:40 leot Exp $
+$NetBSD: patch-Source_WTF_wtf_FileSystem.cpp,v 1.2 2019/09/10 22:10:04 leot Exp $
 
 Support MAP_FILE if unavailable.
 
---- Source/WTF/wtf/FileSystem.cpp.orig	2019-02-12 11:21:17.000000000 +0000
+--- Source/WTF/wtf/FileSystem.cpp.orig	2019-08-28 11:46:29.000000000 +0000
 +++ Source/WTF/wtf/FileSystem.cpp
-@@ -316,6 +316,9 @@ MappedFileData::MappedFileData(const Str
-         return;
+@@ -324,6 +324,9 @@ bool MappedFileData::mapFileHandle(Platf
+         return true;
      }
  
 +#ifndef MAP_FILE
 +#define MAP_FILE	0
 +#endif
-     void* data = mmap(0, size, PROT_READ, MAP_FILE | MAP_SHARED, fd, 0);
-     close(fd);
+     void* data = mmap(0, size, PROT_READ, MAP_FILE | (mode == MappedFileMode::Shared ? MAP_SHARED : MAP_PRIVATE), fd, 0);
  
+     if (data == MAP_FAILED) {
diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_Scripts_check-xcfilelists.sh b/www/webkit-gtk/patches/patch-Source_WebCore_Scripts_check-xcfilelists.sh
index 5371cf03ad2..1f242aa123b 100644
--- a/www/webkit-gtk/patches/patch-Source_WebCore_Scripts_check-xcfilelists.sh
+++ b/www/webkit-gtk/patches/patch-Source_WebCore_Scripts_check-xcfilelists.sh
@@ -1,8 +1,8 @@
-$NetBSD: patch-Source_WebCore_Scripts_check-xcfilelists.sh,v 1.1 2019/03/13 20:49:41 leot Exp $
+$NetBSD: patch-Source_WebCore_Scripts_check-xcfilelists.sh,v 1.2 2019/09/10 22:10:04 leot Exp $
 
 Avoid unportable `==' test(1) operator.
 
---- Source/WebCore/Scripts/check-xcfilelists.sh.orig	2019-02-12 11:21:17.000000000 +0000
+--- Source/WebCore/Scripts/check-xcfilelists.sh.orig	2019-08-28 11:46:30.000000000 +0000
 +++ Source/WebCore/Scripts/check-xcfilelists.sh
 @@ -1,8 +1,8 @@
  #!/bin/sh
@@ -15,4 +15,4 @@ Avoid unportable `==' test(1) operator.
 +[ "${USE_INTERNAL_SDK}" = "YES" ] || { echo "### Not running because USE_INTERNAL_SDK is not YES"; exit 0; }
  
  SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists"
- [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists"
+ [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../../${WK_ADDITIONAL_SCRIPTS_DIR}/generate-xcfilelists"
diff --git a/www/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp b/www/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp
index 39875f3b0b1..e344e314b1c 100644
--- a/www/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp
+++ b/www/webkit-gtk/patches/patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp,v 1.1 2018/04/09 08:33:48 wiz Exp $
+$NetBSD: patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp,v 1.2 2019/09/10 22:10:04 leot Exp $
 
-On NetBSD we see ""Error sending IPC message: Message too long" due to
+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
diff --git a/www/webkit-gtk/patches/patch-Source_WebKit_Scripts_check-xcfilelists.sh b/www/webkit-gtk/patches/patch-Source_WebKit_Scripts_check-xcfilelists.sh
index b512db53ac2..083291faba2 100644
--- a/www/webkit-gtk/patches/patch-Source_WebKit_Scripts_check-xcfilelists.sh
+++ b/www/webkit-gtk/patches/patch-Source_WebKit_Scripts_check-xcfilelists.sh
@@ -1,8 +1,8 @@
-$NetBSD: patch-Source_WebKit_Scripts_check-xcfilelists.sh,v 1.1 2019/03/13 20:49:41 leot Exp $
+$NetBSD: patch-Source_WebKit_Scripts_check-xcfilelists.sh,v 1.2 2019/09/10 22:10:04 leot Exp $
 
 Avoid unportable `==' test(1) operator.
 
---- Source/WebKit/Scripts/check-xcfilelists.sh.orig	2019-02-12 11:21:18.000000000 +0000
+--- Source/WebKit/Scripts/check-xcfilelists.sh.orig	2019-08-28 11:46:32.000000000 +0000
 +++ Source/WebKit/Scripts/check-xcfilelists.sh
 @@ -1,8 +1,8 @@
  #!/bin/sh
@@ -15,4 +15,4 @@ Avoid unportable `==' test(1) operator.
 +[ "${USE_INTERNAL_SDK}" = "YES" ] || { echo "### Not running because USE_INTERNAL_SDK is not YES"; exit 0; }
  
  SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists"
- [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../Tools/Scripts/generate-xcfilelists"
+ [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../../${WK_ADDITIONAL_SCRIPTS_DIR}/generate-xcfilelists"
diff --git a/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_BPlatform.h b/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_BPlatform.h
index 4e68affc2d8..ded0539f8fe 100644
--- a/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_BPlatform.h
+++ b/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_BPlatform.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-Source_bmalloc_bmalloc_BPlatform.h,v 1.1 2018/10/24 18:31:07 leot Exp $
+$NetBSD: patch-Source_bmalloc_bmalloc_BPlatform.h,v 1.2 2019/09/10 22:10:04 leot Exp $
 
-Add BOS(SOLARIS) definition.
+Add BOS(SOLARIS) and BOS(NETBSD) definitions.
 
---- Source/bmalloc/bmalloc/BPlatform.h.orig	2018-07-25 11:56:32.000000000 +0000
+--- Source/bmalloc/bmalloc/BPlatform.h.orig	2019-08-28 11:46:33.000000000 +0000
 +++ Source/bmalloc/bmalloc/BPlatform.h
-@@ -48,6 +48,10 @@
+@@ -48,10 +48,18 @@
  #define BOS_LINUX 1
  #endif
  
@@ -12,6 +12,14 @@ Add BOS(SOLARIS) definition.
 +#define BOS_SOLARIS 1
 +#endif
 +
+ #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+ #define BOS_FREEBSD 1
+ #endif
+ 
++#if defined(__NetBSD__)
++#define BOS_NETBSD 1
++#endif
++
  #if defined(WIN32) || defined(_WIN32)
  #define BOS_WINDOWS 1
  #endif
diff --git a/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h b/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h
index 06435d20396..13514d10537 100644
--- a/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h
+++ b/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h
@@ -1,19 +1,23 @@
-$NetBSD: patch-Source_bmalloc_bmalloc_VMAllocate.h,v 1.2 2018/10/24 18:31:08 leot Exp $
+$NetBSD: patch-Source_bmalloc_bmalloc_VMAllocate.h,v 1.3 2019/09/10 22:10:04 leot Exp $
 
+NetBSD has MADV_FREE too.
 Use posix_madvise on SunOS.
 
---- Source/bmalloc/bmalloc/VMAllocate.h.orig	2018-02-19 07:45:33.000000000 +0000
+--- Source/bmalloc/bmalloc/VMAllocate.h.orig	2019-08-28 11:46:33.000000000 +0000
 +++ Source/bmalloc/bmalloc/VMAllocate.h
-@@ -198,6 +198,8 @@ inline void vmDeallocatePhysicalPages(vo
+@@ -201,8 +201,10 @@ inline void vmDeallocatePhysicalPages(vo
      vmValidatePhysical(p, vmSize);
  #if BOS(DARWIN)
      SYSCALL(madvise(p, vmSize, MADV_FREE_REUSABLE));
+-#elif BOS(FREEBSD)
++#elif BOS(FREEBSD) || BOS(NETBSD)
+     SYSCALL(madvise(p, vmSize, MADV_FREE));
 +#elif BOS(SOLARIS)
 +    SYSCALL(posix_madvise(p, vmSize, MADV_DONTNEED));
  #else
      SYSCALL(madvise(p, vmSize, MADV_DONTNEED));
  #if BOS(LINUX)
-@@ -211,6 +213,8 @@ inline void vmAllocatePhysicalPages(void
+@@ -216,6 +218,8 @@ inline void vmAllocatePhysicalPages(void
      vmValidatePhysical(p, vmSize);
  #if BOS(DARWIN)
      SYSCALL(madvise(p, vmSize, MADV_FREE_REUSE));
diff --git a/www/webkit-gtk/patches/patch-Tools_TestWebKitAPI_Scripts_check-xcfilelists.sh b/www/webkit-gtk/patches/patch-Tools_TestWebKitAPI_Scripts_check-xcfilelists.sh
new file mode 100644
index 00000000000..fd052a0c109
--- /dev/null
+++ b/www/webkit-gtk/patches/patch-Tools_TestWebKitAPI_Scripts_check-xcfilelists.sh
@@ -0,0 +1,18 @@
+$NetBSD: patch-Tools_TestWebKitAPI_Scripts_check-xcfilelists.sh,v 1.1 2019/09/10 22:10:04 leot Exp $
+
+Avoid unportable `==' test(1) operator.
+
+--- Tools/TestWebKitAPI/Scripts/check-xcfilelists.sh.orig	2019-08-28 11:46:33.000000000 +0000
++++ Tools/TestWebKitAPI/Scripts/check-xcfilelists.sh
+@@ -1,8 +1,8 @@
+ #!/bin/sh
+ 
+-[ "${WK_DISABLE_CHECK_XCFILELISTS}" == "1" ] && { echo "### Not running because WK_DISABLE_CHECK_XCFILELISTS is set"; exit 0; }
+-[ "${DEPLOYMENT_LOCATION}" == "YES" ] && { echo "### Not running because DEPLOYMENT_LOCATION is YES"; exit 0; }
+-[ "${USE_INTERNAL_SDK}" == "YES" ] || { echo "### Not running because USE_INTERNAL_SDK is not YES"; exit 0; }
++[ "${WK_DISABLE_CHECK_XCFILELISTS}" = "1" ] && { echo "### Not running because WK_DISABLE_CHECK_XCFILELISTS is set"; exit 0; }
++[ "${DEPLOYMENT_LOCATION}" = "YES" ] && { echo "### Not running because DEPLOYMENT_LOCATION is YES"; exit 0; }
++[ "${USE_INTERNAL_SDK}" = "YES" ] || { echo "### Not running because USE_INTERNAL_SDK is not YES"; exit 0; }
+ 
+ SCRIPT="${BUILD_SCRIPTS_DIR}/generate-xcfilelists"
+ [ -f "${SCRIPT}" ] || SCRIPT="${PROJECT_DIR}/../../../${WK_ADDITIONAL_SCRIPTS_DIR}/generate-xcfilelists"
diff --git a/www/webkit-gtk/patches/patch-Tools_TestWebKitAPI_Scripts_generate-unified-sources.sh b/www/webkit-gtk/patches/patch-Tools_TestWebKitAPI_Scripts_generate-unified-sources.sh
new file mode 100644
index 00000000000..2e68384ca35
--- /dev/null
+++ b/www/webkit-gtk/patches/patch-Tools_TestWebKitAPI_Scripts_generate-unified-sources.sh
@@ -0,0 +1,15 @@
+$NetBSD: patch-Tools_TestWebKitAPI_Scripts_generate-unified-sources.sh,v 1.1 2019/09/10 22:10:04 leot Exp $
+
+Avoid unportable `==' test(1) operator.
+
+--- Tools/TestWebKitAPI/Scripts/generate-unified-sources.sh.orig	2019-08-28 11:46:33.000000000 +0000
++++ Tools/TestWebKitAPI/Scripts/generate-unified-sources.sh
+@@ -7,7 +7,7 @@ ARGS=("$@")
+ cd $SRCROOT
+ 
+ if [ -z "${BUILD_SCRIPTS_DIR}" ]; then
+-    if [ "${DEPLOYMENT_LOCATION}" == "YES" ]; then
++    if [ "${DEPLOYMENT_LOCATION}" = "YES" ]; then
+         BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include/wtf/Scripts"
+     else
+         BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}/usr/local/include/wtf/Scripts"