CVS commit: pkgsrc/x11/qt5-qtwebkit

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Aug 17 10:58:39 UTC 2024

Modified Files:
        pkgsrc/x11/qt5-qtwebkit: distinfo
Added Files:
        pkgsrc/x11/qt5-qtwebkit/patches:
            patch-Source_ThirdParty_ANGLE_src_common_mathutil.h
            patch-Source_WebCore_page_csp_ContentSecurityPolicy.cpp

Log Message:
qt5-qtwebkit: fix build w/ GCC 14


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/x11/qt5-qtwebkit/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_src_common_mathutil.h \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_page_csp_ContentSecurityPolicy.cpp

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/distinfo
diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.33 pkgsrc/x11/qt5-qtwebkit/distinfo:1.34
--- pkgsrc/x11/qt5-qtwebkit/distinfo:1.33       Sun Jun  2 12:26:24 2024
+++ pkgsrc/x11/qt5-qtwebkit/distinfo    Sat Aug 17 10:58:39 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2024/06/02 12:26:24 ryoon Exp $
+$NetBSD: distinfo,v 1.34 2024/08/17 10:58:39 tnn Exp $
 
 BLAKE2s (qtwebkit-5.212.0-alpha4.tar.xz) = 20858db08c7d297037d3ced34e441d4b657325c406b475e4e76dd367dc9c500c
 SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
@@ -15,6 +15,7 @@ SHA1 (patch-Source_JavaScriptCore_jit_Th
 SHA1 (patch-Source_JavaScriptCore_jsc.cpp) = 796ce0232f1a833757b2e7ca5c910fac75f783ad
 SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 94c139413eecb875bba98c7749bba24cfcc16632
 SHA1 (patch-Source_Qt5WebKitConfig.cmake.in) = c8573e02a10064e709bea4dfe053d58d08d048a0
+SHA1 (patch-Source_ThirdParty_ANGLE_src_common_mathutil.h) = 4f7c36cf3770d35650666f9820240f88f25fe843
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = 1e4b8cffbd7ec0a6130a0ec2112023bed5c0b78e
 SHA1 (patch-Source_WTF_wtf_Assertions.cpp) = 15b8ac40e49cfec78d46de634fd6a1edde2d2a96
 SHA1 (patch-Source_WTF_wtf_InlineASM.h) = 7ffc086a21f645112ad10296571464a1e15b8b44
@@ -23,6 +24,7 @@ SHA1 (patch-Source_WTF_wtf_Platform.h) =
 SHA1 (patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp) = bfa570aa20e3508c77bbaebed051821a33f36209
 SHA1 (patch-Source_WebCore_css_makegrammar.pl) = 2f1977c925069243d76379ae6d065e850143b2e3
 SHA1 (patch-Source_WebCore_page_NavigatorBase.cpp) = e8972f4b703a9ff45ce313609d2540f89064b4ff
+SHA1 (patch-Source_WebCore_page_csp_ContentSecurityPolicy.cpp) = 31e52cdd88ccb60a2d84adec3f0d2c042fbad161
 SHA1 (patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp) = 7bd24adde2cc0e1cbad2143fc83699d659d61045
 SHA1 (patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp) = ec7c7533c2d5a4258170745bfc49655848d0780c
 SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h) = d1d986afd5525143fc786a959240a72167f03352

Added files:

Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_src_common_mathutil.h
diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_src_common_mathutil.h:1.1
--- /dev/null   Sat Aug 17 10:58:39 2024
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_ThirdParty_ANGLE_src_common_mathutil.h Sat Aug 17 10:58:39 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_ThirdParty_ANGLE_src_common_mathutil.h,v 1.1 2024/08/17 10:58:39 tnn Exp $
+
+error: 'uint32_t' does not name a type
+  575 | inline uint32_t RotL(uint32_t x, int8_t r)
+
+--- Source/ThirdParty/ANGLE/src/common/mathutil.h.orig 2024-08-17 11:56:20.701400148 +0000
++++ Source/ThirdParty/ANGLE/src/common/mathutil.h
+@@ -16,6 +16,7 @@
+ #include <algorithm>
+ #include <string.h>
+ #include <stdlib.h>
++#include <cstdint>
+ 
+ namespace gl
+ {
Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_page_csp_ContentSecurityPolicy.cpp
diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_page_csp_ContentSecurityPolicy.cpp:1.1
--- /dev/null   Sat Aug 17 10:58:39 2024
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_page_csp_ContentSecurityPolicy.cpp     Sat Aug 17 10:58:39 2024
@@ -0,0 +1,26 @@
+$NetBSD: patch-Source_WebCore_page_csp_ContentSecurityPolicy.cpp,v 1.1 2024/08/17 10:58:39 tnn Exp $
+
+Work around GCC 14 issue:
+
+/usr/include/c++/14/bits/stl_pair.h:922:38:   required from 'struct std::pair<WebCore::ContentSecurityPolicyHashAlgorithm, WTF::Vector<unsigned char> >'
+  922 |                                        is_copy_assignable<_T2>>::value,
+      |                                                                  ^~~~~
+/tnn/pkgsrc-obj/x11/qt5-qtwebkit/work/qtwebkit-5.212.0-alpha4/Source/WebCore/page/csp/ContentSecurityPolicy.cpp:235:56:   required from here
+  235 |             if ((policy.get()->*allowed)(std::make_pair(algorithm, digest)))
+      |                                          ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~
+/usr/include/c++/14/type_traits:1237:52: error: non-constant condition for static assertion
+ 1237 |       static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
+
+--- Source/WebCore/page/csp/ContentSecurityPolicy.cpp.orig     2024-08-17 11:46:46.999690372 +0000
++++ Source/WebCore/page/csp/ContentSecurityPolicy.cpp
+@@ -231,8 +231,9 @@ bool isAllowedByAllWithHashFromContent(c
+         auto cryptoDigest = CryptoDigest::create(toCryptoDigestAlgorithm(algorithm));
+         cryptoDigest->addBytes(contentCString.data(), contentCString.length());
+         Vector<uint8_t> digest = cryptoDigest->computeHash();
++      auto p = std::make_pair(algorithm, digest);
+         for (auto& policy : policies) {
+-            if ((policy.get()->*allowed)(std::make_pair(algorithm, digest)))
++            if ((policy.get()->*allowed)(p))
+                 return true;
+         }
+     }