From adcfe1aae993a3e51081f6fef170a484cf07d5de Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 17 Feb 2026 19:59:40 +0300 Subject: [PATCH] qt5-webkit --- desktop/toolkit/qt5/qt5-webkit/actions.py | 1 + .../files/qtwebkit-fix-build-gcc14.patch | 15 +++++++++++++++ desktop/toolkit/qt5/qt5-webkit/pspec.xml | 1 + 3 files changed, 17 insertions(+) create mode 100644 desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-fix-build-gcc14.patch diff --git a/desktop/toolkit/qt5/qt5-webkit/actions.py b/desktop/toolkit/qt5/qt5-webkit/actions.py index 9e08839ddf..6449021126 100755 --- a/desktop/toolkit/qt5/qt5-webkit/actions.py +++ b/desktop/toolkit/qt5/qt5-webkit/actions.py @@ -12,6 +12,7 @@ from pisi.actionsapi import qt5 from pisi.actionsapi import get def setup(): + shelltools.system("sed -i '16i#include ' Source/ThirdParty/woff2/include/woff2/output.h") shelltools.makedirs("build") shelltools.cd("build") cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-fix-build-gcc14.patch b/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-fix-build-gcc14.patch new file mode 100644 index 0000000000..870b6e28dc --- /dev/null +++ b/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-fix-build-gcc14.patch @@ -0,0 +1,15 @@ +diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +index 9e726d5..4876f0f 100644 +--- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp ++++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +@@ -231,8 +231,9 @@ bool isAllowedByAllWithHashFromContent(const CSPDirectiveListVector& policies, c + auto cryptoDigest = CryptoDigest::create(toCryptoDigestAlgorithm(algorithm)); + cryptoDigest->addBytes(contentCString.data(), contentCString.length()); + Vector digest = cryptoDigest->computeHash(); ++ ContentSecurityPolicyHash hash = std::make_pair(algorithm, digest); + for (auto& policy : policies) { +- if ((policy.get()->*allowed)(std::make_pair(algorithm, digest))) ++ if ((policy.get()->*allowed)(hash)) + return true; + } + } diff --git a/desktop/toolkit/qt5/qt5-webkit/pspec.xml b/desktop/toolkit/qt5/qt5-webkit/pspec.xml index 80e5430992..f843f3fcad 100755 --- a/desktop/toolkit/qt5/qt5-webkit/pspec.xml +++ b/desktop/toolkit/qt5/qt5-webkit/pspec.xml @@ -66,6 +66,7 @@ qtwebkit-cstdint.patch qt5-webkit-icu75.patch + qt5-webkit-icu75.patch