CVS commit: pkgsrc/www/webkit-gtk

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Wed Jun  8 20:56:50 UTC 2022

Modified Files:
        pkgsrc/www/webkit-gtk: distinfo
        pkgsrc/www/webkit-gtk/patches:
            patch-Source_JavaScriptCore_runtime_MachineContext.h
            patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp

Log Message:
webkit-gtk: Update status of upstreamed patches

(All patches that were needed for JavaScriptCore on NetBSD are now upstreamed
and JavaScriptCore should build and runs without local patches.)


To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 pkgsrc/www/webkit-gtk/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp

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/distinfo
diff -u pkgsrc/www/webkit-gtk/distinfo:1.165 pkgsrc/www/webkit-gtk/distinfo:1.166
--- pkgsrc/www/webkit-gtk/distinfo:1.165        Tue May 31 12:52:14 2022
+++ pkgsrc/www/webkit-gtk/distinfo      Wed Jun  8 20:56:50 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.165 2022/05/31 12:52:14 leot Exp $
+$NetBSD: distinfo,v 1.166 2022/06/08 20:56:50 leot Exp $
 
 BLAKE2s (webkitgtk-2.36.3.tar.xz) = c0536c4edcb59ed28edcdaf309267d6c3c1e49e5eaae85b39fb29b49722977ad
 SHA512 (webkitgtk-2.36.3.tar.xz) = dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692
@@ -10,7 +10,7 @@ SHA1 (patch-Source_JavaScriptCore_assemb
 SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = 8f324091df41be96b011bcbeed5fd64c4464f010
 SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 7f6c0c57d46478e83c4ff21dae2415f44085ba32
 SHA1 (patch-Source_JavaScriptCore_offlineasm_arm64.rb) = 8c05dafa317667bbf55504d05eeb8ae06fba4e93
-SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 7b7170ab78b8bc0aeccda14e0e74f5ed14266d3f
+SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 6c3bdbf8041df27510da5999ee85f4e5ed09be8b
 SHA1 (patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp) = 73dfe781efe7e8aa7d49094af8820a87c501818f
 SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_translator_SymbolTable.h) = 10debffda84bc752ed434657a337a466aad19a3a
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = ac07d4d8faa6dab606bcea31936340d260fcda33
@@ -21,7 +21,7 @@ SHA1 (patch-Source_WTF_wtf_PlatformHave.
 SHA1 (patch-Source_WTF_wtf_PlatformOS.h) = 80aa6ff20f10407d447fdb41606d4bb4989351aa
 SHA1 (patch-Source_WTF_wtf_PlatformUse.h) = 595486b48e7d89378208c0a209a121ef136415e6
 SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3
-SHA1 (patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp) = e3a5176efd45d12d52505b469a6fcb3de5c429f2
+SHA1 (patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp) = 036154b445b88c755855e906231d5e438318710a
 SHA1 (patch-Source_WebCore_Scripts_check-xcfilelists.sh) = b292baf2494bcd459d9af91386263123046c6615
 SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 9b323aa1fa8e6e5599ac0a7ae08fbbed4348c70e
 SHA1 (patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp) = 03337c5eec54d6974dfea1766b14cb2c1b9f7750

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h:1.3 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h:1.4
--- pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h:1.3      Tue May 31 12:52:14 2022
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h  Wed Jun  8 20:56:50 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-Source_JavaScriptCore_runtime_MachineContext.h,v 1.3 2022/05/31 12:52:14 leot Exp $
+$NetBSD: patch-Source_JavaScriptCore_runtime_MachineContext.h,v 1.4 2022/06/08 20:56:50 leot Exp $
 
 Add support for NetBSD.
 
-Shared upstream via <https://bugs.webkit.org/show_bug.cgi?id=241125>
+Shared and applied upstream via <https://bugs.webkit.org/show_bug.cgi?id=241125>.
 
 --- Source/JavaScriptCore/runtime/MachineContext.h.orig        2021-05-05 05:33:24.000000000 +0000
 +++ Source/JavaScriptCore/runtime/MachineContext.h

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp:1.2 pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp:1.3
--- pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp:1.2   Mon May 30 20:40:55 2022
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp       Wed Jun  8 20:56:50 2022
@@ -1,24 +1,11 @@
-$NetBSD: patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp,v 1.2 2022/05/30 20:40:55 leot Exp $
+$NetBSD: patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp,v 1.3 2022/06/08 20:56:50 leot Exp $
 
 Set protections for tryReserveUncommittedAligned() on platforms
 that have MAP_ALIGNED.
 
-This avoid a regression introduced by:
+This avoid a regression introduced by 247105@main.
 
- 2022-02-10  Keith Miller  <keith_miller%apple.com@localhost>
- 
- tryReserveUncommittedAligned should explicitly take the alignment requested
- https://bugs.webkit.org/show_bug.cgi?id=236460
- 
- Reviewed by Yusuke Suzuki.
- 
- When reducing the size of VA space reserved for Structures, we
- didn't take care to ensure the alignment matched the required
- alignment for our bit mask. To fix this we need to pass the
- original alignment to the allocator as a new parameter.
- 
- * heap/StructureAlignedMemoryAllocator.cpp:
-   (JSC::StructureMemoryManager::StructureMemoryManager):
+Shared and applied upstream via <https://bugs.webkit.org/show_bug.cgi?id=241386>.
 
 --- Source/WTF/wtf/posix/OSAllocatorPOSIX.cpp.orig     2022-02-23 11:41:47.560819000 +0000
 +++ Source/WTF/wtf/posix/OSAllocatorPOSIX.cpp