CVS commit: pkgsrc/www/webkit-gtk

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jul 17 05:52:30 UTC 2026

Modified Files:
        pkgsrc/www/webkit-gtk: Makefile distinfo
Added Files:
        pkgsrc/www/webkit-gtk/patches: patch-Source_cmake_WebKitMacros.cmake

Log Message:
webkit-gtk: fix cmake syntax error

Broke build with cmake 4.4.

Bump PKGREVISION.

Clean up references to non-existent files while here.


To generate a diff of this commit:
cvs rdiff -u -r1.281 -r1.282 pkgsrc/www/webkit-gtk/Makefile
cvs rdiff -u -r1.181 -r1.182 pkgsrc/www/webkit-gtk/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_WebKitMacros.cmake

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.281 pkgsrc/www/webkit-gtk/Makefile:1.282
--- pkgsrc/www/webkit-gtk/Makefile:1.281        Thu Jun 11 07:17:49 2026
+++ pkgsrc/www/webkit-gtk/Makefile      Fri Jul 17 05:52:30 2026
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.281 2026/06/11 07:17:49 wiz Exp $
+# $NetBSD: Makefile,v 1.282 2026/07/17 05:52:30 wiz Exp $
 
 DISTNAME=      webkitgtk-2.36.8
-PKGREVISION=   2
+PKGREVISION=   30
 PKGNAME=       ${DISTNAME:S/webkitgtk/webkit-gtk/}
-PKGREVISION=   29
 CATEGORIES=    www
 MASTER_SITES=  https://www.webkitgtk.org/releases/
 EXTRACT_SUFX=  .tar.xz
@@ -76,7 +75,6 @@ REPLACE_PYTHON+=      Source/ThirdParty/ANGLE
 REPLACE_PYTHON+=       Source/ThirdParty/ANGLE/src/libANGLE/*.py
 REPLACE_PYTHON+=       Source/ThirdParty/gtest/scripts/*.py
 REPLACE_PYTHON+=       Source/ThirdParty/gtest/test/*.py
-REPLACE_PYTHON+=       Source/ThirdParty/gtest/xcode/Scripts/*.py
 REPLACE_PYTHON+=       Source/WebCore/css/*.py
 REPLACE_PYTHON+=       Source/WebCore/html/parser/create-html-entity-table
 REPLACE_PYTHON+=       Source/WebCore/platform/network/create-http-header-name-table
@@ -89,13 +87,11 @@ REPLACE_BASH+=              Source/ThirdParty/ANGLE/
 REPLACE_BASH+=         Source/ThirdParty/gtest/xcode/Samples/FrameworkSample/runtests.sh
 REPLACE_BASH+=         Source/ThirdParty/gtest/xcode/Scripts/runtests.sh
 REPLACE_BASH+=         Source/WebKit/Scripts/copy-webcontent-resources-to-private-headers.sh
-REPLACE_BASH+=         Source/WebKit/Scripts/generate-https-upgrade-database.sh
 REPLACE_BASH+=         Source/WebKit/Scripts/process-entitlements.sh
 REPLACE_BASH+=         Tools/gtk/install-dependencies
 
 REPLACE_RUBY+=         Source/JavaScriptCore/b3/air/*.rb
 REPLACE_RUBY+=         Source/JavaScriptCore/offlineasm/*.rb
-REPLACE_RUBY+=         Source/WebCore/Scripts/*.rb
 REPLACE_RUBY+=         Source/WebCore/domjit/*.rb
 REPLACE_RUBY+=         Source/WebInspectorUI/Scripts/*.rb
 REPLACE_RUBY+=         Source/WebKit/Scripts/*.rb

Index: pkgsrc/www/webkit-gtk/distinfo
diff -u pkgsrc/www/webkit-gtk/distinfo:1.181 pkgsrc/www/webkit-gtk/distinfo:1.182
--- pkgsrc/www/webkit-gtk/distinfo:1.181        Sat Oct 25 15:00:45 2025
+++ pkgsrc/www/webkit-gtk/distinfo      Fri Jul 17 05:52:30 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.181 2025/10/25 15:00:45 tsutsui Exp $
+$NetBSD: distinfo,v 1.182 2026/07/17 05:52:30 wiz Exp $
 
 BLAKE2s (webkitgtk-2.36.8.tar.xz) = 277ba5935bda3e3867083b4c736499d974b9c733dbd05bf574510857dde481a1
 SHA512 (webkitgtk-2.36.8.tar.xz) = 50576f13ea84c0634d174ccf0b70d0eb28752589b2b9ce7a82ffeee1b4b6c849a802f7ae83a3c5a74d0da2b7e3321876ead33e819d8006b8153376074cb57036
@@ -72,5 +72,6 @@ SHA1 (patch-Source_bmalloc_bmalloc_BPlat
 SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = 22c23689fa79c930145068ed7966844bbf92a6a9
 SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 83f0bfdb104e9e5c5c9afb155d399ae4c767c450
 SHA1 (patch-Source_cmake_WebKitCommon.cmake) = 73a0da491ef93d5cc25214e7733b54bbdacd487e
+SHA1 (patch-Source_cmake_WebKitMacros.cmake) = 541c7db5dd86cd2c8373d303e3fe2e78a0b8ed46
 SHA1 (patch-Tools_TestWebKitAPI_Scripts_check-xcfilelists.sh) = 6e8327bf46150806910b21b298767f313e1eb3ce
 SHA1 (patch-Tools_TestWebKitAPI_Scripts_generate-unified-sources.sh) = 06747f279263558f05bb01c8da9c994a357ce74a

Added files:

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_WebKitMacros.cmake
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_WebKitMacros.cmake:1.1
--- /dev/null   Fri Jul 17 05:52:30 2026
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_WebKitMacros.cmake Fri Jul 17 05:52:30 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_cmake_WebKitMacros.cmake,v 1.1 2026/07/17 05:52:30 wiz Exp $
+
+Fix cmake syntax.
+
+--- Source/cmake/WebKitMacros.cmake.orig       2026-07-17 05:18:50.633734793 +0000
++++ Source/cmake/WebKitMacros.cmake
+@@ -282,7 +282,7 @@ macro(_WEBKIT_EXECUTABLE_LINK_FRAMEWORK _target)
+         get_property(_linked_into GLOBAL PROPERTY ${framework}_LINKED_INTO)
+ 
+         # See if the executable is linking a framework that the specified framework is already linked into
+-        if ((NOT _linked_into) OR (${framework} STREQUAL ${_linked_into}) OR (NOT ${_linked_into} IN_LIST ${_target}_FRAMEWORKS))
++        if ((NOT _linked_into) OR (${framework} STREQUAL "${_linked_into}") OR (NOT "${_linked_into}" IN_LIST ${_target}_FRAMEWORKS))
+             list(APPEND ${_target}_PRIVATE_LIBRARIES WebKit::${framework})
+ 
+             # The WebKit:: alias targets do not propagate OBJECT libraries so the