diff --git a/srcpkgs/qt5-webkit/patches/icu-78.patch b/srcpkgs/qt5-webkit/patches/icu-78.patch new file mode 100644 index 00000000000..82662725cb1 --- /dev/null +++ b/srcpkgs/qt5-webkit/patches/icu-78.patch @@ -0,0 +1,31 @@ +--- a/Source/cmake/OptionsCommon.cmake ++++ b/Source/cmake/OptionsCommon.cmake +@@ -31,7 +31,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS + if (COMPILER_IS_GCC_OR_CLANG) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") + endif () + + if (COMPILER_IS_CLANG AND CMAKE_GENERATOR STREQUAL "Ninja") +--- a/Source/WTF/wtf/StdLibExtras.h ++++ b/Source/WTF/wtf/StdLibExtras.h +@@ -292,7 +292,7 @@ inline void* operator new(size_t, NotNul + // This adds various C++14 features for versions of the STL that may not yet have them. + namespace std { + // MSVC 2013 supports std::make_unique already. +-#if !defined(_MSC_VER) || _MSC_VER < 1800 ++#if 0 + template struct _Unique_if { + typedef unique_ptr _Single_object; + }; +@@ -323,7 +323,7 @@ make_unique(Args&&...) = delete; + #endif + + // MSVC 2015 supports these functions. +-#if !COMPILER(MSVC) || _MSC_VER < 1900 ++#if 0 + // Compile-time integer sequences + // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3658.html + // (Note that we only implement index_sequence, and not the more generic integer_sequence). diff --git a/srcpkgs/qt5-webkit/patches/qt5-webkit-icu76.patch b/srcpkgs/qt5-webkit/patches/qt5-webkit-icu76.patch new file mode 100644 index 00000000000..b792aed3fe8 --- /dev/null +++ b/srcpkgs/qt5-webkit/patches/qt5-webkit-icu76.patch @@ -0,0 +1,14 @@ +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -566,6 +566,11 @@ + + #endif /* PLATFORM(MAC) */ + ++/* 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 ++#define U_SHOW_CPLUSPLUS_HEADER_API 0 ++ + #if PLATFORM(IOS) + + #define HAVE_NETWORK_EXTENSION 1 diff --git a/srcpkgs/qt5-webkit/patches/qtwebkit-fix-build-gcc14.patch b/srcpkgs/qt5-webkit/patches/qtwebkit-fix-build-gcc14.patch new file mode 100644 index 00000000000..16964163856 --- /dev/null +++ b/srcpkgs/qt5-webkit/patches/qtwebkit-fix-build-gcc14.patch @@ -0,0 +1,13 @@ +--- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp ++++ b/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 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/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template index 1f50c6dc601..88c00001fe2 100644 --- a/srcpkgs/qt5-webkit/template +++ b/srcpkgs/qt5-webkit/template @@ -1,7 +1,7 @@ # Template file for 'qt5-webkit' pkgname=qt5-webkit version=5.212.0 -revision=16 +revision=17 _snap=1586819898 _v=${version%.*} build_style=cmake