Hi. Here's an update to the latest webkitgtk4 release. It's built tested on amd64 and arm64. Currently in an amd64 bulk.
It would be nice to have it for 7.7 so we can keep it up-to-date in stable. But I understand this might be too late. I'd appreciate tests on other arches. Thanks. Index: Makefile =================================================================== RCS file: /cvs/ports/www/webkitgtk4/Makefile,v diff -u -p -r1.231 Makefile --- Makefile 8 Feb 2025 13:05:24 -0000 1.231 +++ Makefile 19 Mar 2025 17:30:03 -0000 @@ -10,7 +10,7 @@ PORTROACH = limitw:1,even COMMENT = GTK+ port of the WebKit (${API}) rendering engine -V = 2.46.6 +V = 2.48.0 DISTNAME = webkitgtk-${V} PKGNAME = webkitgtk${API:S/.//}-${V} FULLPKGNAME = ${PKGNAME} @@ -33,7 +33,11 @@ MAINTAINER = Antoine Jacoutot <ajacouto PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} X11 avif c cairo cairo-gobject drm -WANTLIB += enchant-2 epoll-shim epoxy fontconfig freetype gbm +WANTLIB += enchant-2 epoll-shim epoxy expat flite flite_cmu_grapheme_lang +WANTLIB += flite_cmu_grapheme_lex flite_cmu_indic_lang flite_cmu_indic_lex +WANTLIB += flite_cmu_time_awb flite_cmu_us_awb flite_cmu_us_kal +WANTLIB += flite_cmu_us_kal16 flite_cmu_us_rms flite_cmu_us_slt +WANTLIB += flite_cmulex flite_usenglish fontconfig freetype gbm WANTLIB += gcrypt gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 WANTLIB += gobject-2.0 gpg-error gstallocators-1.0 gstapp-1.0 WANTLIB += gstaudio-1.0 gstbase-1.0 gstfft-1.0 gstgl-1.0 gstpbutils-1.0 @@ -70,6 +74,7 @@ RUN_DEPENDS = geo/geoclue2 \ multimedia/gstreamer1/plugins-good LIB_DEPENDS = archivers/woff2 \ + audio/flite \ devel/harfbuzz,-icu \ graphics/libavif \ graphics/libjxl \ @@ -113,9 +118,8 @@ CONFIGURE_ARGS += -DENABLE_GAMEPAD=OFF # sync with Source/JavaScriptCore/assembler/MacroAssembler.h .if ${MACHINE_ARCH} != "aarch64" && ${MACHINE_ARCH} != "amd64" && \ - ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "i386" && \ - ${MACHINE_ARCH} != "mips64" && ${MACHINE_ARCH} != "mips64el" && \ - ${MACHINE_ARCH} != "riscv64" + ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips64" && \ + ${MACHINE_ARCH} != "mips64el" && ${MACHINE_ARCH} != "riscv64" # #error "The MacroAssembler is not supported on this platform." CONFIGURE_ARGS += -DENABLE_JIT=OFF CONFIGURE_ARGS += -DENABLE_C_LOOP=ON Index: distinfo =================================================================== RCS file: /cvs/ports/www/webkitgtk4/distinfo,v diff -u -p -r1.128 distinfo --- distinfo 8 Feb 2025 13:05:24 -0000 1.128 +++ distinfo 19 Mar 2025 17:30:03 -0000 @@ -1,2 +1,2 @@ -SHA256 (webkitgtk-2.46.6.tar.xz) = 8rMd5pMiC6m6t2zm3f5bC/qyUVyysKcPPFTUBQdmwys= -SIZE (webkitgtk-2.46.6.tar.xz) = 42914744 +SHA256 (webkitgtk-2.48.0.tar.xz) = lJBKVc8S1EpONs6tr/8C1G2nPXa+m0dp80y/3w7r+I4= +SIZE (webkitgtk-2.48.0.tar.xz) = 44163600 Index: patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler_h =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler_h,v diff -u -p -r1.17 patch-Source_JavaScriptCore_assembler_ARM64Assembler_h --- patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler_h 6 Oct 2024 15:14:44 -0000 1.17 +++ patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler_h 19 Mar 2025 17:30:03 -0000 @@ -1,7 +1,7 @@ Index: Source/JavaScriptCore/assembler/ARM64Assembler.h --- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig +++ Source/JavaScriptCore/assembler/ARM64Assembler.h -@@ -3669,6 +3669,8 @@ class ARM64Assembler { (public) +@@ -3745,6 +3745,8 @@ class ARM64Assembler { (public) { #if OS(DARWIN) sys_icache_invalidate(code, size); Index: patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h =================================================================== RCS file: patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h diff -N patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h --- patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86Common_h 11 Mar 2022 20:11:07 -0000 1.7 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -XXX error: macro "swap32" passed 2 arguments, but takes just 1 -XXX error: macro "swap64" passed 2 arguments, but takes just 1 - -Index: Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h ---- Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h.orig -+++ Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h -@@ -31,6 +31,12 @@ - #include "AbstractMacroAssembler.h" - #include <array> - -+/* conflicting definition in endian.h */ -+#if OS(OPENBSD) -+#undef swap32 -+#undef swap64 -+#endif -+ - namespace JSC { - - using Assembler = TARGET_ASSEMBLER; Index: patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86_64_h =================================================================== RCS file: patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86_64_h diff -N patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86_64_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerX86_64_h 19 Mar 2025 17:30:03 -0000 @@ -0,0 +1,16 @@ +Index: Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h +--- Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h.orig ++++ Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h +@@ -32,6 +32,12 @@ + #include <array> + #include <wtf/TZoneMalloc.h> + ++/* conflicting definition in endian.h */ ++#if OS(OPENBSD) ++#undef swap32 ++#undef swap64 ++#endif ++ + #define REPATCH_OFFSET_CALL_R11 3 + + inline bool CAN_SIGN_EXTEND_32_64(int64_t value) { return value == (int64_t)(int32_t)value; } Index: patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter64_asm =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter64_asm,v diff -u -p -r1.2 patch-Source_JavaScriptCore_llint_LowLevelInterpreter64_asm --- patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter64_asm 6 Oct 2024 15:14:44 -0000 1.2 +++ patches/patch-Source_JavaScriptCore_llint_LowLevelInterpreter64_asm 19 Mar 2025 17:30:03 -0000 @@ -23,16 +23,7 @@ bltu x13, x31, .Lllint_throw_stack_overf Index: Source/JavaScriptCore/llint/LowLevelInterpreter64.asm --- Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.orig +++ Source/JavaScriptCore/llint/LowLevelInterpreter64.asm -@@ -202,7 +202,7 @@ macro doVMEntry(makeCall) - addp CallFrameHeaderSlots, t4, t4 - lshiftp 3, t4 - subp sp, t4, t3 -- bqbeq sp, t3, _llint_throw_stack_overflow_error_from_vm_entry -+ bqbeq sp, t3, .llint_throw_stack_overflow_error_from_vm_entry - - # Ensure that we have enough additional stack capacity for the incoming args, - # and the frame for the JS code we're executing. We need to do this check -@@ -220,11 +220,11 @@ macro doVMEntry(makeCall) +@@ -219,11 +219,11 @@ macro doVMEntry(makeCall) .stackCheckFailed: move t4, entry move t5, vm @@ -41,12 +32,12 @@ Index: Source/JavaScriptCore/llint/LowLe .stackHeightOK: move t3, sp else -- bpb t3, VM::m_softStackLimit[vm], _llint_throw_stack_overflow_error_from_vm_entry -+ bpb t3, VM::m_softStackLimit[vm], .llint_throw_stack_overflow_error_from_vm_entry +- bplteq t3, VM::m_softStackLimit[vm], _llint_throw_stack_overflow_error_from_vm_entry ++ bplteq t3, VM::m_softStackLimit[vm], .llint_throw_stack_overflow_error_from_vm_entry move t3, sp end -@@ -309,9 +309,8 @@ macro doVMEntry(makeCall) +@@ -308,9 +308,8 @@ macro doVMEntry(makeCall) popCalleeSaves() functionEpilogue() ret @@ -57,7 +48,7 @@ Index: Source/JavaScriptCore/llint/LowLe const entry = a0 const vm = a1 const protoCallFrame = a2 -@@ -334,6 +333,7 @@ _llint_throw_stack_overflow_error_from_vm_entry: +@@ -333,6 +332,7 @@ _llint_throw_stack_overflow_error_from_vm_entry: popCalleeSaves() functionEpilogue() ret Index: patches/patch-Source_JavaScriptCore_offlineasm_arm64_rb =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_JavaScriptCore_offlineasm_arm64_rb,v diff -u -p -r1.12 patch-Source_JavaScriptCore_offlineasm_arm64_rb --- patches/patch-Source_JavaScriptCore_offlineasm_arm64_rb 6 Oct 2024 15:14:44 -0000 1.12 +++ patches/patch-Source_JavaScriptCore_offlineasm_arm64_rb 19 Mar 2025 17:30:03 -0000 @@ -1,12 +1,12 @@ Index: Source/JavaScriptCore/offlineasm/arm64.rb --- Source/JavaScriptCore/offlineasm/arm64.rb.orig +++ Source/JavaScriptCore/offlineasm/arm64.rb -@@ -1369,7 +1369,7 @@ class Instruction - $asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, #{operands[0].asmLabel}@GOTPAGEOFF]" +@@ -1376,7 +1376,7 @@ class Instruction + $asm.putStr("#endif") # On Linux, use ELF GOT relocation specifiers. - $asm.putStr("#elif OS(LINUX)") + $asm.putStr("#elif OS(LINUX) || OS(OPENBSD)") - $asm.puts "adrp #{operands[1].arm64Operand(:quad)}, :got:#{operands[0].asmLabel}" - $asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, :got_lo12:#{operands[0].asmLabel}]" + $asm.puts "adrp #{operands[1].arm64Operand(:quad)}, :got:#{operands[0].asmLabel}" + $asm.putStr("#if CPU(ADDRESS32)") Index: patches/patch-Source_JavaScriptCore_runtime_JSCBytecodeCacheVersion_cpp =================================================================== RCS file: patches/patch-Source_JavaScriptCore_runtime_JSCBytecodeCacheVersion_cpp diff -N patches/patch-Source_JavaScriptCore_runtime_JSCBytecodeCacheVersion_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Source_JavaScriptCore_runtime_JSCBytecodeCacheVersion_cpp 19 Mar 2025 17:30:03 -0000 @@ -0,0 +1,14 @@ +error: unknown type name 'ElfW' + +Index: Source/JavaScriptCore/runtime/JSCBytecodeCacheVersion.cpp +--- Source/JavaScriptCore/runtime/JSCBytecodeCacheVersion.cpp.orig ++++ Source/JavaScriptCore/runtime/JSCBytecodeCacheVersion.cpp +@@ -66,7 +66,7 @@ uint32_t computeJSCBytecodeCacheVersion() + } + cacheVersion.construct(0); + dataLogLnIf(JSCBytecodeCacheVersionInternal::verbose, "Failed to get UUID for JavaScriptCore framework"); +-#elif OS(UNIX) && !PLATFORM(PLAYSTATION) ++#elif OS(UNIX) && !PLATFORM(PLAYSTATION) && !OS(OPENBSD) + auto result = ([&] -> std::optional<uint32_t> { + Dl_info info { }; + if (!dladdr(jsFunctionAddr, &info)) Index: patches/patch-Source_JavaScriptCore_runtime_MachineContext_h =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_JavaScriptCore_runtime_MachineContext_h,v diff -u -p -r1.14 patch-Source_JavaScriptCore_runtime_MachineContext_h --- patches/patch-Source_JavaScriptCore_runtime_MachineContext_h 6 Oct 2024 15:14:45 -0000 1.14 +++ patches/patch-Source_JavaScriptCore_runtime_MachineContext_h 19 Mar 2025 17:30:03 -0000 @@ -1,7 +1,7 @@ Index: Source/JavaScriptCore/runtime/MachineContext.h --- Source/JavaScriptCore/runtime/MachineContext.h.orig +++ Source/JavaScriptCore/runtime/MachineContext.h -@@ -194,6 +194,24 @@ static inline void*& stackPointerImpl(mcontext_t& mach +@@ -182,6 +182,24 @@ static inline void*& stackPointerImpl(mcontext_t& mach #error Unknown Architecture #endif @@ -23,10 +23,10 @@ Index: Source/JavaScriptCore/runtime/Mac +#error Unknown Architecture +#endif + - #elif OS(FUCHSIA) || OS(LINUX) + #elif OS(FUCHSIA) || OS(LINUX) || OS(HURD) - #if CPU(X86) -@@ -339,6 +357,24 @@ static inline void*& framePointerImpl(mcontext_t& mach + #if CPU(X86_64) +@@ -305,6 +323,24 @@ static inline void*& framePointerImpl(mcontext_t& mach #error Unknown Architecture #endif @@ -48,10 +48,10 @@ Index: Source/JavaScriptCore/runtime/Mac +#error Unknown Architecture +#endif + - #elif OS(FUCHSIA) || OS(LINUX) + #elif OS(FUCHSIA) || OS(LINUX) || OS(HURD) // The following sequence depends on glibc's sys/ucontext.h. -@@ -519,6 +555,24 @@ static inline void*& instructionPointerImpl(mcontext_t +@@ -467,6 +503,24 @@ static inline void*& instructionPointerImpl(mcontext_t #error Unknown Architecture #endif @@ -73,10 +73,10 @@ Index: Source/JavaScriptCore/runtime/Mac +#error Unknown Architecture +#endif + - #elif OS(FUCHSIA) || OS(LINUX) + #elif OS(FUCHSIA) || OS(LINUX) || OS(HURD) // The following sequence depends on glibc's sys/ucontext.h. -@@ -684,6 +738,24 @@ inline void*& argumentPointer<1>(mcontext_t& machineCo +@@ -655,6 +709,24 @@ inline void*& argumentPointer<1>(mcontext_t& machineCo #error Unknown Architecture #endif @@ -98,13 +98,38 @@ Index: Source/JavaScriptCore/runtime/Mac +#error Unknown Architecture +#endif + - #elif OS(FUCHSIA) || OS(LINUX) + #elif OS(FUCHSIA) || OS(LINUX) || OS(HURD) // The following sequence depends on glibc's sys/ucontext.h. -@@ -808,6 +880,24 @@ inline void*& llintInstructionPointer(mcontext_t& mach - return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_gpregs.gp_x[4]); - #elif CPU(MIPS) - return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_regs[12]); +@@ -712,6 +784,24 @@ inline void* wasmInstancePointer(const mcontext_t& mac + #error Unknown Architecture + #endif + ++#elif OS(OPENBSD) ++ ++#if CPU(X86) ++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.sc_esi); ++#elif CPU(X86_64) ++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.sc_rbx); ++#elif CPU(ARM) ++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R10]); ++#elif CPU(ARM64) ++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.sc_x[19]); ++#elif CPU(MIPS) ++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.mc_regs[19]); ++#elif CPU(RISCV64) ++ return reinterpret_cast<void*&>((uintptr_t&) machineContext.sc_a[19]); ++#else ++#error Unknown Architecture ++#endif ++ + #elif OS(FUCHSIA) || OS(LINUX) || OS(HURD) + + // The following sequence depends on glibc's sys/ucontext.h. +@@ -830,6 +920,24 @@ inline void*& llintInstructionPointer(mcontext_t& mach + return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R8]); + #elif CPU(ARM64) + return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_X4]); +#else +#error Unknown Architecture +#endif Index: patches/patch-Source_JavaScriptCore_runtime_Options_cpp =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_JavaScriptCore_runtime_Options_cpp,v diff -u -p -r1.13 patch-Source_JavaScriptCore_runtime_Options_cpp --- patches/patch-Source_JavaScriptCore_runtime_Options_cpp 6 Oct 2024 15:14:45 -0000 1.13 +++ patches/patch-Source_JavaScriptCore_runtime_Options_cpp 19 Mar 2025 17:30:03 -0000 @@ -5,7 +5,7 @@ JSC::parse<unsigned long>(char const*)' Index: Source/JavaScriptCore/runtime/Options.cpp --- Source/JavaScriptCore/runtime/Options.cpp.orig +++ Source/JavaScriptCore/runtime/Options.cpp -@@ -225,7 +225,7 @@ std::optional<OptionsStorage::Unsigned> parse(const ch +@@ -233,7 +233,7 @@ std::optional<OptionsStorage::Unsigned> parse(const ch return std::nullopt; } @@ -14,7 +14,7 @@ Index: Source/JavaScriptCore/runtime/Opt template<> std::optional<OptionsStorage::Size> parse(const char* string) { -@@ -234,7 +234,7 @@ std::optional<OptionsStorage::Size> parse(const char* +@@ -242,7 +242,7 @@ std::optional<OptionsStorage::Size> parse(const char* return value; return std::nullopt; } Index: patches/patch-Source_JavaScriptCore_wasm_js_JSToWasm_cpp =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_JavaScriptCore_wasm_js_JSToWasm_cpp,v diff -u -p -r1.1 patch-Source_JavaScriptCore_wasm_js_JSToWasm_cpp --- patches/patch-Source_JavaScriptCore_wasm_js_JSToWasm_cpp 25 Nov 2024 19:20:26 -0000 1.1 +++ patches/patch-Source_JavaScriptCore_wasm_js_JSToWasm_cpp 19 Mar 2025 17:30:03 -0000 @@ -7,10 +7,10 @@ Upstream discussion: https://bugs.webkit Index: Source/JavaScriptCore/wasm/js/JSToWasm.cpp --- Source/JavaScriptCore/wasm/js/JSToWasm.cpp.orig +++ Source/JavaScriptCore/wasm/js/JSToWasm.cpp -@@ -39,6 +39,7 @@ - #include "WasmContext.h" - #include "WasmOperations.h" +@@ -41,6 +41,7 @@ + #include "WasmThunks.h" #include "WasmToJS.h" + #include "WebAssemblyFunctionBase.h" +#include "JITOpaqueByproducts.h" namespace JSC { Index: patches/patch-Source_ThirdParty_ANGLE_src_common_system_utils_linux_cpp =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_ThirdParty_ANGLE_src_common_system_utils_linux_cpp,v diff -u -p -r1.1 patch-Source_ThirdParty_ANGLE_src_common_system_utils_linux_cpp --- patches/patch-Source_ThirdParty_ANGLE_src_common_system_utils_linux_cpp 25 Mar 2024 22:36:18 -0000 1.1 +++ patches/patch-Source_ThirdParty_ANGLE_src_common_system_utils_linux_cpp 19 Mar 2025 17:30:03 -0000 @@ -1,7 +1,7 @@ Index: Source/ThirdParty/ANGLE/src/common/system_utils_linux.cpp --- Source/ThirdParty/ANGLE/src/common/system_utils_linux.cpp.orig +++ Source/ThirdParty/ANGLE/src/common/system_utils_linux.cpp -@@ -11,6 +11,9 @@ +@@ -13,6 +13,9 @@ #include <sys/stat.h> #include <sys/time.h> #include <sys/types.h> @@ -11,10 +11,10 @@ Index: Source/ThirdParty/ANGLE/src/commo #include <unistd.h> #include <array> -@@ -56,6 +59,10 @@ void SetCurrentThreadName(const char *name) - { +@@ -59,6 +62,10 @@ void SetCurrentThreadName(const char *name) // There's a 15-character (16 including '\0') limit. If the name is too big (and ERANGE is - // returned), just ignore the name. + // returned), name will be ignored. + ASSERT(strlen(name) < 16); +#if defined(__OpenBSD__) + pthread_set_name_np(pthread_self(), name); +#else Index: patches/patch-Source_ThirdParty_ANGLE_src_libANGLE_renderer_gl_egl_DisplayEGL_cpp =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_ThirdParty_ANGLE_src_libANGLE_renderer_gl_egl_DisplayEGL_cpp,v diff -u -p -r1.1 patch-Source_ThirdParty_ANGLE_src_libANGLE_renderer_gl_egl_DisplayEGL_cpp --- patches/patch-Source_ThirdParty_ANGLE_src_libANGLE_renderer_gl_egl_DisplayEGL_cpp 11 Oct 2024 21:08:40 -0000 1.1 +++ patches/patch-Source_ThirdParty_ANGLE_src_libANGLE_renderer_gl_egl_DisplayEGL_cpp 19 Mar 2025 17:30:03 -0000 @@ -1,7 +1,7 @@ Index: Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/DisplayEGL.cpp --- Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/DisplayEGL.cpp.orig +++ Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/DisplayEGL.cpp -@@ -112,6 +112,8 @@ const char *DisplayEGL::getEGLPath() const +@@ -108,6 +108,8 @@ const char *DisplayEGL::getEGLPath() const # else return "/system/lib/libEGL.so"; # endif Index: patches/patch-Source_WTF_wtf_Compiler_h =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_WTF_wtf_Compiler_h,v diff -u -p -r1.3 patch-Source_WTF_wtf_Compiler_h --- patches/patch-Source_WTF_wtf_Compiler_h 22 Oct 2024 09:16:31 -0000 1.3 +++ patches/patch-Source_WTF_wtf_Compiler_h 19 Mar 2025 17:30:03 -0000 @@ -3,12 +3,12 @@ Disable musttail attribute, not supporte Index: Source/WTF/wtf/Compiler.h --- Source/WTF/wtf/Compiler.h.orig +++ Source/WTF/wtf/Compiler.h -@@ -290,7 +290,7 @@ +@@ -293,7 +293,7 @@ #if COMPILER(CLANG) #if __SIZEOF_POINTER__ == 8 #if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute) --#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__) -+#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__) && !defined(__mips__) +-#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__) && !defined(_WIN32) ++#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__) && !defined(_WIN32) && !defined(__mips__) #define MUST_TAIL_CALL [[clang::musttail]] - #endif + #define HAVE_MUST_TAIL_CALL 1 #endif Index: patches/patch-Source_WTF_wtf_InlineASM_h =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_WTF_wtf_InlineASM_h,v diff -u -p -r1.6 patch-Source_WTF_wtf_InlineASM_h --- patches/patch-Source_WTF_wtf_InlineASM_h 6 Oct 2024 15:14:45 -0000 1.6 +++ patches/patch-Source_WTF_wtf_InlineASM_h 19 Mar 2025 17:30:03 -0000 @@ -5,8 +5,8 @@ Index: Source/WTF/wtf/InlineASM.h #define THUMB_FUNC_PARAM(name) #endif --#if (OS(LINUX) || OS(FREEBSD) || OS(QNX)) && CPU(X86_64) -+#if (OS(LINUX) || OS(FREEBSD) || OS(OPENBSD) || OS(QNX)) && CPU(X86_64) +-#if (OS(LINUX) || OS(FREEBSD) || OS(HAIKU) || OS(QNX)) && CPU(X86_64) ++#if (OS(LINUX) || OS(FREEBSD) || OS(OPENBSD) || OS(HAIKU) || OS(QNX)) && CPU(X86_64) #define GLOBAL_REFERENCE(name) #name "@plt" #elif OS(LINUX) && CPU(X86) && defined(__PIC__) #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) "@plt" Index: patches/patch-Source_WTF_wtf_PageBlock_h =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_WTF_wtf_PageBlock_h,v diff -u -p -r1.7 patch-Source_WTF_wtf_PageBlock_h --- patches/patch-Source_WTF_wtf_PageBlock_h 17 Sep 2022 08:13:54 -0000 1.7 +++ patches/patch-Source_WTF_wtf_PageBlock_h 19 Mar 2025 17:30:03 -0000 @@ -1,7 +1,7 @@ Index: Source/WTF/wtf/PageBlock.h --- Source/WTF/wtf/PageBlock.h.orig +++ Source/WTF/wtf/PageBlock.h -@@ -55,6 +55,8 @@ constexpr size_t CeilingOnPageSize = 16 * KB; +@@ -57,6 +57,8 @@ constexpr size_t CeilingOnPageSize = 16 * KB; constexpr size_t CeilingOnPageSize = 64 * KB; #elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(RISCV64) constexpr size_t CeilingOnPageSize = 4 * KB; Index: patches/patch-Source_WTF_wtf_PlatformEnable_h =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_WTF_wtf_PlatformEnable_h,v diff -u -p -r1.12 patch-Source_WTF_wtf_PlatformEnable_h --- patches/patch-Source_WTF_wtf_PlatformEnable_h 6 Oct 2024 15:14:45 -0000 1.12 +++ patches/patch-Source_WTF_wtf_PlatformEnable_h 19 Mar 2025 17:30:03 -0000 @@ -3,12 +3,12 @@ https://bugs.webkit.org/show_bug.cgi?id= Index: Source/WTF/wtf/PlatformEnable.h --- Source/WTF/wtf/PlatformEnable.h.orig +++ Source/WTF/wtf/PlatformEnable.h -@@ -694,7 +694,7 @@ +@@ -696,7 +696,7 @@ #if !defined(ENABLE_DFG_JIT) && ENABLE(JIT) /* Enable the DFG JIT on X86 and X86_64. */ --#if CPU(X86_64) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(HURD) || OS(WINDOWS)) -+#if CPU(X86_64) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(OPENBSD) || OS(HURD) || OS(WINDOWS)) +-#if CPU(X86_64) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(HAIKU) || OS(HURD) || OS(WINDOWS)) ++#if CPU(X86_64) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(OPENBSD) || OS(HAIKU) || OS(HURD) || OS(WINDOWS)) #define ENABLE_DFG_JIT 1 #endif Index: patches/patch-Source_WTF_wtf_RawHex_h =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_WTF_wtf_RawHex_h,v diff -u -p -r1.1 patch-Source_WTF_wtf_RawHex_h --- patches/patch-Source_WTF_wtf_RawHex_h 17 Sep 2022 08:13:54 -0000 1.1 +++ patches/patch-Source_WTF_wtf_RawHex_h 19 Mar 2025 17:30:03 -0000 @@ -5,8 +5,8 @@ Index: Source/WTF/wtf/RawHex.h : RawHex(static_cast<uintptr_t>(value)) { } --#if CPU(ADDRESS64) || OS(DARWIN) -+#if CPU(ADDRESS64) || OS(DARWIN) || OS(OPENBSD) +-#if CPU(ADDRESS64) || OS(DARWIN) || OS(HAIKU) ++#if CPU(ADDRESS64) || OS(DARWIN) || OS(HAIKU) || OS(OPENBSD) // These causes build errors for CPU(ADDRESS32) on some ports because int32_t // is already handled by intptr_t, and uint32_t is handled by uintptr_t. explicit RawHex(int32_t value) Index: patches/patch-Source_WTF_wtf_dtoa_utils_h =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_WTF_wtf_dtoa_utils_h,v diff -u -p -r1.8 patch-Source_WTF_wtf_dtoa_utils_h --- patches/patch-Source_WTF_wtf_dtoa_utils_h 17 Sep 2023 12:50:35 -0000 1.8 +++ patches/patch-Source_WTF_wtf_dtoa_utils_h 19 Mar 2025 17:30:03 -0000 @@ -1,7 +1,7 @@ Index: Source/WTF/wtf/dtoa/utils.h --- Source/WTF/wtf/dtoa/utils.h.orig +++ Source/WTF/wtf/dtoa/utils.h -@@ -86,7 +86,7 @@ int main(int argc, char** argv) { +@@ -88,7 +88,7 @@ int main(int argc, char** argv) { defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ Index: patches/patch-Source_WTF_wtf_glib_FileSystemGlib_cpp =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_WTF_wtf_glib_FileSystemGlib_cpp,v diff -u -p -r1.1 patch-Source_WTF_wtf_glib_FileSystemGlib_cpp --- patches/patch-Source_WTF_wtf_glib_FileSystemGlib_cpp 6 Oct 2024 15:14:45 -0000 1.1 +++ patches/patch-Source_WTF_wtf_glib_FileSystemGlib_cpp 19 Mar 2025 17:30:03 -0000 @@ -1,7 +1,7 @@ Index: Source/WTF/wtf/glib/FileSystemGlib.cpp --- Source/WTF/wtf/glib/FileSystemGlib.cpp.orig +++ Source/WTF/wtf/glib/FileSystemGlib.cpp -@@ -73,6 +73,11 @@ CString currentExecutablePath() +@@ -75,6 +75,11 @@ CString currentExecutablePath() { return { }; } Index: patches/patch-Source_WTF_wtf_posix_FileSystemPOSIX_cpp =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_WTF_wtf_posix_FileSystemPOSIX_cpp,v diff -u -p -r1.2 patch-Source_WTF_wtf_posix_FileSystemPOSIX_cpp --- patches/patch-Source_WTF_wtf_posix_FileSystemPOSIX_cpp 6 Oct 2024 15:14:45 -0000 1.2 +++ patches/patch-Source_WTF_wtf_posix_FileSystemPOSIX_cpp 19 Mar 2025 17:30:03 -0000 @@ -1,7 +1,7 @@ Index: Source/WTF/wtf/posix/FileSystemPOSIX.cpp --- Source/WTF/wtf/posix/FileSystemPOSIX.cpp.orig +++ Source/WTF/wtf/posix/FileSystemPOSIX.cpp -@@ -201,7 +201,11 @@ std::optional<WallTime> fileCreationTime(const String& +@@ -203,7 +203,11 @@ std::optional<WallTime> fileCreationTime(const String& if (stat(fsRep.data(), &fileInfo) == -1) return std::nullopt; Index: patches/patch-Source_WebCore_CMakeLists_txt =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_WebCore_CMakeLists_txt,v diff -u -p -r1.4 patch-Source_WebCore_CMakeLists_txt --- patches/patch-Source_WebCore_CMakeLists_txt 6 Oct 2024 15:14:45 -0000 1.4 +++ patches/patch-Source_WebCore_CMakeLists_txt 19 Mar 2025 17:30:03 -0000 @@ -4,7 +4,7 @@ See patch-Source_WebCore_SourcesGTK_txt Index: Source/WebCore/CMakeLists.txt --- Source/WebCore/CMakeLists.txt.orig +++ Source/WebCore/CMakeLists.txt -@@ -1960,6 +1960,7 @@ set(WebCore_LIBRARIES +@@ -2024,6 +2024,7 @@ set(WebCore_LIBRARIES LibXml2::LibXml2 SQLite::SQLite3 ZLIB::ZLIB Index: patches/patch-Source_WebCore_page_NavigatorBase_cpp =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_WebCore_page_NavigatorBase_cpp,v diff -u -p -r1.4 patch-Source_WebCore_page_NavigatorBase_cpp --- patches/patch-Source_WebCore_page_NavigatorBase_cpp 6 Oct 2024 15:14:45 -0000 1.4 +++ patches/patch-Source_WebCore_page_NavigatorBase_cpp 19 Mar 2025 17:30:03 -0000 @@ -1,7 +1,7 @@ Index: Source/WebCore/page/NavigatorBase.cpp --- Source/WebCore/page/NavigatorBase.cpp.orig +++ Source/WebCore/page/NavigatorBase.cpp -@@ -41,7 +41,7 @@ +@@ -44,7 +44,7 @@ #include <wtf/text/MakeString.h> #include <wtf/text/WTFString.h> @@ -10,7 +10,7 @@ Index: Source/WebCore/page/NavigatorBase #include "sys/utsname.h" #include <wtf/StdLibExtras.h> #endif -@@ -89,7 +89,7 @@ String NavigatorBase::appVersion() const +@@ -94,7 +94,7 @@ String NavigatorBase::appVersion() const String NavigatorBase::platform() const { Index: patches/patch-Source_WebCore_page_Page_cpp =================================================================== RCS file: patches/patch-Source_WebCore_page_Page_cpp diff -N patches/patch-Source_WebCore_page_Page_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Source_WebCore_page_Page_cpp 19 Mar 2025 17:30:03 -0000 @@ -0,0 +1,14 @@ +Index: Source/WebCore/page/Page.cpp +--- Source/WebCore/page/Page.cpp.orig ++++ Source/WebCore/page/Page.cpp +@@ -539,8 +539,10 @@ Page::~Page() + if (RefPtr scrollingCoordinator = m_scrollingCoordinator) + scrollingCoordinator->pageDestroyed(); + ++#if ENABLE(RESOURCE_USAGE) + if (RefPtr resourceUsageOverlay = m_resourceUsageOverlay) + resourceUsageOverlay->detachFromPage(); ++#endif + + checkedBackForward()->close(); + if (!isUtilityPage()) Index: patches/patch-Source_WebCore_platform_network_DNS_h =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_WebCore_platform_network_DNS_h,v diff -u -p -r1.4 patch-Source_WebCore_platform_network_DNS_h --- patches/patch-Source_WebCore_platform_network_DNS_h 7 Apr 2023 14:49:49 -0000 1.4 +++ patches/patch-Source_WebCore_platform_network_DNS_h 19 Mar 2025 17:30:03 -0000 @@ -1,7 +1,7 @@ Index: Source/WebCore/platform/network/DNS.h --- Source/WebCore/platform/network/DNS.h.orig +++ Source/WebCore/platform/network/DNS.h -@@ -35,6 +35,7 @@ +@@ -36,6 +36,7 @@ #include <ws2tcpip.h> #else #include <netinet/in.h> Index: patches/patch-Source_WebCore_rendering_RenderLayerBacking_h =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_WebCore_rendering_RenderLayerBacking_h,v diff -u -p -r1.4 patch-Source_WebCore_rendering_RenderLayerBacking_h --- patches/patch-Source_WebCore_rendering_RenderLayerBacking_h 25 Mar 2024 22:36:18 -0000 1.4 +++ patches/patch-Source_WebCore_rendering_RenderLayerBacking_h 19 Mar 2025 17:30:03 -0000 @@ -1,8 +1,8 @@ Index: Source/WebCore/rendering/RenderLayerBacking.h --- Source/WebCore/rendering/RenderLayerBacking.h.orig +++ Source/WebCore/rendering/RenderLayerBacking.h -@@ -34,6 +34,12 @@ - #include "ScrollingCoordinator.h" +@@ -35,6 +35,12 @@ + #include <wtf/TZoneMalloc.h> #include <wtf/WeakListHashSet.h> +#if defined(_LP64) Index: patches/patch-Source_WebDriver_PlatformGTK_cmake =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_WebDriver_PlatformGTK_cmake,v diff -u -p -r1.2 patch-Source_WebDriver_PlatformGTK_cmake --- patches/patch-Source_WebDriver_PlatformGTK_cmake 11 Mar 2022 20:11:07 -0000 1.2 +++ patches/patch-Source_WebDriver_PlatformGTK_cmake 19 Mar 2025 17:30:03 -0000 @@ -9,7 +9,7 @@ Index: Source/WebDriver/PlatformGTK.cmak ) list(APPEND WebDriver_SOURCES -@@ -18,4 +19,5 @@ list(APPEND WebDriver_SOURCES +@@ -24,4 +25,5 @@ endif () list(APPEND WebDriver_LIBRARIES ${LIBSOUP_LIBRARIES} Index: patches/patch-Source_WebKit_UIProcess_Launcher_glib_ProcessLauncherGLib_cpp =================================================================== RCS file: patches/patch-Source_WebKit_UIProcess_Launcher_glib_ProcessLauncherGLib_cpp diff -N patches/patch-Source_WebKit_UIProcess_Launcher_glib_ProcessLauncherGLib_cpp --- patches/patch-Source_WebKit_UIProcess_Launcher_glib_ProcessLauncherGLib_cpp 6 Oct 2024 15:14:45 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ -Index: Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp ---- Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp.orig -+++ Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp -@@ -160,7 +160,11 @@ void ProcessLauncher::launchProcess() - } - - realExecutablePath = FileSystem::fileSystemRepresentation(executablePath); -+#if OS(LINUX) - unsigned nargs = 5; // size of the argv array for g_spawn_async() -+#else -+ unsigned nargs = 4; // size of the argv array for g_spawn_async() -+#endif - - #if ENABLE(DEVELOPER_MODE) - Vector<CString> prefixArgs; -@@ -187,7 +191,9 @@ void ProcessLauncher::launchProcess() - argv[i++] = const_cast<char*>(realExecutablePath.data()); - argv[i++] = processIdentifier.get(); - argv[i++] = webkitSocket.get(); -+#if OS(LINUX) - argv[i++] = pidSocketString.get(); -+#endif - #if ENABLE(DEVELOPER_MODE) - if (configureJSCForTesting) - argv[i++] = const_cast<char*>("--configure-jsc-for-testing"); Index: patches/patch-Source_WebKit_UIProcess_glib_WebProcessPoolGLib_cpp =================================================================== RCS file: patches/patch-Source_WebKit_UIProcess_glib_WebProcessPoolGLib_cpp diff -N patches/patch-Source_WebKit_UIProcess_glib_WebProcessPoolGLib_cpp --- patches/patch-Source_WebKit_UIProcess_glib_WebProcessPoolGLib_cpp 22 Oct 2024 09:16:31 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -This file only '#include "valgrind.h"' for OS(LINUX) and -RUNNING_ON_VALGRIND will be left undefined. - -Index: Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp ---- Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp.orig -+++ Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp -@@ -207,7 +207,7 @@ void WebProcessPool::setSandboxEnabled(bool enabled) - return; - } - --#if !USE(SYSTEM_MALLOC) -+#if !USE(SYSTEM_MALLOC) && OS(LINUX) - if (RUNNING_ON_VALGRIND) - return; - #endif Index: patches/patch-Source_WebKit_UIProcess_gtk_AcceleratedBackingStoreDMABuf_cpp =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_WebKit_UIProcess_gtk_AcceleratedBackingStoreDMABuf_cpp,v diff -u -p -r1.2 patch-Source_WebKit_UIProcess_gtk_AcceleratedBackingStoreDMABuf_cpp --- patches/patch-Source_WebKit_UIProcess_gtk_AcceleratedBackingStoreDMABuf_cpp 8 Feb 2025 13:05:24 -0000 1.2 +++ patches/patch-Source_WebKit_UIProcess_gtk_AcceleratedBackingStoreDMABuf_cpp 19 Mar 2025 17:30:03 -0000 @@ -3,8 +3,8 @@ No dma-buf on OpenBSD. Index: Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp --- Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp.orig +++ Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp -@@ -72,7 +72,11 @@ OptionSet<DMABufRendererBufferMode> AcceleratedBacking - static OptionSet<DMABufRendererBufferMode> mode; +@@ -82,7 +82,11 @@ OptionSet<RendererBufferTransportMode> AcceleratedBack + static OptionSet<RendererBufferTransportMode> mode; static std::once_flag onceFlag; std::call_once(onceFlag, [] { +#if defined(__OpenBSD__) Index: patches/patch-Source_bmalloc_bmalloc_EligibilityResultInlines_h =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_bmalloc_bmalloc_EligibilityResultInlines_h,v diff -u -p -r1.1 patch-Source_bmalloc_bmalloc_EligibilityResultInlines_h --- patches/patch-Source_bmalloc_bmalloc_EligibilityResultInlines_h 6 Oct 2024 15:14:45 -0000 1.1 +++ patches/patch-Source_bmalloc_bmalloc_EligibilityResultInlines_h 19 Mar 2025 17:30:03 -0000 @@ -9,7 +9,7 @@ In file included from /usr/ports/pobj/we Index: Source/bmalloc/bmalloc/EligibilityResultInlines.h --- Source/bmalloc/bmalloc/EligibilityResultInlines.h.orig +++ Source/bmalloc/bmalloc/EligibilityResultInlines.h -@@ -39,7 +39,7 @@ EligibilityResult<Config>::EligibilityResult(Eligibili +@@ -41,7 +41,7 @@ EligibilityResult<Config>::EligibilityResult(Eligibili template<typename Config> EligibilityResult<Config>::EligibilityResult(IsoPage<Config>* page) Index: patches/patch-Source_bmalloc_bmalloc_EligibilityResult_h =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_bmalloc_bmalloc_EligibilityResult_h,v diff -u -p -r1.1 patch-Source_bmalloc_bmalloc_EligibilityResult_h --- patches/patch-Source_bmalloc_bmalloc_EligibilityResult_h 6 Oct 2024 15:14:45 -0000 1.1 +++ patches/patch-Source_bmalloc_bmalloc_EligibilityResult_h 19 Mar 2025 17:30:03 -0000 @@ -9,7 +9,7 @@ In file included from /usr/ports/pobj/we Index: Source/bmalloc/bmalloc/EligibilityResult.h --- Source/bmalloc/bmalloc/EligibilityResult.h.orig +++ Source/bmalloc/bmalloc/EligibilityResult.h -@@ -32,7 +32,7 @@ +@@ -39,7 +39,7 @@ namespace bmalloc { enum class EligibilityKind { @@ -18,7 +18,7 @@ Index: Source/bmalloc/bmalloc/Eligibilit Full, OutOfMemory }; -@@ -44,7 +44,7 @@ struct EligibilityResult { +@@ -51,7 +51,7 @@ struct EligibilityResult { EligibilityResult(EligibilityKind); EligibilityResult(IsoPage<Config>*); Index: patches/patch-Source_bmalloc_bmalloc_IsoAllocatorInlines_h =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_bmalloc_bmalloc_IsoAllocatorInlines_h,v diff -u -p -r1.1 patch-Source_bmalloc_bmalloc_IsoAllocatorInlines_h --- patches/patch-Source_bmalloc_bmalloc_IsoAllocatorInlines_h 6 Oct 2024 15:14:45 -0000 1.1 +++ patches/patch-Source_bmalloc_bmalloc_IsoAllocatorInlines_h 19 Mar 2025 17:30:03 -0000 @@ -9,7 +9,7 @@ In file included from /usr/ports/pobj/we Index: Source/bmalloc/bmalloc/IsoAllocatorInlines.h --- Source/bmalloc/bmalloc/IsoAllocatorInlines.h.orig +++ Source/bmalloc/bmalloc/IsoAllocatorInlines.h -@@ -76,7 +76,7 @@ BNO_INLINE void* IsoAllocator<Config>::allocateSlow(Is +@@ -78,7 +78,7 @@ BNO_INLINE void* IsoAllocator<Config>::allocateSlow(Is BASSERT(allocationMode == AllocationMode::Fast); EligibilityResult<Config> result = heap.takeFirstEligible(locker); Index: patches/patch-Source_cmake_OptionsCommon_cmake =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_cmake_OptionsCommon_cmake,v diff -u -p -r1.24 patch-Source_cmake_OptionsCommon_cmake --- patches/patch-Source_cmake_OptionsCommon_cmake 6 Oct 2024 15:14:45 -0000 1.24 +++ patches/patch-Source_cmake_OptionsCommon_cmake 19 Mar 2025 17:30:03 -0000 @@ -4,7 +4,7 @@ build with an older webkitgtk4 package i Index: Source/cmake/OptionsCommon.cmake --- Source/cmake/OptionsCommon.cmake.orig +++ Source/cmake/OptionsCommon.cmake -@@ -234,6 +234,9 @@ elseif (NOT ENABLE_ASSERTS) +@@ -282,6 +282,9 @@ elseif (NOT ENABLE_ASSERTS) WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-DASSERT_ENABLED=0) endif () Index: patches/patch-Source_cmake_WebKitCompilerFlags_cmake =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_cmake_WebKitCompilerFlags_cmake,v diff -u -p -r1.16 patch-Source_cmake_WebKitCompilerFlags_cmake --- patches/patch-Source_cmake_WebKitCompilerFlags_cmake 6 Oct 2024 15:14:45 -0000 1.16 +++ patches/patch-Source_cmake_WebKitCompilerFlags_cmake 19 Mar 2025 17:30:03 -0000 @@ -1,7 +1,7 @@ Index: Source/cmake/WebKitCompilerFlags.cmake --- Source/cmake/WebKitCompilerFlags.cmake.orig +++ Source/cmake/WebKitCompilerFlags.cmake -@@ -317,9 +317,9 @@ if (NOT MSVC) +@@ -323,9 +323,9 @@ if (NOT MSVC) string(REGEX MATCHALL "-fsanitize=[^ ]*" ENABLED_COMPILER_SANITIZERS ${CMAKE_CXX_FLAGS}) endif () Index: patches/patch-Source_cmake_WebKitFeatures_cmake =================================================================== RCS file: /cvs/ports/www/webkitgtk4/patches/patch-Source_cmake_WebKitFeatures_cmake,v diff -u -p -r1.17 patch-Source_cmake_WebKitFeatures_cmake --- patches/patch-Source_cmake_WebKitFeatures_cmake 6 Oct 2024 15:14:45 -0000 1.17 +++ patches/patch-Source_cmake_WebKitFeatures_cmake 19 Mar 2025 17:30:03 -0000 @@ -1,7 +1,7 @@ Index: Source/cmake/WebKitFeatures.cmake --- Source/cmake/WebKitFeatures.cmake.orig +++ Source/cmake/WebKitFeatures.cmake -@@ -443,7 +443,7 @@ macro(CREATE_CONFIGURATION_HEADER) +@@ -434,7 +434,7 @@ macro(CREATE_CONFIGURATION_HEADER) endmacro() macro(WEBKIT_CHECK_HAVE_INCLUDE _variable _header) Index: pkg/PFRAG.no-webkitgtk60 =================================================================== RCS file: /cvs/ports/www/webkitgtk4/pkg/PFRAG.no-webkitgtk60,v diff -u -p -r1.5 PFRAG.no-webkitgtk60 --- pkg/PFRAG.no-webkitgtk60 6 Oct 2024 15:14:45 -0000 1.5 +++ pkg/PFRAG.no-webkitgtk60 19 Mar 2025 17:30:03 -0000 @@ -141,6 +141,7 @@ lib/webkit2gtk-${API}/injected-bundle/ @so lib/webkit2gtk-${API}/injected-bundle/libwebkit2gtkinjectedbundle.so libexec/webkit2gtk-${API}/ @bin libexec/webkit2gtk-${API}/MiniBrowser +@bin libexec/webkit2gtk-${API}/WebKitGPUProcess @bin libexec/webkit2gtk-${API}/WebKitNetworkProcess @bin libexec/webkit2gtk-${API}/WebKitWebProcess @bin libexec/webkit2gtk-${API}/jsc @@ -276,6 +277,10 @@ share/doc/webkit2gtk-${API}/ctor.UserSty share/doc/webkit2gtk-${API}/ctor.WebContext.new.html share/doc/webkit2gtk-${API}/ctor.WebContext.new_ephemeral.html share/doc/webkit2gtk-${API}/ctor.WebContext.new_with_website_data_manager.html +share/doc/webkit2gtk-${API}/ctor.WebExtensionMatchPattern.new_all_hosts_and_schemes.html +share/doc/webkit2gtk-${API}/ctor.WebExtensionMatchPattern.new_all_urls.html +share/doc/webkit2gtk-${API}/ctor.WebExtensionMatchPattern.new_with_scheme.html +share/doc/webkit2gtk-${API}/ctor.WebExtensionMatchPattern.new_with_string.html share/doc/webkit2gtk-${API}/ctor.WebView.new.html share/doc/webkit2gtk-${API}/ctor.WebView.new_with_context.html share/doc/webkit2gtk-${API}/ctor.WebView.new_with_related_view.html @@ -315,6 +320,7 @@ share/doc/webkit2gtk-${API}/enum.UserScr share/doc/webkit2gtk-${API}/enum.UserStyleLevel.html share/doc/webkit2gtk-${API}/enum.WebExtensionMode.html share/doc/webkit2gtk-${API}/enum.WebProcessTerminationReason.html +share/doc/webkit2gtk-${API}/environment-variables.html share/doc/webkit2gtk-${API}/error.DownloadError.html share/doc/webkit2gtk-${API}/error.FaviconDatabaseError.html share/doc/webkit2gtk-${API}/error.JavascriptError.html @@ -325,11 +331,13 @@ share/doc/webkit2gtk-${API}/error.PrintE share/doc/webkit2gtk-${API}/error.SnapshotError.html share/doc/webkit2gtk-${API}/error.UserContentFilterError.html share/doc/webkit2gtk-${API}/error.UserMessageError.html +share/doc/webkit2gtk-${API}/error.WebExtensionMatchPatternError.html share/doc/webkit2gtk-${API}/flags.EditorTypingAttributes.html share/doc/webkit2gtk-${API}/flags.FindOptions.html share/doc/webkit2gtk-${API}/flags.HitTestResultContext.html share/doc/webkit2gtk-${API}/flags.InputHints.html share/doc/webkit2gtk-${API}/flags.SnapshotOptions.html +share/doc/webkit2gtk-${API}/flags.WebExtensionMatchPatternOptions.html share/doc/webkit2gtk-${API}/flags.WebsiteDataTypes.html share/doc/webkit2gtk-${API}/fonts.css share/doc/webkit2gtk-${API}/func.CHECK_VERSION.html @@ -721,6 +729,7 @@ share/doc/webkit2gtk-${API}/method.Setti share/doc/webkit2gtk-${API}/method.Settings.get_sans_serif_font_family.html share/doc/webkit2gtk-${API}/method.Settings.get_serif_font_family.html share/doc/webkit2gtk-${API}/method.Settings.get_user_agent.html +share/doc/webkit2gtk-${API}/method.Settings.get_webrtc_udp_ports_range.html share/doc/webkit2gtk-${API}/method.Settings.get_zoom_text_only.html share/doc/webkit2gtk-${API}/method.Settings.set_allow_file_access_from_file_urls.html share/doc/webkit2gtk-${API}/method.Settings.set_allow_modal_dialogs.html @@ -785,6 +794,7 @@ share/doc/webkit2gtk-${API}/method.Setti share/doc/webkit2gtk-${API}/method.Settings.set_serif_font_family.html share/doc/webkit2gtk-${API}/method.Settings.set_user_agent.html share/doc/webkit2gtk-${API}/method.Settings.set_user_agent_with_application_details.html +share/doc/webkit2gtk-${API}/method.Settings.set_webrtc_udp_ports_range.html share/doc/webkit2gtk-${API}/method.Settings.set_zoom_text_only.html share/doc/webkit2gtk-${API}/method.URIRequest.get_http_headers.html share/doc/webkit2gtk-${API}/method.URIRequest.get_http_method.html @@ -889,6 +899,16 @@ share/doc/webkit2gtk-${API}/method.WebCo share/doc/webkit2gtk-${API}/method.WebContext.set_web_extensions_directory.html share/doc/webkit2gtk-${API}/method.WebContext.set_web_extensions_initialization_user_data.html share/doc/webkit2gtk-${API}/method.WebContext.set_web_process_count_limit.html +share/doc/webkit2gtk-${API}/method.WebExtensionMatchPattern.get_host.html +share/doc/webkit2gtk-${API}/method.WebExtensionMatchPattern.get_matches_all_hosts.html +share/doc/webkit2gtk-${API}/method.WebExtensionMatchPattern.get_matches_all_urls.html +share/doc/webkit2gtk-${API}/method.WebExtensionMatchPattern.get_path.html +share/doc/webkit2gtk-${API}/method.WebExtensionMatchPattern.get_scheme.html +share/doc/webkit2gtk-${API}/method.WebExtensionMatchPattern.get_string.html +share/doc/webkit2gtk-${API}/method.WebExtensionMatchPattern.matches_pattern.html +share/doc/webkit2gtk-${API}/method.WebExtensionMatchPattern.matches_url.html +share/doc/webkit2gtk-${API}/method.WebExtensionMatchPattern.ref.html +share/doc/webkit2gtk-${API}/method.WebExtensionMatchPattern.unref.html share/doc/webkit2gtk-${API}/method.WebInspector.attach.html share/doc/webkit2gtk-${API}/method.WebInspector.close.html share/doc/webkit2gtk-${API}/method.WebInspector.detach.html @@ -1038,6 +1058,7 @@ share/doc/webkit2gtk-${API}/method.Windo share/doc/webkit2gtk-${API}/method.WindowProperties.get_scrollbars_visible.html share/doc/webkit2gtk-${API}/method.WindowProperties.get_statusbar_visible.html share/doc/webkit2gtk-${API}/method.WindowProperties.get_toolbar_visible.html +share/doc/webkit2gtk-${API}/profiling.html share/doc/webkit2gtk-${API}/property.AutomationSession.id.html share/doc/webkit2gtk-${API}/property.ColorChooserRequest.rgba.html share/doc/webkit2gtk-${API}/property.Download.allow-overwrite.html @@ -1140,6 +1161,7 @@ share/doc/webkit2gtk-${API}/property.Set share/doc/webkit2gtk-${API}/property.Settings.sans-serif-font-family.html share/doc/webkit2gtk-${API}/property.Settings.serif-font-family.html share/doc/webkit2gtk-${API}/property.Settings.user-agent.html +share/doc/webkit2gtk-${API}/property.Settings.webrtc-udp-ports-range.html share/doc/webkit2gtk-${API}/property.Settings.zoom-text-only.html share/doc/webkit2gtk-${API}/property.URIRequest.uri.html share/doc/webkit2gtk-${API}/property.URIResponse.content-length.html @@ -1214,6 +1236,7 @@ share/doc/webkit2gtk-${API}/property.Win share/doc/webkit2gtk-${API}/property.WindowProperties.scrollbars-visible.html share/doc/webkit2gtk-${API}/property.WindowProperties.statusbar-visible.html share/doc/webkit2gtk-${API}/property.WindowProperties.toolbar-visible.html +share/doc/webkit2gtk-${API}/remote-inspector.html share/doc/webkit2gtk-${API}/search.js share/doc/webkit2gtk-${API}/signal.AuthenticationRequest.authenticated.html share/doc/webkit2gtk-${API}/signal.AuthenticationRequest.cancelled.html @@ -1315,6 +1338,7 @@ share/doc/webkit2gtk-${API}/struct.Secur share/doc/webkit2gtk-${API}/struct.UserContentFilter.html share/doc/webkit2gtk-${API}/struct.UserScript.html share/doc/webkit2gtk-${API}/struct.UserStyleSheet.html +share/doc/webkit2gtk-${API}/struct.WebExtensionMatchPattern.html share/doc/webkit2gtk-${API}/struct.WebViewSessionState.html share/doc/webkit2gtk-${API}/struct.WebsiteData.html share/doc/webkit2gtk-${API}/style.css @@ -1334,6 +1358,8 @@ share/doc/webkit2gtk-${API}/type_func.Sn share/doc/webkit2gtk-${API}/type_func.UserContentFilterError.quark.html share/doc/webkit2gtk-${API}/type_func.UserMessageError.quark.html share/doc/webkit2gtk-${API}/type_func.WebContext.get_default.html +share/doc/webkit2gtk-${API}/type_func.WebExtensionMatchPattern.register_custom_URL_scheme.html +share/doc/webkit2gtk-${API}/type_func.WebExtensionMatchPatternError.quark.html share/doc/webkit2gtk-${API}/type_func.WebsiteDataManager.set_memory_pressure_settings.html share/doc/webkit2gtk-${API}/vfunc.Download.decide_destination.html share/doc/webkit2gtk-${API}/vfunc.InputMethodContext.committed.html Index: pkg/PFRAG.webkitgtk60 =================================================================== RCS file: /cvs/ports/www/webkitgtk4/pkg/PFRAG.webkitgtk60,v diff -u -p -r1.6 PFRAG.webkitgtk60 --- pkg/PFRAG.webkitgtk60 6 Oct 2024 15:14:45 -0000 1.6 +++ pkg/PFRAG.webkitgtk60 19 Mar 2025 17:30:03 -0000 @@ -15,6 +15,7 @@ lib/webkitgtk-${API}/injected-bundle/ @so lib/webkitgtk-${API}/injected-bundle/libwebkitgtkinjectedbundle.so libexec/webkitgtk-${API}/ @bin libexec/webkitgtk-${API}/MiniBrowser +@bin libexec/webkitgtk-${API}/WebKitGPUProcess @bin libexec/webkitgtk-${API}/WebKitNetworkProcess @bin libexec/webkitgtk-${API}/WebKitWebProcess @bin libexec/webkitgtk-${API}/jsc @@ -146,6 +147,10 @@ share/doc/webkitgtk-${API}/ctor.UserScri share/doc/webkitgtk-${API}/ctor.UserStyleSheet.new.html share/doc/webkitgtk-${API}/ctor.UserStyleSheet.new_for_world.html share/doc/webkitgtk-${API}/ctor.WebContext.new.html +share/doc/webkitgtk-${API}/ctor.WebExtensionMatchPattern.new_all_hosts_and_schemes.html +share/doc/webkitgtk-${API}/ctor.WebExtensionMatchPattern.new_all_urls.html +share/doc/webkitgtk-${API}/ctor.WebExtensionMatchPattern.new_with_scheme.html +share/doc/webkitgtk-${API}/ctor.WebExtensionMatchPattern.new_with_string.html share/doc/webkitgtk-${API}/ctor.WebView.new.html share/doc/webkitgtk-${API}/ctor.WebViewSessionState.new.html share/doc/webkitgtk-${API}/ctor.WebsitePolicies.new.html @@ -178,6 +183,7 @@ share/doc/webkitgtk-${API}/enum.UserScri share/doc/webkitgtk-${API}/enum.UserStyleLevel.html share/doc/webkitgtk-${API}/enum.WebExtensionMode.html share/doc/webkitgtk-${API}/enum.WebProcessTerminationReason.html +share/doc/webkitgtk-${API}/environment-variables.html share/doc/webkitgtk-${API}/error.DownloadError.html share/doc/webkitgtk-${API}/error.FaviconDatabaseError.html share/doc/webkitgtk-${API}/error.JavascriptError.html @@ -188,11 +194,13 @@ share/doc/webkitgtk-${API}/error.PrintEr share/doc/webkitgtk-${API}/error.SnapshotError.html share/doc/webkitgtk-${API}/error.UserContentFilterError.html share/doc/webkitgtk-${API}/error.UserMessageError.html +share/doc/webkitgtk-${API}/error.WebExtensionMatchPatternError.html share/doc/webkitgtk-${API}/flags.EditorTypingAttributes.html share/doc/webkitgtk-${API}/flags.FindOptions.html share/doc/webkitgtk-${API}/flags.HitTestResultContext.html share/doc/webkitgtk-${API}/flags.InputHints.html share/doc/webkitgtk-${API}/flags.SnapshotOptions.html +share/doc/webkitgtk-${API}/flags.WebExtensionMatchPatternOptions.html share/doc/webkitgtk-${API}/flags.WebsiteDataTypes.html share/doc/webkitgtk-${API}/fonts.css share/doc/webkitgtk-${API}/func.CHECK_VERSION.html @@ -559,6 +567,7 @@ share/doc/webkitgtk-${API}/method.Settin share/doc/webkitgtk-${API}/method.Settings.get_sans_serif_font_family.html share/doc/webkitgtk-${API}/method.Settings.get_serif_font_family.html share/doc/webkitgtk-${API}/method.Settings.get_user_agent.html +share/doc/webkitgtk-${API}/method.Settings.get_webrtc_udp_ports_range.html share/doc/webkitgtk-${API}/method.Settings.get_zoom_text_only.html share/doc/webkitgtk-${API}/method.Settings.set_allow_file_access_from_file_urls.html share/doc/webkitgtk-${API}/method.Settings.set_allow_modal_dialogs.html @@ -617,6 +626,7 @@ share/doc/webkitgtk-${API}/method.Settin share/doc/webkitgtk-${API}/method.Settings.set_serif_font_family.html share/doc/webkitgtk-${API}/method.Settings.set_user_agent.html share/doc/webkitgtk-${API}/method.Settings.set_user_agent_with_application_details.html +share/doc/webkitgtk-${API}/method.Settings.set_webrtc_udp_ports_range.html share/doc/webkitgtk-${API}/method.Settings.set_zoom_text_only.html share/doc/webkitgtk-${API}/method.URIRequest.get_http_headers.html share/doc/webkitgtk-${API}/method.URIRequest.get_http_method.html @@ -695,6 +705,16 @@ share/doc/webkitgtk-${API}/method.WebCon share/doc/webkitgtk-${API}/method.WebContext.set_spell_checking_languages.html share/doc/webkitgtk-${API}/method.WebContext.set_web_process_extensions_directory.html share/doc/webkitgtk-${API}/method.WebContext.set_web_process_extensions_initialization_user_data.html +share/doc/webkitgtk-${API}/method.WebExtensionMatchPattern.get_host.html +share/doc/webkitgtk-${API}/method.WebExtensionMatchPattern.get_matches_all_hosts.html +share/doc/webkitgtk-${API}/method.WebExtensionMatchPattern.get_matches_all_urls.html +share/doc/webkitgtk-${API}/method.WebExtensionMatchPattern.get_path.html +share/doc/webkitgtk-${API}/method.WebExtensionMatchPattern.get_scheme.html +share/doc/webkitgtk-${API}/method.WebExtensionMatchPattern.get_string.html +share/doc/webkitgtk-${API}/method.WebExtensionMatchPattern.matches_pattern.html +share/doc/webkitgtk-${API}/method.WebExtensionMatchPattern.matches_url.html +share/doc/webkitgtk-${API}/method.WebExtensionMatchPattern.ref.html +share/doc/webkitgtk-${API}/method.WebExtensionMatchPattern.unref.html share/doc/webkitgtk-${API}/method.WebInspector.attach.html share/doc/webkitgtk-${API}/method.WebInspector.close.html share/doc/webkitgtk-${API}/method.WebInspector.detach.html @@ -822,6 +842,8 @@ share/doc/webkitgtk-${API}/method.Window share/doc/webkitgtk-${API}/method.WindowProperties.get_statusbar_visible.html share/doc/webkitgtk-${API}/method.WindowProperties.get_toolbar_visible.html share/doc/webkitgtk-${API}/migrating-to-webkitgtk-${API}.html +share/doc/webkitgtk-${API}/overview.html +share/doc/webkitgtk-${API}/profiling.html share/doc/webkitgtk-${API}/property.AutomationSession.id.html share/doc/webkitgtk-${API}/property.ColorChooserRequest.rgba.html share/doc/webkitgtk-${API}/property.Download.allow-overwrite.html @@ -914,6 +936,7 @@ share/doc/webkitgtk-${API}/property.Sett share/doc/webkitgtk-${API}/property.Settings.sans-serif-font-family.html share/doc/webkitgtk-${API}/property.Settings.serif-font-family.html share/doc/webkitgtk-${API}/property.Settings.user-agent.html +share/doc/webkitgtk-${API}/property.Settings.webrtc-udp-ports-range.html share/doc/webkitgtk-${API}/property.Settings.zoom-text-only.html share/doc/webkitgtk-${API}/property.URIRequest.uri.html share/doc/webkitgtk-${API}/property.URIResponse.content-length.html @@ -975,6 +998,7 @@ share/doc/webkitgtk-${API}/property.Wind share/doc/webkitgtk-${API}/property.WindowProperties.scrollbars-visible.html share/doc/webkitgtk-${API}/property.WindowProperties.statusbar-visible.html share/doc/webkitgtk-${API}/property.WindowProperties.toolbar-visible.html +share/doc/webkitgtk-${API}/remote-inspector.html share/doc/webkitgtk-${API}/search.js share/doc/webkitgtk-${API}/signal.AuthenticationRequest.authenticated.html share/doc/webkitgtk-${API}/signal.AuthenticationRequest.cancelled.html @@ -1069,6 +1093,7 @@ share/doc/webkitgtk-${API}/struct.Securi share/doc/webkitgtk-${API}/struct.UserContentFilter.html share/doc/webkitgtk-${API}/struct.UserScript.html share/doc/webkitgtk-${API}/struct.UserStyleSheet.html +share/doc/webkitgtk-${API}/struct.WebExtensionMatchPattern.html share/doc/webkitgtk-${API}/struct.WebViewSessionState.html share/doc/webkitgtk-${API}/struct.WebsiteData.html share/doc/webkitgtk-${API}/style.css @@ -1090,6 +1115,8 @@ share/doc/webkitgtk-${API}/type_func.Sna share/doc/webkitgtk-${API}/type_func.UserContentFilterError.quark.html share/doc/webkitgtk-${API}/type_func.UserMessageError.quark.html share/doc/webkitgtk-${API}/type_func.WebContext.get_default.html +share/doc/webkitgtk-${API}/type_func.WebExtensionMatchPattern.register_custom_URL_scheme.html +share/doc/webkitgtk-${API}/type_func.WebExtensionMatchPatternError.quark.html share/doc/webkitgtk-${API}/vfunc.InputMethodContext.committed.html share/doc/webkitgtk-${API}/vfunc.InputMethodContext.delete_surrounding.html share/doc/webkitgtk-${API}/vfunc.InputMethodContext.filter_key_event.html Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/webkitgtk4/pkg/PLIST,v diff -u -p -r1.34 PLIST --- pkg/PLIST 15 Aug 2024 10:23:51 -0000 1.34 +++ pkg/PLIST 19 Mar 2025 17:30:03 -0000 @@ -78,6 +78,7 @@ include/webkitgtk-${API}/webkit/WebKitUs include/webkitgtk-${API}/webkit/WebKitVersion.h include/webkitgtk-${API}/webkit/WebKitWebContext.h include/webkitgtk-${API}/webkit/WebKitWebEditor.h +include/webkitgtk-${API}/webkit/WebKitWebExtensionMatchPattern.h include/webkitgtk-${API}/webkit/WebKitWebFormManager.h include/webkitgtk-${API}/webkit/WebKitWebHitTestResult.h include/webkitgtk-${API}/webkit/WebKitWebInspector.h @@ -133,6 +134,7 @@ share/doc/javascriptcoregtk-${API}/callb share/doc/javascriptcoregtk-${API}/callback.ClassHasPropertyFunction.html share/doc/javascriptcoregtk-${API}/callback.ClassSetPropertyFunction.html share/doc/javascriptcoregtk-${API}/callback.ExceptionHandler.html +share/doc/javascriptcoregtk-${API}/callback.Executor.html share/doc/javascriptcoregtk-${API}/callback.OptionsFunc.html share/doc/javascriptcoregtk-${API}/class.Class.html share/doc/javascriptcoregtk-${API}/class.Context.html @@ -168,6 +170,7 @@ share/doc/javascriptcoregtk-${API}/ctor. share/doc/javascriptcoregtk-${API}/ctor.Value.new_null.html share/doc/javascriptcoregtk-${API}/ctor.Value.new_number.html share/doc/javascriptcoregtk-${API}/ctor.Value.new_object.html +share/doc/javascriptcoregtk-${API}/ctor.Value.new_promise.html share/doc/javascriptcoregtk-${API}/ctor.Value.new_string.html share/doc/javascriptcoregtk-${API}/ctor.Value.new_string_from_bytes.html share/doc/javascriptcoregtk-${API}/ctor.Value.new_typed_array.html -- Antoine