webkit-gtk60: update patch after review comments

[Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Tue May 5 10:45:00 2026 +0200
Changeset:	86b151a1f215150339504e7b117f6aada9937a98

Modified Files:
	webkit-gtk60/Makefile
	webkit-gtk60/distinfo
	webkit-gtk60/patches/patch-Source_WTF_wtf_glib_FileSystemGlib.cpp

Log Message:
webkit-gtk60: update patch after review comments

Fix PKGCONFIG_OVERRIDE while here

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

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

diffstat:
 webkit-gtk60/Makefile                              |  7 +++--
 webkit-gtk60/distinfo                              |  2 +-
 .../patch-Source_WTF_wtf_glib_FileSystemGlib.cpp   | 35 ++++++++++++++--------
 3 files changed, 29 insertions(+), 15 deletions(-)

diffs:
diff --git a/webkit-gtk60/Makefile b/webkit-gtk60/Makefile
index 90d326e0e5..94da3e308b 100644
--- a/webkit-gtk60/Makefile
+++ b/webkit-gtk60/Makefile
@@ -83,9 +83,12 @@ CXXFLAGS+=		-DSTRUCTURE_HEAP_ADDRESS_SIZE_IN_MB=256
 # For backtrace
 LDFLAGS.NetBSD+=	-lexecinfo
 
+PKGCONFIG_OVERRIDE+=	Source/JavaScriptCore/javascriptcoreglib.pc.in
 PKGCONFIG_OVERRIDE+=	Source/JavaScriptCore/javascriptcoregtk.pc.in
-PKGCONFIG_OVERRIDE+=	Source/WebKit/gtk/webkit2gtk.pc.in
-PKGCONFIG_OVERRIDE+=	Source/WebKit/gtk/webkit2gtk-web-extension.pc.in
+PKGCONFIG_OVERRIDE+=	Source/WebKit/WPEPlatform/wpe-platform-uninstalled.pc.in
+PKGCONFIG_OVERRIDE+=	Source/WebKit/WPEPlatform/wpe-platform.pc.in
+PKGCONFIG_OVERRIDE+=	Source/WebKit/gtk/webkitgtk-web-process-extension.pc.in
+PKGCONFIG_OVERRIDE+=	Source/WebKit/gtk/webkitgtk.pc.in
 
 REPLACE_PERL+=		Source/JavaScriptCore/Scripts/*.pl
 REPLACE_PERL+=		Source/JavaScriptCore/create_hash_table
diff --git a/webkit-gtk60/distinfo b/webkit-gtk60/distinfo
index 60c0e2356e..85773bb1fd 100644
--- a/webkit-gtk60/distinfo
+++ b/webkit-gtk60/distinfo
@@ -16,7 +16,7 @@ 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) = b4e70cc5a81fa8628c82f7e22d0286ebd1a7f742
+SHA1 (patch-Source_WTF_wtf_glib_FileSystemGlib.cpp) = 83b11a9b4187da9a1a857827f3700601a067935e
 SHA1 (patch-Source_WebCore_css_values_CSSValueAggregates.h) = 708e2f7a48ff31c4a8ef50f87680452532a2f66c
 SHA1 (patch-Source_WebCore_editing_FontAttributes.h) = 7a768d0e467a4e36122beaa612e65f806452d011
 SHA1 (patch-Source_WebCore_editing_FrameSelection.h) = f23da5ffb29e900bd1dd517a6ba765d68edac273
diff --git a/webkit-gtk60/patches/patch-Source_WTF_wtf_glib_FileSystemGlib.cpp b/webkit-gtk60/patches/patch-Source_WTF_wtf_glib_FileSystemGlib.cpp
index fe9c432f0d..25e6cf46c7 100644
--- a/webkit-gtk60/patches/patch-Source_WTF_wtf_glib_FileSystemGlib.cpp
+++ b/webkit-gtk60/patches/patch-Source_WTF_wtf_glib_FileSystemGlib.cpp
@@ -4,27 +4,38 @@ 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-23 20:09:38.532658486 +0000
+--- Source/WTF/wtf/glib/FileSystemGlib.cpp.orig	2026-04-02 11:17:43.701464400 +0000
 +++ Source/WTF/wtf/glib/FileSystemGlib.cpp
-@@ -89,12 +89,21 @@ CString currentExecutablePath()
+@@ -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(NETBSD)
-+CString currentExecutablePath()
-+{
-+    static char readLinkBuffer[PATH_MAX];
-+    ssize_t result = readlink("/proc/curproc/exe", readLinkBuffer, PATH_MAX);
-+    if (result <= 0)
-+        return { };
-+    return CString(unsafeMakeSpan(readLinkBuffer, 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);
+-    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)));