CVS commit: pkgsrc/www/webkit-gtk

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/webkit-gtk
From: "Izumi Tsutsui" <tsutsui%netbsd.org@localhost>
Date: Sat, 25 Oct 2025 14:45:27 +0000

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat Oct 25 14:45:27 UTC 2025

Modified Files:
        pkgsrc/www/webkit-gtk: Makefile distinfo
Added Files:
        pkgsrc/www/webkit-gtk: hacks.mk
        pkgsrc/www/webkit-gtk/patches:
            patch-Source_JavaScriptCore_API_glib_JSCOptions.cpp
            patch-Source_JavaScriptCore_runtime_Options.cpp
            patch-Source_WTF_wtf_dtoa_utils.h
            patch-Source_WebCore_platform_graphics_filters_FELighting.h

Log Message:
webkit-gtk: try to make this builds on NetBSD/earmv7hf{,eb}.

- handle size_t == unsigned long on ILP32 cases (NetBSD/arm and powerpc)
- handle not only __ARMEL__ but also __ARMEB__ properly
- fix build errors in case of ARM_NEON && !ENABLE_UNIFIED_BUILDS
- set UNLIMIT_RESOURCES for large C++ source files
- disable -O2 and Unified builds on NetBSD/arm with gcc 10.x (for netbsd-10)

XXX: Builds on NetBSD/earmv7hfeb still fail due to
"virtual memory exhausted: Cannot allocate memory"
errors on compiling WebCore/DerivedSources/JSDOMWindow.cpp
(generated ~1.5MB C++ source file) on 1GB Raspberry Pi 3B.
No visible regression on NetBSD/amd64 10.1 builds.


To generate a diff of this commit:
cvs rdiff -u -r1.275 -r1.276 pkgsrc/www/webkit-gtk/Makefile
cvs rdiff -u -r1.179 -r1.180 pkgsrc/www/webkit-gtk/distinfo
cvs rdiff -u -r0 -r1.4 pkgsrc/www/webkit-gtk/hacks.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_API_glib_JSCOptions.cpp \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FELighting.h
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_Options.cpp
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h

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/Makefile
diff -u pkgsrc/www/webkit-gtk/Makefile:1.275 pkgsrc/www/webkit-gtk/Makefile:1.276
--- pkgsrc/www/webkit-gtk/Makefile:1.275        Thu Oct 23 20:39:51 2025
+++ pkgsrc/www/webkit-gtk/Makefile      Sat Oct 25 14:45:27 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.275 2025/10/23 20:39:51 wiz Exp $
+# $NetBSD: Makefile,v 1.276 2025/10/25 14:45:27 tsutsui Exp $
 
 DISTNAME=      webkitgtk-2.36.8
 PKGNAME=       ${DISTNAME:S/webkitgtk/webkit-gtk/}
@@ -124,6 +124,8 @@ CXXFLAGS+=  -Wno-c++11-narrowing
 # This does not disable optimisations, merely avoids #error if there are none.
 CFLAGS+=       -DRELEASE_WITHOUT_OPTIMIZATIONS
 
+UNLIMIT_RESOURCES=     datasize memorysize
+
 # Needed for JavaScript JIT
 NOT_PAX_MPROTECT_SAFE+=        libexec/webkit2gtk-4.0/WebKitWebProcess
 NOT_PAX_MPROTECT_SAFE+=        libexec/webkit2gtk-4.0/jsc

Index: pkgsrc/www/webkit-gtk/distinfo
diff -u pkgsrc/www/webkit-gtk/distinfo:1.179 pkgsrc/www/webkit-gtk/distinfo:1.180
--- pkgsrc/www/webkit-gtk/distinfo:1.179        Wed Jan 15 12:51:47 2025
+++ pkgsrc/www/webkit-gtk/distinfo      Sat Oct 25 14:45:27 2025
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.179 2025/01/15 12:51:47 wiz Exp $
+$NetBSD: distinfo,v 1.180 2025/10/25 14:45:27 tsutsui Exp $
 
 BLAKE2s (webkitgtk-2.36.8.tar.xz) = 277ba5935bda3e3867083b4c736499d974b9c733dbd05bf574510857dde481a1
 SHA512 (webkitgtk-2.36.8.tar.xz) = 50576f13ea84c0634d174ccf0b70d0eb28752589b2b9ce7a82ffeee1b4b6c849a802f7ae83a3c5a74d0da2b7e3321876ead33e819d8006b8153376074cb57036
 Size (webkitgtk-2.36.8.tar.xz) = 26610100 bytes
 SHA1 (patch-Source_JavaScriptCore_API_glib_JSCClass.cpp) = f0817f6f7917fb587445d54334ef46be84a55b47
 SHA1 (patch-Source_JavaScriptCore_API_glib_JSCContext.cpp) = d79e18a5a42160785f3d9d4062279cbdf85845e9
+SHA1 (patch-Source_JavaScriptCore_API_glib_JSCOptions.cpp) = 554900ae52c79bdf21004d192492978ba766013a
 SHA1 (patch-Source_JavaScriptCore_API_glib_JSCValue.cpp) = 5ae0268e6e93493b169030ae98b4b97985159fba
 SHA1 (patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh) = f4f117e6c1cd8eb8e4905f74946e0367156ed528
 SHA1 (patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh) = 308a7c8f687253b4fc75de0c66016dd18666e697
@@ -16,6 +17,7 @@ SHA1 (patch-Source_JavaScriptCore_offlin
 SHA1 (patch-Source_JavaScriptCore_offlineasm_config.rb) = 64da5459255de458d481a8337aac4027b256a88c
 SHA1 (patch-Source_JavaScriptCore_offlineasm_parser.rb) = 8b34d774a7e125cf60d0738e221b6d872207aa6e
 SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 6c3bdbf8041df27510da5999ee85f4e5ed09be8b
+SHA1 (patch-Source_JavaScriptCore_runtime_Options.cpp) = 7d27f4badb083f3bf1715222b212e7fb04afe40e
 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
@@ -28,6 +30,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_dtoa_utils.h) = 63d99887437102b455bfd7aea1385fb6709d3387
 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
@@ -35,6 +38,7 @@ SHA1 (patch-Source_WebCore_crypto_algori
 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_AudioSourceProviderGStreamer.cpp) = d398e26a13b3c28088396f1390581ce6d27f2c70
+SHA1 (patch-Source_WebCore_platform_graphics_filters_FELighting.h) = 90e492249625eacd7f9885aec549a2ee0ca5f5bf
 SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 43f423af652533a64d0793ec6d15150b908da0f8
 SHA1 (patch-Source_WebCore_platform_graphics_gstreamer_ImageDecoderGStreamer.cpp) = 11ee606b7975c8d2e1318c19b49abc83cf6dc76e
 SHA1 (patch-Source_WebCore_platform_network_DNS.h) = dd9fb67aae0029c6a452e7d8f09eeed1235d5700

Added files:

Index: pkgsrc/www/webkit-gtk/hacks.mk
diff -u /dev/null pkgsrc/www/webkit-gtk/hacks.mk:1.4
--- /dev/null   Sat Oct 25 14:45:27 2025
+++ pkgsrc/www/webkit-gtk/hacks.mk      Sat Oct 25 14:45:27 2025
@@ -0,0 +1,16 @@
+# $NetBSD: hacks.mk,v 1.4 2025/10/25 14:45:27 tsutsui Exp $
+
+.if !defined(WEBKIT_GTK_HACKS_MK)
+WEBKIT_GTK_HACKS_MK=   defined
+
+.include "../../mk/compiler.mk"
+
+### gcc-10.5.0 in NetBSD/earmv7hf 10.1 gets "virtual memory exhausted:
+### Cannot allocate memory" with -O2.
+.if ${MACHINE_PLATFORM:MNetBSD-*-*arm*} && ${CC_VERSION:Mgcc-10.*}
+PKG_HACKS+=            optimisation
+BUILDLINK_TRANSFORM+=  opt:-O[0-9]*:-O
+CMAKE_CONFIGURE_ARGS+= -DENABLE_UNIFIED_BUILDS=OFF
+.endif
+
+.endif # WEBKIT_GTK_HACKS_MK

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_API_glib_JSCOptions.cpp
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_API_glib_JSCOptions.cpp:1.1
--- /dev/null   Sat Oct 25 14:45:27 2025
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_API_glib_JSCOptions.cpp   Sat Oct 25 14:45:27 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-Source_JavaScriptCore_API_glib_JSCOptions.cpp,v 1.1 2025/10/25 14:45:27 tsutsui Exp $
+
+- fix build errors on NetBSD/arm where size_t == unsigned long
+
+--- Source/JavaScriptCore/API/glib/JSCOptions.cpp.orig 2022-06-30 09:49:25.102854500 +0000
++++ Source/JavaScriptCore/API/glib/JSCOptions.cpp
+@@ -73,7 +73,8 @@ static void valueToGValue(int32_t value,
+     g_value_set_int(gValue, value);
+ }
+ 
+-#if CPU(ADDRESS64)
++#if CPU(ADDRESS64) || OS(DARWIN) || \
++  (defined(__NetBSD__) && (defined(__arm__) || defined(__powerpc__)))
+ static bool valueFromGValue(const GValue* gValue, unsigned& value)
+ {
+     value = g_value_get_uint(gValue);
+@@ -542,7 +543,8 @@ static JSCOptionType jscOptionsType(int)
+     return JSC_OPTION_INT;
+ }
+ 
+-#if CPU(ADDRESS64)
++#if CPU(ADDRESS64) || OS(DARWIN) || \
++  (defined(__NetBSD__) && (defined(__arm__) || defined(__powerpc__)))
+ static JSCOptionType jscOptionsType(unsigned)
+ {
+     return JSC_OPTION_UINT;
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FELighting.h
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FELighting.h:1.1
--- /dev/null   Sat Oct 25 14:45:27 2025
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FELighting.h   Sat Oct 25 14:45:27 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-Source_WebCore_platform_graphics_filters_FELighting.h,v 1.1 2025/10/25 14:45:27 tsutsui Exp $
+
+- add forward declaration for ARM_NEON && !ENABLE_UNIFIED_BUILDS case
+
+--- Source/WebCore/platform/graphics/filters/FELighting.h.orig 2025-10-25 02:54:05.885956119 +0000
++++ Source/WebCore/platform/graphics/filters/FELighting.h
+@@ -35,6 +35,7 @@
+ 
+ namespace WebCore {
+ 
++struct LightingData;
+ struct FELightingPaintingDataForNeon;
+ 
+ class FELighting : public FilterEffect {

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_Options.cpp
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_Options.cpp:1.4
--- /dev/null   Sat Oct 25 14:45:27 2025
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_Options.cpp       Sat Oct 25 14:45:27 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-Source_JavaScriptCore_runtime_Options.cpp,v 1.4 2025/10/25 14:45:27 tsutsui Exp $
+
+- fix build errors on NetBSD/arm where size_t == unsigned long
+
+--- Source/JavaScriptCore/runtime/Options.cpp.orig     2022-06-30 09:49:26.996186500 +0000
++++ Source/JavaScriptCore/runtime/Options.cpp
+@@ -89,7 +89,8 @@ std::optional<OptionsStorage::Unsigned> 
+     return std::nullopt;
+ }
+ 
+-#if CPU(ADDRESS64) || OS(DARWIN)
++#if CPU(ADDRESS64) || OS(DARWIN) || \
++  (defined(__NetBSD__) && (defined(__arm__) || defined(__powerpc__)))
+ template<>
+ std::optional<OptionsStorage::Size> parse(const char* string)
+ {
+@@ -98,7 +99,7 @@ std::optional<OptionsStorage::Size> pars
+         return value;
+     return std::nullopt;
+ }
+-#endif // CPU(ADDRESS64) || OS(DARWIN)
++#endif // CPU(ADDRESS64) || OS(DARWIN) || (defined(__NetBSD__) && (defined(__arm__) || defined(__powerpc__)))
+ 
+ template<>
+ std::optional<OptionsStorage::Double> parse(const char* string)

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h:1.3
--- /dev/null   Sat Oct 25 14:45:27 2025
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h     Sat Oct 25 14:45:27 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_WTF_wtf_dtoa_utils.h,v 1.3 2025/10/25 14:45:27 tsutsui Exp $
+
+- fix build errors on NetBSD/earmeb (and earmv7hfeb etc.)
+
+--- Source/WTF/wtf/dtoa/utils.h.orig   2022-06-30 09:49:30.166184200 +0000
++++ Source/WTF/wtf/dtoa/utils.h
+@@ -80,7 +80,7 @@ int main(int argc, char** argv) {
+ //
+ // If it prints "correct" then the architecture should be here, in the "correct" section.
+ #if defined(_M_X64) || defined(__x86_64__) || \
+-    defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \
++    defined(__ARMEL__) || defined(__ARMEB__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \
+     defined(__hppa__) || defined(__ia64__) || \
+     defined(__mips__) || \
+     defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \

Prev by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index