Thu May 13 08:20:58 2021 UTC ()
webkit-gtk: Update to 2.32.1

pkgsrc changes:
 - Remove patches applied upstream

Changes:
2.32.1
------
 - Support building against the Musl C library.
 - Support building against ICU version 69 or newer.
 - Improve handling of Media Capture devices.
 - Improve WebAudio playback.
 - Improve video orientation handling.
 - Improve seeking support for MSE playback.
 - Improve flush support in EME decryptors.
 - Fix HTTP status codes for requests done through a custom URI handler.
 - Fix the Bubblewrap sandbox in certain 32-bit systems.
 - Fix inconsistencies between the WebKitWebView.is-muted property state
   and values returned by webkit_web_view_is_playing_audio().
 - Fix the build with ENABLE_VIDEO=OFF.
 - Fix wrong timestamps for long-lived cookies.
 - Fix UI process crash when failing to load favicons.
 - Fix several crashes and rendering issues.
 - Translation updates: Swedish.


(leot)
diff -r1.205 -r1.206 pkgsrc/www/webkit-gtk/Makefile
diff -r1.71 -r1.72 pkgsrc/www/webkit-gtk/PLIST
diff -r1.149 -r1.150 pkgsrc/www/webkit-gtk/distinfo
diff -r1.1 -r0 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_Sources.txt
diff -r1.1 -r0 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_IntlSegmenter.cpp
diff -r1.1 -r0 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_IntlSegmenter.h
diff -r1.1 -r0 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_IntlSegments.cpp
diff -r1.1 -r0 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_IntlWorkaround.cpp
diff -r1.1 -r1.2 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h
diff -r1.1 -r1.2 pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h
cvs diff -r1.205 -r1.206 pkgsrc/www/webkit-gtk/Makefile (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/Makefile 2021/04/25 12:00:24 1.205
+++ pkgsrc/www/webkit-gtk/Makefile 2021/05/13 08:20:58 1.206
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.205 2021/04/25 12:00:24 leot Exp $ 1# $NetBSD: Makefile,v 1.206 2021/05/13 08:20:58 leot Exp $
2 2
3DISTNAME= webkitgtk-2.32.0 3DISTNAME= webkitgtk-2.32.1
4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} 4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
5PKGREVISION= 2 
6CATEGORIES= www 5CATEGORIES= www
7MASTER_SITES= https://www.webkitgtk.org/releases/ 6MASTER_SITES= https://www.webkitgtk.org/releases/
8EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.webkitgtk.org/ 10HOMEPAGE= https://www.webkitgtk.org/
12COMMENT= GTK port of the WebKit browser engine 11COMMENT= GTK port of the WebKit browser engine
13LICENSE= 2-clause-bsd AND gnu-lgpl-v2 12LICENSE= 2-clause-bsd AND gnu-lgpl-v2
14 13
15# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0 14# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0
16NOT_FOR_PLATFORM= NetBSD-[1-6].*-* 15NOT_FOR_PLATFORM= NetBSD-[1-6].*-*
17 16
18TOOL_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools 17TOOL_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools
cvs diff -r1.71 -r1.72 pkgsrc/www/webkit-gtk/PLIST (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/PLIST 2021/03/30 22:32:40 1.71
+++ pkgsrc/www/webkit-gtk/PLIST 2021/05/13 08:20:58 1.72
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.71 2021/03/30 22:32:40 leot Exp $ 1@comment $NetBSD: PLIST,v 1.72 2021/05/13 08:20:58 leot Exp $
2bin/WebKitWebDriver 2bin/WebKitWebDriver
3include/webkitgtk-4.0/JavaScriptCore/JSBase.h 3include/webkitgtk-4.0/JavaScriptCore/JSBase.h
4include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h 4include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
5include/webkitgtk-4.0/JavaScriptCore/JSObjectRef.h 5include/webkitgtk-4.0/JavaScriptCore/JSObjectRef.h
6include/webkitgtk-4.0/JavaScriptCore/JSStringRef.h 6include/webkitgtk-4.0/JavaScriptCore/JSStringRef.h
7include/webkitgtk-4.0/JavaScriptCore/JSTypedArray.h 7include/webkitgtk-4.0/JavaScriptCore/JSTypedArray.h
8include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h 8include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h
9include/webkitgtk-4.0/JavaScriptCore/JavaScript.h 9include/webkitgtk-4.0/JavaScriptCore/JavaScript.h
10include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h 10include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h
11include/webkitgtk-4.0/jsc/JSCAutocleanups.h 11include/webkitgtk-4.0/jsc/JSCAutocleanups.h
12include/webkitgtk-4.0/jsc/JSCClass.h 12include/webkitgtk-4.0/jsc/JSCClass.h
13include/webkitgtk-4.0/jsc/JSCContext.h 13include/webkitgtk-4.0/jsc/JSCContext.h
14include/webkitgtk-4.0/jsc/JSCDefines.h 14include/webkitgtk-4.0/jsc/JSCDefines.h
@@ -209,30 +209,30 @@ include/webkitgtk-4.0/webkitdom/WebKitDO @@ -209,30 +209,30 @@ include/webkitgtk-4.0/webkitdom/WebKitDO
209include/webkitgtk-4.0/webkitdom/WebKitDOMUIEvent.h 209include/webkitgtk-4.0/webkitdom/WebKitDOMUIEvent.h
210include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEvent.h 210include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEvent.h
211include/webkitgtk-4.0/webkitdom/WebKitDOMXPathExpression.h 211include/webkitgtk-4.0/webkitdom/WebKitDOMXPathExpression.h
212include/webkitgtk-4.0/webkitdom/WebKitDOMXPathNSResolver.h 212include/webkitgtk-4.0/webkitdom/WebKitDOMXPathNSResolver.h
213include/webkitgtk-4.0/webkitdom/WebKitDOMXPathResult.h 213include/webkitgtk-4.0/webkitdom/WebKitDOMXPathResult.h
214include/webkitgtk-4.0/webkitdom/webkitdom.h 214include/webkitgtk-4.0/webkitdom/webkitdom.h
215include/webkitgtk-4.0/webkitdom/webkitdomautocleanups.h 215include/webkitgtk-4.0/webkitdom/webkitdomautocleanups.h
216include/webkitgtk-4.0/webkitdom/webkitdomdefines.h 216include/webkitgtk-4.0/webkitdom/webkitdomdefines.h
217${PLIST.introspection}lib/girepository-1.0/JavaScriptCore-4.0.typelib 217${PLIST.introspection}lib/girepository-1.0/JavaScriptCore-4.0.typelib
218${PLIST.introspection}lib/girepository-1.0/WebKit2-4.0.typelib 218${PLIST.introspection}lib/girepository-1.0/WebKit2-4.0.typelib
219${PLIST.introspection}lib/girepository-1.0/WebKit2WebExtension-4.0.typelib 219${PLIST.introspection}lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
220lib/libjavascriptcoregtk-4.0.so 220lib/libjavascriptcoregtk-4.0.so
221lib/libjavascriptcoregtk-4.0.so.18 221lib/libjavascriptcoregtk-4.0.so.18
222lib/libjavascriptcoregtk-4.0.so.18.18.4 222lib/libjavascriptcoregtk-4.0.so.18.18.5
223lib/libwebkit2gtk-4.0.so 223lib/libwebkit2gtk-4.0.so
224lib/libwebkit2gtk-4.0.so.37 224lib/libwebkit2gtk-4.0.so.37
225lib/libwebkit2gtk-4.0.so.37.53.1 225lib/libwebkit2gtk-4.0.so.37.53.2
226lib/pkgconfig/javascriptcoregtk-4.0.pc 226lib/pkgconfig/javascriptcoregtk-4.0.pc
227lib/pkgconfig/webkit2gtk-4.0.pc 227lib/pkgconfig/webkit2gtk-4.0.pc
228lib/pkgconfig/webkit2gtk-web-extension-4.0.pc 228lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
229lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so 229lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
230libexec/webkit2gtk-4.0/MiniBrowser 230libexec/webkit2gtk-4.0/MiniBrowser
231libexec/webkit2gtk-4.0/WebKitNetworkProcess 231libexec/webkit2gtk-4.0/WebKitNetworkProcess
232libexec/webkit2gtk-4.0/WebKitWebProcess 232libexec/webkit2gtk-4.0/WebKitWebProcess
233libexec/webkit2gtk-4.0/jsc 233libexec/webkit2gtk-4.0/jsc
234${PLIST.introspection}share/gir-1.0/JavaScriptCore-4.0.gir 234${PLIST.introspection}share/gir-1.0/JavaScriptCore-4.0.gir
235${PLIST.introspection}share/gir-1.0/WebKit2-4.0.gir 235${PLIST.introspection}share/gir-1.0/WebKit2-4.0.gir
236${PLIST.introspection}share/gir-1.0/WebKit2WebExtension-4.0.gir 236${PLIST.introspection}share/gir-1.0/WebKit2WebExtension-4.0.gir
237share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo 237share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo
238share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo 238share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo
cvs diff -r1.149 -r1.150 pkgsrc/www/webkit-gtk/distinfo (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/distinfo 2021/04/27 07:57:06 1.149
+++ pkgsrc/www/webkit-gtk/distinfo 2021/05/13 08:20:58 1.150
@@ -1,39 +1,34 @@ @@ -1,39 +1,34 @@
1$NetBSD: distinfo,v 1.149 2021/04/27 07:57:06 leot Exp $ 1$NetBSD: distinfo,v 1.150 2021/05/13 08:20:58 leot Exp $
2 2
3SHA1 (webkitgtk-2.32.0.tar.xz) = 8abdb3ba2732c892dd06bb2bd63208b090462bf7 3SHA1 (webkitgtk-2.32.1.tar.xz) = c8c507d3c98c891ea5bfcfb6407320959dc77a2b
4RMD160 (webkitgtk-2.32.0.tar.xz) = c825873ec544e505f84e3b8a900619dac08e01ce 4RMD160 (webkitgtk-2.32.1.tar.xz) = b792418886a7d0f83abb6ad5fcf9da470605d1b0
5SHA512 (webkitgtk-2.32.0.tar.xz) = 4832a4614be24481028ca8a6480a8e6cfacd8e22f5ba9f936703c09944550056f06f75ccf8fffa7dee3f5a1d11ab1870841407745be2e61ebad6557a0934db15 5SHA512 (webkitgtk-2.32.1.tar.xz) = ff49522c585d3c5c9b88c4176673aebfdf7f2a127d7bc4007008a66c493476ae6551189865e4f0f330a7b332a438b6c951bf1a4c21cd0acf69b7051903d24843
6Size (webkitgtk-2.32.0.tar.xz) = 23315936 bytes 6Size (webkitgtk-2.32.1.tar.xz) = 23321600 bytes
7SHA1 (patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh) = f4f117e6c1cd8eb8e4905f74946e0367156ed528 7SHA1 (patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh) = f4f117e6c1cd8eb8e4905f74946e0367156ed528
8SHA1 (patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh) = 308a7c8f687253b4fc75de0c66016dd18666e697 8SHA1 (patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh) = 308a7c8f687253b4fc75de0c66016dd18666e697
9SHA1 (patch-Source_JavaScriptCore_Sources.txt) = 51de2568e6255ee77f6ea7f3ab657eb3c43c8ce6 
10SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 79c282ca90d0ba2ef4769da40d4648f5f709951b 9SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 79c282ca90d0ba2ef4769da40d4648f5f709951b
11SHA1 (patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h) = 70975aac175ec4131a4ed26a54dfe51e16ffb7cd 10SHA1 (patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h) = 70975aac175ec4131a4ed26a54dfe51e16ffb7cd
12SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = 709e5dcf4cdb834617c2ef542686bb2aa4aa37b3 11SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = 709e5dcf4cdb834617c2ef542686bb2aa4aa37b3
13SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 7f6c0c57d46478e83c4ff21dae2415f44085ba32 12SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 7f6c0c57d46478e83c4ff21dae2415f44085ba32
14SHA1 (patch-Source_JavaScriptCore_offlineasm_arm64.rb) = 8c05dafa317667bbf55504d05eeb8ae06fba4e93 13SHA1 (patch-Source_JavaScriptCore_offlineasm_arm64.rb) = 8c05dafa317667bbf55504d05eeb8ae06fba4e93
15SHA1 (patch-Source_JavaScriptCore_runtime_IntlSegmenter.cpp) = 326b0405fc433e579c115e174e516f1c79e8edc5 14SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 3bf3c200917ba49573388081ea9c5f6c55605b9b
16SHA1 (patch-Source_JavaScriptCore_runtime_IntlSegmenter.h) = 36abe8dd1cf6fceefc05d8f6fe0d1a6c18f4d0c5 
17SHA1 (patch-Source_JavaScriptCore_runtime_IntlSegments.cpp) = 8c357e32a256c06f05c0aeb6bea485f90ef8219d 
18SHA1 (patch-Source_JavaScriptCore_runtime_IntlWorkaround.cpp) = b4a793edefa3c500b167d6fe3cdb9244ec38bcf5 
19SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 23bc86a389f8009ec829c3ee0fe3effe3f20b012 
20SHA1 (patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp) = 73dfe781efe7e8aa7d49094af8820a87c501818f 15SHA1 (patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp) = 73dfe781efe7e8aa7d49094af8820a87c501818f
21SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_translator_SymbolTable.h) = 10debffda84bc752ed434657a337a466aad19a3a 16SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_translator_SymbolTable.h) = 10debffda84bc752ed434657a337a466aad19a3a
22SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = a5454eb891ad1f9d8285c28af2e9efb4ff439e6b 17SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = a5454eb891ad1f9d8285c28af2e9efb4ff439e6b
23SHA1 (patch-Source_WTF_wtf_Assertions.h) = 427de20eba4627578087feaa7de2f23e80b9debf 18SHA1 (patch-Source_WTF_wtf_Assertions.h) = 427de20eba4627578087feaa7de2f23e80b9debf
24SHA1 (patch-Source_WTF_wtf_FileSystem.cpp) = 2fe7b7755646d9a1cc022aec3d01091766378aba 19SHA1 (patch-Source_WTF_wtf_FileSystem.cpp) = 2fe7b7755646d9a1cc022aec3d01091766378aba
25SHA1 (patch-Source_WTF_wtf_PlatformEnable.h) = eb5598c20c8453314daba7897066f15827bbede7 20SHA1 (patch-Source_WTF_wtf_PlatformEnable.h) = eb5598c20c8453314daba7897066f15827bbede7
26SHA1 (patch-Source_WTF_wtf_PlatformHave.h) = 3787817a0e288d00aa747c417aecd9abf52866d1 21SHA1 (patch-Source_WTF_wtf_PlatformHave.h) = 1c96cc094a4f62f17d11890a17f164d214fa0f1f
27SHA1 (patch-Source_WTF_wtf_PlatformOS.h) = 80aa6ff20f10407d447fdb41606d4bb4989351aa 22SHA1 (patch-Source_WTF_wtf_PlatformOS.h) = 80aa6ff20f10407d447fdb41606d4bb4989351aa
28SHA1 (patch-Source_WTF_wtf_PlatformUse.h) = 595486b48e7d89378208c0a209a121ef136415e6 23SHA1 (patch-Source_WTF_wtf_PlatformUse.h) = 595486b48e7d89378208c0a209a121ef136415e6
29SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3 24SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3
30SHA1 (patch-Source_WebCore_Scripts_check-xcfilelists.sh) = b292baf2494bcd459d9af91386263123046c6615 25SHA1 (patch-Source_WebCore_Scripts_check-xcfilelists.sh) = b292baf2494bcd459d9af91386263123046c6615
31SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 9b323aa1fa8e6e5599ac0a7ae08fbbed4348c70e 26SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 9b323aa1fa8e6e5599ac0a7ae08fbbed4348c70e
32SHA1 (patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp) = 03337c5eec54d6974dfea1766b14cb2c1b9f7750 27SHA1 (patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp) = 03337c5eec54d6974dfea1766b14cb2c1b9f7750
33SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3 28SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3
34SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 16b36d2d91fd7f43156b9ee09bcafd19602ebbd9 29SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 16b36d2d91fd7f43156b9ee09bcafd19602ebbd9
35SHA1 (patch-Source_WebCore_platform_network_DNS.h) = a491ed31e288af1ef56c4a70564045609ecb4b6a 30SHA1 (patch-Source_WebCore_platform_network_DNS.h) = a491ed31e288af1ef56c4a70564045609ecb4b6a
36SHA1 (patch-Source_WebCore_rendering_RenderLayerBacking.h) = ecf722df1d1cca13573786b34fe1e3d85edf1e1e 31SHA1 (patch-Source_WebCore_rendering_RenderLayerBacking.h) = ecf722df1d1cca13573786b34fe1e3d85edf1e1e
37SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea 32SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
38SHA1 (patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp) = 3a4d9415e7d3ac78a948b9e7eb5e0377575835c3 33SHA1 (patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp) = 3a4d9415e7d3ac78a948b9e7eb5e0377575835c3
39SHA1 (patch-Source_WebKit_CMakeLists.txt) = 86d11b8a1142a1ab267e412873cca4f8924aaae8 34SHA1 (patch-Source_WebKit_CMakeLists.txt) = 86d11b8a1142a1ab267e412873cca4f8924aaae8
File Deleted: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_Sources.txt
File Deleted: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_runtime_IntlSegmenter.cpp
File Deleted: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_runtime_IntlSegmenter.h
File Deleted: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_runtime_IntlSegments.cpp
File Deleted: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_runtime_IntlWorkaround.cpp
cvs diff -r1.1 -r1.2 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h 2018/10/24 18:31:07 1.1
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h 2021/05/13 08:20:58 1.2
@@ -1,121 +1,121 @@ @@ -1,121 +1,121 @@
1$NetBSD: patch-Source_JavaScriptCore_runtime_MachineContext.h,v 1.1 2018/10/24 18:31:07 leot Exp $ 1$NetBSD: patch-Source_JavaScriptCore_runtime_MachineContext.h,v 1.2 2021/05/13 08:20:58 leot Exp $
2 2
3Add support for NetBSD. 3Add support for NetBSD.
4 4
5--- Source/JavaScriptCore/runtime/MachineContext.h.orig 2018-08-21 16:06:10.000000000 +0000 5--- Source/JavaScriptCore/runtime/MachineContext.h.orig 2021-05-05 05:33:24.000000000 +0000
6+++ Source/JavaScriptCore/runtime/MachineContext.h 6+++ Source/JavaScriptCore/runtime/MachineContext.h
7@@ -188,6 +188,22 @@ static inline void*& stackPointerImpl(mc 7@@ -196,6 +196,22 @@ static inline void*& stackPointerImpl(mc
8 #error Unknown Architecture 8 #error Unknown Architecture
9 #endif 9 #endif
10  10
11+#elif OS(NETBSD) 11+#elif OS(NETBSD)
12+ 12+
13+#if CPU(X86) 13+#if CPU(X86)
14+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_UESP]); 14+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_UESP]);
15+#elif CPU(X86_64) 15+#elif CPU(X86_64)
16+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RSP]); 16+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RSP]);
17+#elif CPU(ARM) 17+#elif CPU(ARM)
18+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]); 18+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]);
19+#elif CPU(ARM64) 19+#elif CPU(ARM64)
20+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]); 20+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]);
21+#elif CPU(MIPS) 21+#elif CPU(MIPS)
22+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]); 22+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]);
23+#else 23+#else
24+#error Unknown Architecture 24+#error Unknown Architecture
25+#endif 25+#endif
26+ 26+
27 #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) 27 #elif OS(FUCHSIA) || OS(LINUX)
28  28
29 #if CPU(X86) 29 #if CPU(X86)
30@@ -335,6 +351,22 @@ static inline void*& framePointerImpl(mc 30@@ -347,6 +363,22 @@ static inline void*& framePointerImpl(mc
31 #error Unknown Architecture 31 #error Unknown Architecture
32 #endif 32 #endif
33  33
34+#elif OS(NETBSD) 34+#elif OS(NETBSD)
35+ 35+
36+#if CPU(X86) 36+#if CPU(X86)
37+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EBP]); 37+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EBP]);
38+#elif CPU(X86_64) 38+#elif CPU(X86_64)
39+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RBP]); 39+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RBP]);
40+#elif CPU(ARM) 40+#elif CPU(ARM)
41+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_FP]); 41+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_FP]);
42+#elif CPU(ARM64) 42+#elif CPU(ARM64)
43+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_FP]); 43+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_FP]);
44+#elif CPU(MIPS) 44+#elif CPU(MIPS)
45+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_S8]); 45+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_S8]);
46+#else 46+#else
47+#error Unknown Architecture 47+#error Unknown Architecture
48+#endif 48+#endif
49+ 49+
50 #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) 50 #elif OS(FUCHSIA) || OS(LINUX)
51  51
52 // The following sequence depends on glibc's sys/ucontext.h. 52 // The following sequence depends on glibc's sys/ucontext.h.
53@@ -482,6 +514,22 @@ static inline void*& instructionPointerI 53@@ -497,6 +529,22 @@ static inline void*& instructionPointerI
 54 #else
54 #error Unknown Architecture 55 #error Unknown Architecture
55 #endif 56 #endif
56  57+
57+#elif OS(NETBSD) 58+#elif OS(NETBSD)
58+ 59+
59+#if CPU(X86) 60+#if CPU(X86)
60+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EIP]); 61+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EIP]);
61+#elif CPU(X86_64) 62+#elif CPU(X86_64)
62+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RIP]); 63+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RIP]);
63+#elif CPU(ARM) 64+#elif CPU(ARM)
64+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_PC]); 65+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_PC]);
65+#elif CPU(ARM64) 66+#elif CPU(ARM64)
66+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_PC]); 67+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_PC]);
67+#elif CPU(MIPS) 68+#elif CPU(MIPS)
68+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EPC]); 69+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EPC]);
69+#else 70+#else
70+#error Unknown Architecture 71+#error Unknown Architecture
71+#endif 72+#endif
72+ 
73 #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) 
74  73
75 // The following sequence depends on glibc's sys/ucontext.h. 74 #elif OS(FUCHSIA) || OS(LINUX)
76@@ -639,6 +687,22 @@ inline void*& argumentPointer<1>(mcontex 75
 76@@ -655,6 +703,22 @@ inline void*& argumentPointer<1>(mcontex
 77 #else
77 #error Unknown Architecture 78 #error Unknown Architecture
78 #endif 79 #endif
79  80+
80+#elif OS(NETBSD) 81+#elif OS(NETBSD)
81+ 82+
82+#if CPU(X86) 83+#if CPU(X86)
83+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EDX]); 84+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EDX]);
84+#elif CPU(X86_64) 85+#elif CPU(X86_64)
85+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RSI]); 86+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RSI]);
86+#elif CPU(ARM) 87+#elif CPU(ARM)
87+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R1]); 88+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R1]);
88+#elif CPU(ARM64) 89+#elif CPU(ARM64)
89+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_X1]); 90+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_X1]);
90+#elif CPU(MIPS) 91+#elif CPU(MIPS)
91+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_A1]); 92+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_A1]);
92+#else 93+#else
93+#error Unknown Architecture 94+#error Unknown Architecture
94+#endif 95+#endif
95+ 
96 #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) 
97  96
98 // The following sequence depends on glibc's sys/ucontext.h. 97 #elif OS(FUCHSIA) || OS(LINUX)
99@@ -756,6 +820,22 @@ inline void*& llintInstructionPointer(mc 98
 99@@ -772,6 +836,22 @@ inline void*& llintInstructionPointer(mc
 100 #else
100 #error Unknown Architecture 101 #error Unknown Architecture
101 #endif 102 #endif
102  103+
103+#elif OS(NETBSD) 104+#elif OS(NETBSD)
104+ 105+
105+#if CPU(X86) 106+#if CPU(X86)
106+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_ESI]); 107+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_ESI]);
107+#elif CPU(X86_64) 108+#elif CPU(X86_64)
108+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R8]); 109+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R8]);
109+#elif CPU(ARM) 110+#elif CPU(ARM)
110+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R8]); 111+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R8]);
111+#elif CPU(ARM64) 112+#elif CPU(ARM64)
112+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_X4]); 113+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_X4]);
113+#elif CPU(MIPS) 114+#elif CPU(MIPS)
114+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_T4]); 115+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_T4]);
115+#else 116+#else
116+#error Unknown Architecture 117+#error Unknown Architecture
117+#endif 118+#endif
118+ 
119 #elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) 
120  119
121 // The following sequence depends on glibc's sys/ucontext.h. 120 #elif OS(FUCHSIA) || OS(LINUX)
 121
cvs diff -r1.1 -r1.2 pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h 2020/03/10 18:14:04 1.1
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h 2021/05/13 08:20:58 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-Source_WTF_wtf_PlatformHave.h,v 1.1 2020/03/10 18:14:04 leot Exp $ 1$NetBSD: patch-Source_WTF_wtf_PlatformHave.h,v 1.2 2021/05/13 08:20:58 leot Exp $
2 2
3Add support for NetBSD. 3Add support for NetBSD.
4 4
5--- Source/WTF/wtf/PlatformHave.h.orig 2020-02-26 10:34:01.000000000 +0000 5--- Source/WTF/wtf/PlatformHave.h.orig 2021-05-05 05:33:24.000000000 +0000
6+++ Source/WTF/wtf/PlatformHave.h 6+++ Source/WTF/wtf/PlatformHave.h
7@@ -222,7 +222,7 @@ 7@@ -206,7 +206,7 @@
8 #define HAVE_HOSTED_CORE_ANIMATION 1 8 #define HAVE_HOSTED_CORE_ANIMATION 1
9 #endif 9 #endif
10  10
11-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) 11-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
12+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(NETBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) 12+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(NETBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
13 #define HAVE_MACHINE_CONTEXT 1 13 #define HAVE_MACHINE_CONTEXT 1
14 #endif 14 #endif
15  15