webkit-gtk60: update to 2.52.4

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: webkit-gtk60: update to 2.52.4
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Thu, 4 Jun 2026 22:51:19 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Jun 5 00:51:00 2026 +0200
Changeset:	a2fd22fe12a06afb404469e59a097e7fbfc3ed7f

Modified Files:
	webkit-gtk60/Makefile
	webkit-gtk60/PLIST
	webkit-gtk60/distinfo
	webkit-gtk60/patches/patch-Source_WebCore_platform_graphics_x11_XErrorTrapper.h
Added Files:
	webkit-gtk60/patches/patch-Source_JavaScriptCore_CMakeLists.txt
Removed Files:
	webkit-gtk60/patches/patch-CMakeLists.txt
	webkit-gtk60/patches/patch-Source_WTF_wtf_glib_FileSystemGlib.cpp
	webkit-gtk60/patches/patch-Tools_PlatformGTK.cmake

Log Message:
webkit-gtk60: update to 2.52.4

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a2fd22fe12a06afb404469e59a097e7fbfc3ed7f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 webkit-gtk60/Makefile                              |  2 +-
 webkit-gtk60/PLIST                                 |  4 +-
 webkit-gtk60/distinfo                              | 12 +++---
 webkit-gtk60/patches/patch-CMakeLists.txt          | 19 ---------
 .../patch-Source_JavaScriptCore_CMakeLists.txt     | 48 ++++++++++++++++++++++
 .../patch-Source_WTF_wtf_glib_FileSystemGlib.cpp   | 42 -------------------
 ...e_WebCore_platform_graphics_x11_XErrorTrapper.h | 11 +++--
 webkit-gtk60/patches/patch-Tools_PlatformGTK.cmake | 17 --------
 8 files changed, 61 insertions(+), 94 deletions(-)

diffs:
diff --git a/webkit-gtk60/Makefile b/webkit-gtk60/Makefile
index e9799b6a98..a8569f3257 100644
--- a/webkit-gtk60/Makefile
+++ b/webkit-gtk60/Makefile
@@ -3,7 +3,7 @@
 # Some environment variables that can help debugging this:
 # https://trac.webkit.org/wiki/EnvironmentVariables
 
-DISTNAME=	webkitgtk-2.52.3
+DISTNAME=	webkitgtk-2.52.4
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk60/}
 CATEGORIES=	www
 MASTER_SITES=	https://www.webkitgtk.org/releases/
diff --git a/webkit-gtk60/PLIST b/webkit-gtk60/PLIST
index 85f5ddf435..5eec0f8ae4 100644
--- a/webkit-gtk60/PLIST
+++ b/webkit-gtk60/PLIST
@@ -101,10 +101,10 @@ lib/girepository-1.0/WebKit-6.0.typelib
 lib/girepository-1.0/WebKitWebProcessExtension-6.0.typelib
 lib/libjavascriptcoregtk-6.0.${RUBY_DLEXT}
 lib/libjavascriptcoregtk-6.0.so.1
-lib/libjavascriptcoregtk-6.0.so.1.7.11
+lib/libjavascriptcoregtk-6.0.so.1.7.12
 lib/libwebkitgtk-6.0.${RUBY_DLEXT}
 lib/libwebkitgtk-6.0.so.4
-lib/libwebkitgtk-6.0.so.4.16.7
+lib/libwebkitgtk-6.0.so.4.16.8
 lib/pkgconfig/javascriptcoregtk-6.0.pc
 lib/pkgconfig/webkitgtk-6.0.pc
 lib/pkgconfig/webkitgtk-web-process-extension-6.0.pc
diff --git a/webkit-gtk60/distinfo b/webkit-gtk60/distinfo
index 493f5b77e1..dfd33bd960 100644
--- a/webkit-gtk60/distinfo
+++ b/webkit-gtk60/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-BLAKE2s (webkitgtk-2.52.3.tar.xz) = 85736abab7a2f7f35e41afe72a91aab865822407bd85d67e7bc4858930bc0953
-SHA512 (webkitgtk-2.52.3.tar.xz) = 8007688e4eb5b465a6f50e05e89858f970f7bbaed45844b8f97175de1fb24e41e6d88f4f6b6299d5ae2ad4e19483da371ac16257d787626da29de7551fbd2a3c
-Size (webkitgtk-2.52.3.tar.xz) = 65052268 bytes
-SHA1 (patch-CMakeLists.txt) = 63a133cb37da466c684958988dd63c354585f5d3
+BLAKE2s (webkitgtk-2.52.4.tar.xz) = 5ac7ff787488a717677553441dc74221efbad8f0b8dd23f221b2d6ba47ed8831
+SHA512 (webkitgtk-2.52.4.tar.xz) = 0500660199cc00477d4c89b513a4ac772593ea5c490d6ebc97c693761bacd024c80c75df7e826cd1a7c292206d4ab0da2b0d91d0a4790069e575fa58bba7be02
+Size (webkitgtk-2.52.4.tar.xz) = 65093228 bytes
+SHA1 (patch-Source_JavaScriptCore_CMakeLists.txt) = 488fde5936817a926fd27df8263cb332ecbe04db
 SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 20d09e1c226cfff707659ffa35a2c2c3f1cdb617
 SHA1 (patch-Source_JavaScriptCore_parser_VariableEnvironment.h) = 817d8d635c5bcf1ee6d1fbd79ff789cd73d6420f
 SHA1 (patch-Source_JavaScriptCore_runtime_DefinePropertyAttributes.h) = 35e5e1080b6c24ffbe00e099b3293c626c7a207b
@@ -17,12 +17,11 @@ SHA1 (patch-Source_ThirdParty_skia_src_gpu_ganesh_GrAutoLocaleSetter.h) = 6a854b
 SHA1 (patch-Source_ThirdParty_skia_src_ports_SkMemory__malloc.cpp) = e277d988eeaacb7ec8b7f051342b77c5e8ac06a7
 SHA1 (patch-Source_WTF_wtf_InlineASM.h) = 35afdd5143f4a2df8a5554a0b0b35141a8784c6c
 SHA1 (patch-Source_WTF_wtf_PlatformEnable.h) = 905b2b4bf4b8c90cf91eb8ecf1d414013cc3bcbb
-SHA1 (patch-Source_WTF_wtf_glib_FileSystemGlib.cpp) = b404226996b90bf01e7d275204a6c7a4d2f73bae
 SHA1 (patch-Source_WebCore_loader_cache_CachedResource.h) = 5d82e4797336f3dc0af9f313ac80f3a72be9a22a
 SHA1 (patch-Source_WebCore_page_NavigatorBase.cpp) = 40a1c832e0df382e39cecb6c57527731e7c63c52
 SHA1 (patch-Source_WebCore_platform_graphics_gbm_MemoryMappedGPUBuffer.cpp) = 3e95b73709a3a39cd130dcaf4bf440e9c0195fa5
 SHA1 (patch-Source_WebCore_platform_graphics_skia_PlatformDisplaySkia.cpp) = 86f9d65402a6066a19f6385753d7c33e56cdfcd9
-SHA1 (patch-Source_WebCore_platform_graphics_x11_XErrorTrapper.h) = 6560e245d0f639f459464936ec588accd78590f2
+SHA1 (patch-Source_WebCore_platform_graphics_x11_XErrorTrapper.h) = 09292f96d3fe8e5cdacaff9e22dd14fe51508493
 SHA1 (patch-Source_WebCore_rendering_RenderBox.h) = 88bcb40bef0331b7d3c095ec9d0daab0dcaac6c4
 SHA1 (patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp) = ad3370c031b58778b069685a6bbdd038bc09b424
 SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = 365873c1dc93cf77d9b5eb28800d2b63f4e9da57
@@ -41,4 +40,3 @@ SHA1 (patch-Source_bmalloc_libpas_src_libpas_pas__platform.h) = d832e7a7a1bbf8e8
 SHA1 (patch-Source_bmalloc_libpas_src_libpas_pas__random.h) = 161cec597118672f8a7cc4575ff2318284ce13e7
 SHA1 (patch-Source_cmake_FindFlite.cmake) = 83925123ffbac5620865df0fcf2f8e8dfbd3aa57
 SHA1 (patch-Source_cmake_WebKitFeatures.cmake) = 6811f5c3f000900c0404be59a149657fa6b6443b
-SHA1 (patch-Tools_PlatformGTK.cmake) = 043870090fa5a4c7a9c6094323fb8a397600564b
diff --git a/webkit-gtk60/patches/patch-CMakeLists.txt b/webkit-gtk60/patches/patch-CMakeLists.txt
deleted file mode 100644
index 3389ab7fa7..0000000000
--- a/webkit-gtk60/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-The release tarball does not ship the PerformanceTests directory, so guard
-the add_subdirectory() call against its absence.
-https://github.com/WebKit/WebKit/pull/64697
-
---- CMakeLists.txt.orig	2025-03-05 09:38:04.000000000 +0000
-+++ CMakeLists.txt
-@@ -50,7 +50,9 @@ if (ENABLE_TOOLS)
- endif ()
- 
- if (DEVELOPER_MODE)
--    add_subdirectory(PerformanceTests)
-+    if (EXISTS "${CMAKE_SOURCE_DIR}/PerformanceTests")
-+        add_subdirectory(PerformanceTests)
-+    endif ()
- endif ()
- 
- # -----------------------------------------------------------------------------
diff --git a/webkit-gtk60/patches/patch-Source_JavaScriptCore_CMakeLists.txt b/webkit-gtk60/patches/patch-Source_JavaScriptCore_CMakeLists.txt
new file mode 100644
index 0000000000..d56eb26202
--- /dev/null
+++ b/webkit-gtk60/patches/patch-Source_JavaScriptCore_CMakeLists.txt
@@ -0,0 +1,48 @@
+$NetBSD$
+
+Fix:
+
+CMake Error at Source/cmake/WebKitMacros.cmake:156 (add_dependencies):
+  The dependency target "bmalloc_CopyHeaders" of target
+  "LLIntSettingsExtractor" does not exist.
+Call Stack (most recent call first):
+  Source/cmake/WebKitMacros.cmake:185 (_WEBKIT_TARGET_SETUP)
+  Source/cmake/WebKitMacros.cmake:406 (_WEBKIT_TARGET)
+  Source/JavaScriptCore/CMakeLists.txt:417 (WEBKIT_EXECUTABLE)
+
+
+CMake Error at Source/cmake/WebKitMacros.cmake:156 (add_dependencies):
+  The dependency target "bmalloc_CopyHeaders" of target
+  "LLIntOffsetsExtractor" does not exist.
+Call Stack (most recent call first):
+  Source/cmake/WebKitMacros.cmake:185 (_WEBKIT_TARGET_SETUP)
+  Source/cmake/WebKitMacros.cmake:406 (_WEBKIT_TARGET)
+  Source/JavaScriptCore/CMakeLists.txt:444 (WEBKIT_EXECUTABLE)
+
+
+--- Source/JavaScriptCore/CMakeLists.txt.orig	2026-06-04 22:18:48.692971314 +0000
++++ Source/JavaScriptCore/CMakeLists.txt
+@@ -412,8 +412,10 @@ set(LLIntSettingsExtractor_DEPENDENCIES
+     JavaScriptCore_CopyHeaders
+     JavaScriptCore_CopyPrivateHeaders
+     WTF_CopyHeaders
+-    bmalloc_CopyHeaders
+ )
++if (NOT USE_SYSTEM_MALLOC)
++    list(APPEND LLIntSettingsExtractor_DEPENDENCIES bmalloc_CopyHeaders)
++endif ()
+ WEBKIT_EXECUTABLE(LLIntSettingsExtractor)
+ 
+ # LLIntSettingsExtractor target needs to have a direct or indirect
+@@ -439,8 +441,10 @@ set(LLIntOffsetsExtractor_DEPENDENCIES
+     JavaScriptCore_CopyHeaders
+     JavaScriptCore_CopyPrivateHeaders
+     WTF_CopyHeaders
+-    bmalloc_CopyHeaders
+ )
++if (NOT USE_SYSTEM_MALLOC)
++    list(APPEND LLIntOffsetsExtractor_DEPENDENCIES bmalloc_CopyHeaders)
++endif ()
+ WEBKIT_EXECUTABLE(LLIntOffsetsExtractor)
+ 
+ # The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
diff --git a/webkit-gtk60/patches/patch-Source_WTF_wtf_glib_FileSystemGlib.cpp b/webkit-gtk60/patches/patch-Source_WTF_wtf_glib_FileSystemGlib.cpp
deleted file mode 100644
index 25e6cf46c7..0000000000
--- a/webkit-gtk60/patches/patch-Source_WTF_wtf_glib_FileSystemGlib.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD$
-
-The file name link has a different name in NetBSD's procfs than on Linux.
-Avoid providing zero-length paths.
-https://github.com/WebKit/WebKit/pull/64201
-
---- Source/WTF/wtf/glib/FileSystemGlib.cpp.orig	2026-04-02 11:17:43.701464400 +0000
-+++ Source/WTF/wtf/glib/FileSystemGlib.cpp
-@@ -65,7 +65,7 @@ CString currentExecutablePath()
- {
-     static char readLinkBuffer[PATH_MAX];
-     ssize_t result = readlink("/proc/self/exe", readLinkBuffer, PATH_MAX);
--    if (result == -1)
-+    if (result <= 0)
-         return { };
- WTF_ALLOW_UNSAFE_BUFFER_USAGE_BEGIN // Linux port
-     return CString(std::span { readLinkBuffer, static_cast<size_t>(result) });
-@@ -85,16 +85,21 @@ CString currentExecutablePath()
-     int selfFd = open("/proc/self/exefile", O_RDONLY);
-     ssize_t result = read(selfFd, readBuffer, sizeof(readBuffer));
-     close(selfFd);
--    if (result == -1)
-+    if (result <= 0)
-         return { };
-     return CString(unsafeMakeSpan(readBuffer, static_cast<size_t>(result)));
- }
- #elif OS(UNIX)
-+#if OS(NETBSD)
-+#define _PROC_CURPROC_PATH "/proc/curproc/exe"
-+#else
-+#define _PROC_CURPROC_PATH "/proc/curproc/file"
-+#endif
- CString currentExecutablePath()
- {
-     static char readLinkBuffer[PATH_MAX];
--    ssize_t result = readlink("/proc/curproc/file", readLinkBuffer, PATH_MAX);
--    if (result == -1)
-+    ssize_t result = readlink(_PROC_CURPROC_PATH, readLinkBuffer, PATH_MAX);
-+    if (result <= 0)
-         return { };
-     return CString(unsafeMakeSpan(readLinkBuffer, static_cast<size_t>(result)));
- }
diff --git a/webkit-gtk60/patches/patch-Source_WebCore_platform_graphics_x11_XErrorTrapper.h b/webkit-gtk60/patches/patch-Source_WebCore_platform_graphics_x11_XErrorTrapper.h
index 6878994742..cad334b826 100644
--- a/webkit-gtk60/patches/patch-Source_WebCore_platform_graphics_x11_XErrorTrapper.h
+++ b/webkit-gtk60/patches/patch-Source_WebCore_platform_graphics_x11_XErrorTrapper.h
@@ -13,9 +13,9 @@ across the codebase. Undefine Success since we don't currently need it.
 Additional ones in
 https://github.com/WebKit/WebKit/pull/64743
 
---- Source/WebCore/platform/graphics/x11/XErrorTrapper.h.orig	2026-05-11 20:03:47.552553397 +0000
+--- Source/WebCore/platform/graphics/x11/XErrorTrapper.h.orig	2026-05-17 18:13:35.817512800 +0000
 +++ Source/WebCore/platform/graphics/x11/XErrorTrapper.h
-@@ -27,6 +27,21 @@
+@@ -27,8 +27,20 @@
  
  #if PLATFORM(X11)
  #include <X11/Xlib.h>
@@ -28,12 +28,11 @@ https://github.com/WebKit/WebKit/pull/64743
 +#ifdef Below
 +#undef Below
 +#endif
-+#ifdef Success
-+#undef Success
+ #ifdef Success
+ #undef Success
 +#endif
 +#ifdef True
 +#undef True
-+#endif
+ #endif
  #include <wtf/Vector.h>
  
- namespace WebCore {
diff --git a/webkit-gtk60/patches/patch-Tools_PlatformGTK.cmake b/webkit-gtk60/patches/patch-Tools_PlatformGTK.cmake
deleted file mode 100644
index 60cda00f5d..0000000000
--- a/webkit-gtk60/patches/patch-Tools_PlatformGTK.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-The release tarball does not ship the flatpak integration directory used
-for developer builds.  Guard the add_subdirectory() against its absence.
-https://github.com/WebKit/WebKit/pull/64697
-
---- Tools/PlatformGTK.cmake.orig	2026-05-11 18:25:01.546362945 +0000
-+++ Tools/PlatformGTK.cmake
-@@ -1,5 +1,7 @@ if (DEVELOPER_MODE)
- if (DEVELOPER_MODE)
--    add_subdirectory(flatpak)
-+    if (EXISTS "${CMAKE_SOURCE_DIR}/flatpak")
-+        add_subdirectory(flatpak)
-+    endif ()
- endif ()
- 
- if (ENABLE_API_TESTS)
Prev by Date: whisper.cpp: Add reference to CVE-2026-10298
Next by Date: editors/fresh: Update to version 0.3.12
Previous by Thread: whisper.cpp: Add reference to CVE-2026-10298
Next by Thread: editors/fresh: Update to version 0.3.12
Indexes:
Home | Main Index | Thread Index | Old Index