CVS commit: pkgsrc/www/webkit-gtk

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat Oct 25 15:00:46 UTC 2025

Modified Files:
        pkgsrc/www/webkit-gtk: distinfo
        pkgsrc/www/webkit-gtk/patches:
            patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h
            patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp
Added Files:
        pkgsrc/www/webkit-gtk/patches: patch-Source_WTF_wtf_InlineASM.h
Removed Files:
        pkgsrc/www/webkit-gtk/patches: patch-aj

Log Message:
webkit-gtk: appease pkglint and rename a patch for maintainability.


To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 pkgsrc/www/webkit-gtk/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_InlineASM.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp
cvs rdiff -u -r1.7 -r0 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/distinfo
diff -u pkgsrc/www/webkit-gtk/distinfo:1.180 pkgsrc/www/webkit-gtk/distinfo:1.181
--- pkgsrc/www/webkit-gtk/distinfo:1.180        Sat Oct 25 14:45:27 2025
+++ pkgsrc/www/webkit-gtk/distinfo      Sat Oct 25 15:00:45 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.180 2025/10/25 14:45:27 tsutsui Exp $
+$NetBSD: distinfo,v 1.181 2025/10/25 15:00:45 tsutsui Exp $
 
 BLAKE2s (webkitgtk-2.36.8.tar.xz) = 277ba5935bda3e3867083b4c736499d974b9c733dbd05bf574510857dde481a1
 SHA512 (webkitgtk-2.36.8.tar.xz) = 50576f13ea84c0634d174ccf0b70d0eb28752589b2b9ce7a82ffeee1b4b6c849a802f7ae83a3c5a74d0da2b7e3321876ead33e819d8006b8153376074cb57036
@@ -21,9 +21,10 @@ SHA1 (patch-Source_JavaScriptCore_runtim
 SHA1 (patch-Source_ThirdParty_ANGLE_include_GLSLANG_ShaderVars.h) = 96d98e55fb2fdc777445d19b20a0e725f0cc31df
 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
+SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = 6c864512dec8595528cba17bdc2b2dfc7f1d71b3
 SHA1 (patch-Source_WTF_wtf_Assertions.h) = 427de20eba4627578087feaa7de2f23e80b9debf
 SHA1 (patch-Source_WTF_wtf_FileSystem.cpp) = 2fe7b7755646d9a1cc022aec3d01091766378aba
+SHA1 (patch-Source_WTF_wtf_InlineASM.h) = 971de0abec8dbc90b09f08b1cba86b864b25d826
 SHA1 (patch-Source_WTF_wtf_Platform.h) = a11bf103caaecbef9e31923a97495daa22ff4759
 SHA1 (patch-Source_WTF_wtf_PlatformEnable.h) = eb5598c20c8453314daba7897066f15827bbede7
 SHA1 (patch-Source_WTF_wtf_PlatformHave.h) = 4bae0a5b48ab95fbccb1ce09d239d744d274e4eb
@@ -36,7 +37,7 @@ SHA1 (patch-Source_WebCore_Scripts_check
 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_audio_gstreamer_AudioFileReaderGStreamer.cpp) = 8ad3610d02671c08637926aa5c75eaf059ae5862
+SHA1 (patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp) = 34dff5c9375ab7cf27a81e53755c53a4b55c03a5
 SHA1 (patch-Source_WebCore_platform_audio_gstreamer_AudioSourceProviderGStreamer.cpp) = d398e26a13b3c28088396f1390581ce6d27f2c70
 SHA1 (patch-Source_WebCore_platform_graphics_filters_FELighting.h) = 90e492249625eacd7f9885aec549a2ee0ca5f5bf
 SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 43f423af652533a64d0793ec6d15150b908da0f8
@@ -73,4 +74,3 @@ SHA1 (patch-Source_cmake_OptionsCommon.c
 SHA1 (patch-Source_cmake_WebKitCommon.cmake) = 73a0da491ef93d5cc25214e7733b54bbdacd487e
 SHA1 (patch-Tools_TestWebKitAPI_Scripts_check-xcfilelists.sh) = 6e8327bf46150806910b21b298767f313e1eb3ce
 SHA1 (patch-Tools_TestWebKitAPI_Scripts_generate-unified-sources.sh) = 06747f279263558f05bb01c8da9c994a357ce74a
-SHA1 (patch-aj) = ec60907df4336b755d1d1924c026b3041805f431

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h:1.5 
pkgsrc/www/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h:1.6
--- pkgsrc/www/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h:1.5 Tue Sep 28 22:11:54 2021
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h     Sat Oct 25 15:00:45 2025
@@ -1,4 +1,7 @@
-$NetBSD: patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.5 2021/09/28 22:11:54 leot Exp $
+$NetBSD: patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h,v 1.6 2025/10/25 15:00:45 tsutsui Exp $
+
+- Fixes out-of-scope errors seen on gcc 4.7.x
+- Allow building with libc++
 
 --- Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h.orig   2021-09-01 09:16:47.000000000 +0000
 +++ Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp:1.1 
pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp:1.2
--- pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp:1.1        Sun Jun 23 13:59:41 2024
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp    Sat Oct 25 15:00:45 2025
@@ -1,8 +1,9 @@
-$NetBSD: patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp,v 1.1 2024/06/23 13:59:41 mef Exp $
+$NetBSD: patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp,v 1.2 2025/10/25 15:00:45 tsutsui Exp $
 
  error: braces around scalar initializer for type  gboolean (*)(GstAppSink*, GstQuery*, gpointer)' {aka 'int (*)(_GstAppSink*, _GstQuery*, void*)'}
      };
      ^
+
 --- Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp.orig  2023-02-14 18:01:07.357508400 +0900
 +++ Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp       2024-06-23 21:17:02.539869040 +0900
 @@ -287,7 +287,7 @@ void AudioFileReader::handleNewDeinterle

Added files:

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_InlineASM.h
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_InlineASM.h:1.1
--- /dev/null   Sat Oct 25 15:00:46 2025
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_InlineASM.h      Sat Oct 25 15:00:45 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_WTF_wtf_InlineASM.h,v 1.1 2025/10/25 15:00:45 tsutsui Exp $
+
+Add support for NetBSD, OpenBSD and Solaris.
+
+--- Source/WTF/wtf/InlineASM.h.orig    2022-06-30 09:49:30.096184300 +0000
++++ Source/WTF/wtf/InlineASM.h
+@@ -43,7 +43,7 @@
+ #define THUMB_FUNC_PARAM(name)
+ #endif
+ 
+-#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
++#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"