webkit-gtk: Update to 2.30.0

pkgsrc changes:
 - Unconditionally disable systemd support via CMAKE_ARGS (by default systemd is
   enabled unconditionally)

Changes:
WebKitGTK 2.30.0
================
  - Fix NTLM authentication.
  - Don't try to use SHM on wayland with older wpebackend-fdo.
  - Fix the build due to seccomp.h header not found.

WebKitGTK 2.29.92
=================
  - Fix user agent header after a redirect when a new quirk is required.
  - Stop using firefox user agent quirk for google docs.
  - Fix rendering frames timeline panel in web inspector.
  - Fix per-thread cpu usage in web inspector.
  - Fix several crashes and rendering issues.
  - Translation updates: Polish

WebKitGTK 2.29.91
=================
  - Fix a web process crash introduced in 2.29.90.

WebKitGTK 2.29.90
=================
  - Fix font variation settings when font smoothing setting is also present.
  - Fix HTML drag and drop operations.
  - Fix argument order for clone syscall seccomp filter on s390x.
  - Fix a crash when selecting text.
  - Fix several crashes and rendering issues.

WebKitGTK 2.29.4
================
  - Add support for backdrop filters.
  - Add support for text-underline-offset and text-decoration-thickness.
  - Add OpenCDM and AV1 support to media backend.
  - Add new API to get ITP data summary.
  - Use mobile user-agent on tablets.
  - Fix several crashes and rendering issues.

WebKitGTK 2.29.3
================
  - Add webkit_authentication_request_get_security_origin.
  - Change the cookies accept policy to always when no-third-party is set and ITP is enabled.
  - Fix web process hangs on large GitHub pages.
  - Bubblewrap sandbox should not attempt to bind empty paths.
  - Add support for sndio to bubblewrap sandbox.
  - Also handle dark themes when the name ends with -Dark.
  - Fix a race condition causing a crash in media player.
  - Fix several crashes and rendering issues.

WebKitGTK 2.29.2
================
 - Add Intelligent Tracking Prevention (ITP) support.
 - Add support for video formats in img elements.
 - Add API to handle video autoplay policy that now defaults to disallow autoplay videos with audio.
 - Add API to mute a web view.
 - Add API to allow applications to handle the HTTP authentication credential storage.
 - Add a WebKitSetting to set the media content types requiring hardware support.
 - Fix a crash during drag an drop due to a bug introduced in 2.29.1.
 - Do not start page load during animation in back/forward gesture.
 - Fix several crashes and rendering issues.
 - Translation updates: Ukrainian.

WebKitGTK 2.29.1
================
 - Stop using GTK theming to render form controls.
 - Add API to disable GTK theming for scrollbars too.
 - Fix several race conditions and threading issues in the media player.
 - Add USER_AGENT_BRANDING build option.
 - Add paste as plain text option to the context menu for rich editable content.
 - Fix several crashes and rendering issues.

11 files changed, 68 insertions, 101 deletions

diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index d3b8f2dbd18..c8d2f2349f4 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.192 2020/08/31 18:13:17 wiz Exp $
+# $NetBSD: Makefile,v 1.193 2020/09/11 14:47:34 leot Exp $
 
-DISTNAME=	webkitgtk-2.28.4
+DISTNAME=	webkitgtk-2.30.0
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
-PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	https://www.webkitgtk.org/releases/
 EXTRACT_SUFX=	.tar.xz
@@ -46,6 +45,7 @@ CMAKE_ARGS+=		-DENABLE_BUBBLEWRAP_SANDBOX=OFF
 CMAKE_ARGS+=		-DUSE_GSTREAMER_GL=OFF
 CMAKE_ARGS+=		-DUSE_LIBHYPHEN=OFF
 CMAKE_ARGS+=		-DUSE_OPENJPEG=OFF
+CMAKE_ARGS+=		-DUSE_SYSTEMD=OFF
 
 REPLACE_PERL+=	Source/JavaScriptCore/Scripts/*.pl
 REPLACE_PERL+=	Source/JavaScriptCore/create_hash_table
diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST
index 7aa672f1124..0feab25322a 100644
--- a/www/webkit-gtk/PLIST
+++ b/www/webkit-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.62 2020/07/28 14:24:03 leot Exp $
+@comment $NetBSD: PLIST,v 1.63 2020/09/11 14:47:34 leot Exp $
 bin/WebKitWebDriver
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
 include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
@@ -94,7 +94,9 @@ 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/WebKitWebsiteDataAccessPermissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitWebsiteDataManager.h
+include/webkitgtk-4.0/webkit2/WebKitWebsitePolicies.h
 include/webkitgtk-4.0/webkit2/WebKitWindowProperties.h
 include/webkitgtk-4.0/webkit2/webkit-web-extension.h
 include/webkitgtk-4.0/webkit2/webkit2.h
@@ -216,17 +218,16 @@ ${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.16.7
+lib/libjavascriptcoregtk-4.0.so.18.17.8
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.44.6
+lib/libwebkit2gtk-4.0.so.37.49.4
 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/WebKitWebProcess
 libexec/webkit2gtk-4.0/jsc
 ${PLIST.introspection}share/gir-1.0/JavaScriptCore-4.0.gir
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index 135e03b7e5b..1f09ed0deaa 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,37 +1,37 @@
-$NetBSD: distinfo,v 1.137 2020/07/28 14:24:03 leot Exp $
+$NetBSD: distinfo,v 1.138 2020/09/11 14:47:34 leot Exp $
 
-SHA1 (webkitgtk-2.28.4.tar.xz) = 70e9dd80647b30eaaf8a7f5b30d8869cd1254056
-RMD160 (webkitgtk-2.28.4.tar.xz) = d6d4ce81153e997b1276a474bed88f2269b27cda
-SHA512 (webkitgtk-2.28.4.tar.xz) = 227cd4066235180521a32a83d3a906212adf4f234f15a1fff4ac86b48e39c431f1e0cb4a56f62924015099a0c8909a73a21a56f8dc71a16c53ac65de4a5773a1
-Size (webkitgtk-2.28.4.tar.xz) = 21424908 bytes
-SHA1 (patch-CMakeLists.txt) = 08f647f6928bf3fce0dabb02586e1447d16da297
+SHA1 (webkitgtk-2.30.0.tar.xz) = 60407e68b5452b5fd90ab1c03d8cc844bb68b590
+RMD160 (webkitgtk-2.30.0.tar.xz) = 0fc9692533e78791371eeaa75eb057b4a8d776dc
+SHA512 (webkitgtk-2.30.0.tar.xz) = 5610f99f8c61c9b41490dca005866557bed99ab9ae1f9c8466ddc42f015d834738762d54e2a86c75caa588edd3dd6cba883f58e05c43bf988d3766b887147d79
+Size (webkitgtk-2.30.0.tar.xz) = 22303832 bytes
+SHA1 (patch-CMakeLists.txt) = 38d2957bb0f4573654adc0dc62b19d0fdbdbd496
 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) = 79c282ca90d0ba2ef4769da40d4648f5f709951b
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h) = 70975aac175ec4131a4ed26a54dfe51e16ffb7cd
-SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = d49d91b9ff637ac4583d0c78c93efea12b07cd02
-SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = d04f2f59094d9b8af663fb68090e440887830d74
+SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = 709e5dcf4cdb834617c2ef542686bb2aa4aa37b3
+SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 7f6c0c57d46478e83c4ff21dae2415f44085ba32
 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) = 0c0d5ef4e3bad794388fa406c35b34aa4d816f05
+SHA1 (patch-Source_ThirdParty_ANGLE_adjust-angle-include-paths.sh) = b6506b0f273a81f2a16a19abc604c3402f57f259
 SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_translator_SymbolTable.h) = 10debffda84bc752ed434657a337a466aad19a3a
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = a5454eb891ad1f9d8285c28af2e9efb4ff439e6b
-SHA1 (patch-Source_WTF_wtf_FileSystem.cpp) = 53a8e65970f15202b3cdf1f4149d35b431c32a46
+SHA1 (patch-Source_WTF_wtf_FileSystem.cpp) = 2fe7b7755646d9a1cc022aec3d01091766378aba
 SHA1 (patch-Source_WTF_wtf_PlatformEnable.h) = eb5598c20c8453314daba7897066f15827bbede7
 SHA1 (patch-Source_WTF_wtf_PlatformHave.h) = 3787817a0e288d00aa747c417aecd9abf52866d1
 SHA1 (patch-Source_WTF_wtf_PlatformOS.h) = 80aa6ff20f10407d447fdb41606d4bb4989351aa
 SHA1 (patch-Source_WTF_wtf_PlatformUse.h) = 595486b48e7d89378208c0a209a121ef136415e6
-SHA1 (patch-Source_WTF_wtf_RAMSize.cpp) = 81f8f63b4f974601cd50b1d49fcb89f326a43437
+SHA1 (patch-Source_WTF_wtf_RAMSize.cpp) = c4fd7f67cbb414318577c93d642f26827ba638c0
 SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3
 SHA1 (patch-Source_WebCore_Scripts_check-xcfilelists.sh) = b292baf2494bcd459d9af91386263123046c6615
-SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 740eb33931b6f9cb8008748323235f23466328dc
+SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 9b323aa1fa8e6e5599ac0a7ae08fbbed4348c70e
 SHA1 (patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp) = 03337c5eec54d6974dfea1766b14cb2c1b9f7750
 SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3
 SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 16b36d2d91fd7f43156b9ee09bcafd19602ebbd9
 SHA1 (patch-Source_WebCore_rendering_RenderLayerBacking.h) = ecf722df1d1cca13573786b34fe1e3d85edf1e1e
 SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
 SHA1 (patch-Source_WebKit_CMakeLists.txt) = 228cc4734de3b08a3877ac839b1ffa2fbf2d3aa8
-SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 8c19692e78b1cfb021b95435508a10bc6542b173
+SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 14dfbee895aa7c70bf3b61b4dbb5bccd96d9583a
 SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 61d2b4942b83d3f3c1b642d122f109ba90bbff9d
 SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = 35b62538d09af8725202673a2a23d814f624f8bd
 SHA1 (patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp) = 920376ec8697780637f376b2fff312b7e214a7f6
diff --git a/www/webkit-gtk/patches/patch-CMakeLists.txt b/www/webkit-gtk/patches/patch-CMakeLists.txt
index b06ba942287..006127b09ec 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.11 2019/09/10 22:10:04 leot Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.12 2020/09/11 14:47:35 leot Exp $
 
 - Fix support for arm
 - Fix support for ppc, from FreeBSD.
 
---- CMakeLists.txt.orig	2019-08-28 11:46:12.000000000 +0000
+--- CMakeLists.txt.orig	2020-08-12 09:17:37.000000000 +0000
 +++ CMakeLists.txt
-@@ -87,7 +87,7 @@ else ()
+@@ -91,7 +91,7 @@ else ()
  endif ()
  if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(^aarch64|^arm64)")
      set(WTF_CPU_ARM64 1)
@@ -14,7 +14,7 @@ $NetBSD: patch-CMakeLists.txt,v 1.11 2019/09/10 22:10:04 leot Exp $
      set(WTF_CPU_ARM 1)
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
      set(WTF_CPU_MIPS64 1)
-@@ -105,9 +105,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
+@@ -109,9 +109,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
      endif ()
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
      set(WTF_CPU_X86 1)
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MarkedSpace.cpp b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MarkedSpace.cpp
index 816b862eed9..5c079974bef 100644
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MarkedSpace.cpp
+++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MarkedSpace.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-Source_JavaScriptCore_heap_MarkedSpace.cpp,v 1.2 2020/03/10 18:14:04 leot Exp $
+$NetBSD: patch-Source_JavaScriptCore_heap_MarkedSpace.cpp,v 1.3 2020/09/11 14:47:35 leot Exp $
 
 Avoid ambiguous function call.
 
---- Source/JavaScriptCore/heap/MarkedSpace.cpp.orig	2020-02-04 10:23:59.000000000 +0000
+--- Source/JavaScriptCore/heap/MarkedSpace.cpp.orig	2020-08-12 09:17:52.000000000 +0000
 +++ Source/JavaScriptCore/heap/MarkedSpace.cpp
-@@ -30,6 +30,8 @@
+@@ -28,6 +28,8 @@
  #include "MarkedSpaceInlines.h"
  #include <wtf/ListDump.h>
  
@@ -12,4 +12,4 @@ Avoid ambiguous function call.
 +
  namespace JSC {
  
- std::array<size_t, MarkedSpace::numSizeClasses> MarkedSpace::s_sizeClassForSizeStep;
+ std::array<unsigned, MarkedSpace::numSizeClasses> MarkedSpace::s_sizeClassForSizeStep;
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp
index a1ec92ad295..0825520e9ec 100644
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp
+++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp,v 1.4 2020/03/10 18:14:04 leot Exp $
+$NetBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp,v 1.5 2020/09/11 14:47:35 leot Exp $
 
 Avoid to (pre)allocate 1GB of memory on OpenBSD:
 
@@ -6,14 +6,14 @@ Avoid to (pre)allocate 1GB of memory on OpenBSD:
 
 From OpenBSD ports.
 
---- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig	2020-02-04 10:23:59.000000000 +0000
+--- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig	2020-08-12 09:17:53.000000000 +0000
 +++ Source/JavaScriptCore/jit/ExecutableAllocator.cpp
-@@ -97,7 +97,7 @@ static constexpr size_t fixedExecutableM
- static constexpr size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024;
- #elif CPU(ARM64)
- static constexpr size_t fixedExecutableMemoryPoolSize = 128 * 1024 * 1024;
+@@ -93,7 +93,7 @@ static constexpr size_t maxIslandsPerReg
+ #else
+ static constexpr size_t fixedExecutableMemoryPoolSize = 128 * MB;
+ #endif
 -#elif CPU(X86_64)
 +#elif CPU(X86_64) && !OS(OPENBSD)
- static constexpr size_t fixedExecutableMemoryPoolSize = 1024 * 1024 * 1024;
+ static constexpr size_t fixedExecutableMemoryPoolSize = 1 * GB;
  #else
- static constexpr size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024;
+ static constexpr size_t fixedExecutableMemoryPoolSize = 32 * MB;
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
index 0d0967075e2..183c556c2a1 100644
--- 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
@@ -1,8 +1,8 @@
-$NetBSD: patch-Source_ThirdParty_ANGLE_adjust-angle-include-paths.sh,v 1.2 2020/03/10 18:14:04 leot Exp $
+$NetBSD: patch-Source_ThirdParty_ANGLE_adjust-angle-include-paths.sh,v 1.3 2020/09/11 14:47:35 leot Exp $
 
 Avoid unportable `==' test(1) operator.
 
---- Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh.orig	2020-02-04 10:24:05.000000000 +0000
+--- Source/ThirdParty/ANGLE/adjust-angle-include-paths.sh.orig	2020-08-12 09:17:53.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
@@ -13,12 +13,3 @@ Avoid unportable `==' test(1) operator.
      # Apple-internal build.
      output_dir=${DSTROOT}${PUBLIC_HEADERS_FOLDER_PATH}
  else
-@@ -27,7 +27,7 @@ else
-     output_dir=${BUILT_PRODUCTS_DIR}${PUBLIC_HEADERS_FOLDER_PATH}
- fi
- 
--if [ $(uname) == "Linux" ]; then
-+if [ $(uname) = "Linux" ]; then
-     inplace_opt=(-i)
- else
-     inplace_opt=(-i "")
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 677e0a5941c..c1772527a10 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.2 2019/09/10 22:10:04 leot Exp $
+$NetBSD: patch-Source_WTF_wtf_FileSystem.cpp,v 1.3 2020/09/11 14:47:35 leot Exp $
 
 Support MAP_FILE if unavailable.
 
---- Source/WTF/wtf/FileSystem.cpp.orig	2019-08-28 11:46:29.000000000 +0000
+--- Source/WTF/wtf/FileSystem.cpp.orig	2020-08-12 09:17:54.000000000 +0000
 +++ Source/WTF/wtf/FileSystem.cpp
-@@ -324,6 +324,9 @@ bool MappedFileData::mapFileHandle(Platf
-         return true;
+@@ -339,6 +339,9 @@ bool MappedFileData::mapFileHandle(Platf
+ #endif
      }
  
 +#ifndef MAP_FILE
 +#define MAP_FILE	0
 +#endif
-     void* data = mmap(0, size, PROT_READ, MAP_FILE | (mode == MappedFileMode::Shared ? MAP_SHARED : MAP_PRIVATE), fd, 0);
+     void* data = mmap(0, size, pageProtection, MAP_FILE | (mapMode == MappedFileMode::Shared ? MAP_SHARED : MAP_PRIVATE), fd, 0);
  
      if (data == MAP_FAILED) {
diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_RAMSize.cpp b/www/webkit-gtk/patches/patch-Source_WTF_wtf_RAMSize.cpp
index c3dfc27f4f1..3c75e325ed6 100644
--- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_RAMSize.cpp
+++ b/www/webkit-gtk/patches/patch-Source_WTF_wtf_RAMSize.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-Source_WTF_wtf_RAMSize.cpp,v 1.4 2020/03/10 18:14:04 leot Exp $
+$NetBSD: patch-Source_WTF_wtf_RAMSize.cpp,v 1.5 2020/09/11 14:47:35 leot Exp $
 
 Add support for NetBSD and SunOS.
 
---- Source/WTF/wtf/RAMSize.cpp.orig	2020-02-04 10:24:07.000000000 +0000
+--- Source/WTF/wtf/RAMSize.cpp.orig	2020-08-12 09:17:54.000000000 +0000
 +++ Source/WTF/wtf/RAMSize.cpp
-@@ -35,13 +35,19 @@
+@@ -34,13 +34,19 @@
  #if OS(LINUX)
  #include <sys/sysinfo.h>
  #endif // OS(LINUX)
@@ -25,7 +25,7 @@ Add support for NetBSD and SunOS.
  static constexpr size_t ramSizeGuess = 512 * MB;
  #endif
  
-@@ -59,9 +65,20 @@ static size_t computeRAMSize()
+@@ -58,9 +64,20 @@ static size_t computeRAMSize()
      struct sysinfo si;
      sysinfo(&si);
      return si.totalram * si.mem_unit;
@@ -42,7 +42,7 @@ Add support for NetBSD and SunOS.
 +    return totalram;
  #else
  #error "Missing a platform specific way of determining the available RAM"
--#endif // OS(LINUX)
+-#endif // OS(LINUX) || OS(FREEBSD)
 +#endif // USE_SYSTEM_MALLOC
  #else
      return bmalloc::api::availableMemory();
diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_Scripts_generate-unified-sources.sh b/www/webkit-gtk/patches/patch-Source_WebCore_Scripts_generate-unified-sources.sh
index 29185e48621..a13ff830e46 100644
--- a/www/webkit-gtk/patches/patch-Source_WebCore_Scripts_generate-unified-sources.sh
+++ b/www/webkit-gtk/patches/patch-Source_WebCore_Scripts_generate-unified-sources.sh
@@ -1,8 +1,8 @@
-$NetBSD: patch-Source_WebCore_Scripts_generate-unified-sources.sh,v 1.1 2019/03/13 20:49:41 leot Exp $
+$NetBSD: patch-Source_WebCore_Scripts_generate-unified-sources.sh,v 1.2 2020/09/11 14:47:35 leot Exp $
 
 Avoid unportable `==' test(1) operator.
 
---- Source/WebCore/Scripts/generate-unified-sources.sh.orig	2019-02-12 11:21:17.000000000 +0000
+--- Source/WebCore/Scripts/generate-unified-sources.sh.orig	2020-08-12 09:17:55.000000000 +0000
 +++ Source/WebCore/Scripts/generate-unified-sources.sh
 @@ -7,7 +7,7 @@ ARGS=("$@")
  cd $SRCROOT
@@ -13,3 +13,12 @@ Avoid unportable `==' test(1) operator.
          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"
+@@ -22,7 +22,7 @@ if [ $# -eq 0 ]; then
+ fi
+ 
+ SOURCES="Sources.txt SourcesCocoa.txt"
+-if [ "${USE_INTERNAL_SDK}" == "YES" ]; then
++if [ "${USE_INTERNAL_SDK}" = "YES" ]; then
+     SOURCES="${SOURCES} SourcesCocoaInternalSDK.txt"
+ fi
+ 
diff --git a/www/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp b/www/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp
index 25a5adef4c5..109f6e0dccc 100644
--- a/www/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp
+++ b/www/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp
@@ -1,53 +1,19 @@
-$NetBSD: patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp,v 1.3 2019/03/13 20:49:41 leot Exp $
+$NetBSD: patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp,v 1.4 2020/09/11 14:47:35 leot Exp $
 
 SunOS does not support DT_{DIR,REG}
 
---- Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp.orig	2019-02-12 11:21:18.000000000 +0000
+--- Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp.orig	2020-08-12 09:17:56.000000000 +0000
 +++ Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp
-@@ -52,6 +52,12 @@ namespace WebKit {
- namespace NetworkCache {
- 
- #if !OS(WINDOWS)
+@@ -36,6 +36,12 @@
+ #include <dirent.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
 +#ifndef DT_DIR
 +#define DT_DIR	S_IFDIR
 +#endif
 +#ifndef DT_REG
 +#define DT_REG	S_IFREG
 +#endif
- static DirectoryEntryType directoryEntryType(uint8_t dtype)
- {
-     switch (dtype) {
-@@ -69,13 +75,21 @@ static DirectoryEntryType directoryEntry
- 
- void traverseDirectory(const String& path, const Function<void (const String&, DirectoryEntryType)>& function)
- {
-+#if OS(SOLARIS)
-+    struct stat s;
-+#endif
- #if !OS(WINDOWS)
-     DIR* dir = opendir(FileSystem::fileSystemRepresentation(path).data());
-     if (!dir)
-         return;
-     dirent* dp;
-     while ((dp = readdir(dir))) {
-+#if OS(SOLARIS)
-+        stat(dp->d_name, &s);
-+        if (s.st_mode != S_IFDIR && s.st_mode != S_IFREG)
-+#else
-         if (dp->d_type != DT_DIR && dp->d_type != DT_REG)
-+#endif
-             continue;
-         const char* name = dp->d_name;
-         if (!strcmp(name, ".") || !strcmp(name, ".."))
-@@ -83,7 +97,11 @@ void traverseDirectory(const String& pat
-         auto nameString = String::fromUTF8(name);
-         if (nameString.isNull())
-             continue;
-+#if OS(SOLARIS)
-+        function(nameString, directoryEntryType(s.st_mode));
-+#else
-         function(nameString, directoryEntryType(dp->d_type));
-+#endif
-     }
-     closedir(dir);
  #else
+ #include <windows.h>
+ #endif