CVS commit: pkgsrc/x11/qt5-qtwebkit

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Mon Oct 20 11:43:38 UTC 2025

Modified Files:
        pkgsrc/x11/qt5-qtwebkit: Makefile distinfo
        pkgsrc/x11/qt5-qtwebkit/patches: patch-Source_WTF_wtf_Platform.h

Log Message:
Unbreak x11/qt5-qtwebkit build

by applying a patch from
<https://github.com/qtwebkit/qtwebkit/pull/1107> to disable ICU C++
header-only APIs introduced in ICU 76.

At this point, the c++17 requirement is not just unnecessary, but
breaks the build unless removed.

Relevant to PR pkg/59028


To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 pkgsrc/x11/qt5-qtwebkit/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/x11/qt5-qtwebkit/distinfo
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h

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

Modified files:

Index: pkgsrc/x11/qt5-qtwebkit/Makefile
diff -u pkgsrc/x11/qt5-qtwebkit/Makefile:1.136 pkgsrc/x11/qt5-qtwebkit/Makefile:1.137
--- pkgsrc/x11/qt5-qtwebkit/Makefile:1.136      Wed Aug 20 11:35:14 2025
+++ pkgsrc/x11/qt5-qtwebkit/Makefile    Mon Oct 20 11:43:38 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.136 2025/08/20 11:35:14 wiz Exp $
+# $NetBSD: Makefile,v 1.137 2025/10/20 11:43:38 hauke Exp $
 
 QTWKVERSION=   5.212.0-alpha4
 DISTNAME=      qtwebkit-${QTWKVERSION}
 PKGNAME=       qt5-qtwebkit-${QTWKVERSION:S/-/./}
-PKGREVISION=   32
+PKGREVISION=   33
 CATEGORIES=    x11 www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=qtwebkit/}
 GITHUB_PROJECT=        qtwebkit
@@ -19,20 +19,16 @@ TOOL_DEPENDS+=      gperf-[0-9]*:../../devel/
 TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2
 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
 
-USE_CXX_FEATURES=      c++17
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            bison perl:build pkg-config
 CMAKE_INSTALL_PREFIX=  ${QTDIR}
 CMAKE_INSTALL_NAME_DIR=        ${QTDIR}/lib
 TEST_TARGET=           test
-FORCE_CXX_STD=         c++17
 
 # XXX Workaround for icu-76 whose header files require C++17 unless you
 # define U_HIDE_DRAFT_API.  pkg/59028: qt5-qtwebkit doesn't build
 CXXFLAGS+=             -DU_HIDE_DRAFT_API
 
-BROKEN=                "Does not support icu 77"
-
 CMAKE_CONFIGURE_ARGS+= -DPORT=Qt
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
 CMAKE_CONFIGURE_ARGS+= -DENABLE_API_TESTS=OFF

Index: pkgsrc/x11/qt5-qtwebkit/distinfo
diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.37 pkgsrc/x11/qt5-qtwebkit/distinfo:1.38
--- pkgsrc/x11/qt5-qtwebkit/distinfo:1.37       Wed May 21 16:47:21 2025
+++ pkgsrc/x11/qt5-qtwebkit/distinfo    Mon Oct 20 11:43:38 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2025/05/21 16:47:21 taca Exp $
+$NetBSD: distinfo,v 1.38 2025/10/20 11:43:38 hauke Exp $
 
 BLAKE2s (qtwebkit-5.212.0-alpha4.tar.xz) = 20858db08c7d297037d3ced34e441d4b657325c406b475e4e76dd367dc9c500c
 SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
@@ -21,7 +21,7 @@ SHA1 (patch-Source_ThirdParty_gtest_incl
 SHA1 (patch-Source_WTF_wtf_Assertions.cpp) = 15b8ac40e49cfec78d46de634fd6a1edde2d2a96
 SHA1 (patch-Source_WTF_wtf_InlineASM.h) = 7ffc086a21f645112ad10296571464a1e15b8b44
 SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 7dac41bf3e50944e49c3e3c29d482d2c3300665d
-SHA1 (patch-Source_WTF_wtf_Platform.h) = b1efac1a3c326033eb52b1eed456f84265b172f8
+SHA1 (patch-Source_WTF_wtf_Platform.h) = e3e71933e8aabab0753fde0867649b849b7bee1b
 SHA1 (patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp) = bfa570aa20e3508c77bbaebed051821a33f36209
 SHA1 (patch-Source_WebCore_css_makegrammar.pl) = 2f1977c925069243d76379ae6d065e850143b2e3
 SHA1 (patch-Source_WebCore_page_NavigatorBase.cpp) = e8972f4b703a9ff45ce313609d2540f89064b4ff

Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h:1.7 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h:1.8
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h:1.7 Fri Jan 24 11:54:37 2025
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h     Mon Oct 20 11:43:38 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.7 2025/01/24 11:54:37 wiz Exp $
+$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.8 2025/10/20 11:43:38 hauke Exp $
 
 * Use system's malloc for NetBSD, do not use fastmalloc from qt5,
   fix segfault of qtwebkit consumers
@@ -8,8 +8,9 @@ $NetBSD: patch-Source_WTF_wtf_Platform.h
 
 * Fix build with ICU 75.
   From: https://github.com/qtwebkit/qtwebkit/commit/756e1c8f23dc2720471298281c421c0076d02df8.patch
+  with addition from: https://github.com/qtwebkit/qtwebkit/pull/1107
 
---- Source/WTF/wtf/Platform.h.orig     2024-06-02 11:06:38.219855486 +0000
+--- Source/WTF/wtf/Platform.h.orig     2020-03-04 17:16:37.000000000 +0000
 +++ Source/WTF/wtf/Platform.h
 @@ -686,6 +686,12 @@
  #define USE_SYSTEM_MALLOC 1
@@ -35,13 +36,15 @@ $NetBSD: patch-Source_WTF_wtf_Platform.h
  #if !defined(ENABLE_DISASSEMBLER) && USE(UDIS86)
  #define ENABLE_DISASSEMBLER 1
  #endif
-@@ -1125,6 +1135,13 @@
+@@ -1125,6 +1135,15 @@
  #define ENABLE_PLATFORM_FONT_LOOKUP 1
  #endif
  
 +/* FIXME: This does not belong in Platform.h and should instead be included in another mechanism (compiler option, prefix header, config.h, etc) */
 +/* ICU configuration. Some of these match ICU defaults on some platforms, but we would like them consistently set everywhere we build WebKit. */
 +#define U_SHOW_CPLUSPLUS_API 0
++/* From <https://github.com/raspbian-packages/qtwebkit-opensource-src/commit/36c4b66e86c3a93a095ec55e239bedead8a56b50> */
++#define U_SHOW_CPLUSPLUS_HEADER_API 0
 +#ifdef __cplusplus
 +#define UCHAR_TYPE char16_t
 +#endif