Skip to content

Commit 6076364

Browse files
committed
qt5-webkit: rebuild for icu 78
1 parent e90b2db commit 6076364

File tree

4 files changed

+59
-1
lines changed

4 files changed

+59
-1
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
--- a/Source/cmake/OptionsCommon.cmake
2+
+++ b/Source/cmake/OptionsCommon.cmake
3+
@@ -31,7 +31,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS
4+
if (COMPILER_IS_GCC_OR_CLANG)
5+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing")
6+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti")
7+
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
8+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
9+
endif ()
10+
11+
if (COMPILER_IS_CLANG AND CMAKE_GENERATOR STREQUAL "Ninja")
12+
--- a/Source/WTF/wtf/StdLibExtras.h
13+
+++ b/Source/WTF/wtf/StdLibExtras.h
14+
@@ -292,7 +292,7 @@ inline void* operator new(size_t, NotNul
15+
// This adds various C++14 features for versions of the STL that may not yet have them.
16+
namespace std {
17+
// MSVC 2013 supports std::make_unique already.
18+
-#if !defined(_MSC_VER) || _MSC_VER < 1800
19+
+#if 0
20+
template<class T> struct _Unique_if {
21+
typedef unique_ptr<T> _Single_object;
22+
};
23+
@@ -323,7 +323,7 @@ make_unique(Args&&...) = delete;
24+
#endif
25+
26+
// MSVC 2015 supports these functions.
27+
-#if !COMPILER(MSVC) || _MSC_VER < 1900
28+
+#if 0
29+
// Compile-time integer sequences
30+
// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3658.html
31+
// (Note that we only implement index_sequence, and not the more generic integer_sequence).
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--- a/Source/WTF/wtf/Platform.h
2+
+++ b/Source/WTF/wtf/Platform.h
3+
@@ -566,6 +566,11 @@
4+
5+
#endif /* PLATFORM(MAC) */
6+
7+
+/* FIXME: This does not belong in Platform.h and should instead be included in another mechanism (compiler option, prefix header, config.h, etc) */
8+
+/* ICU configuration. Some of these match ICU defaults on some platforms, but we would like them consistently set everywhere we build WebKit. */
9+
+#define U_SHOW_CPLUSPLUS_API 0
10+
+#define U_SHOW_CPLUSPLUS_HEADER_API 0
11+
+
12+
#if PLATFORM(IOS)
13+
14+
#define HAVE_NETWORK_EXTENSION 1
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
--- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
2+
+++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
3+
@@ -231,8 +231,9 @@ bool isAllowedByAllWithHashFromContent(c
4+
auto cryptoDigest = CryptoDigest::create(toCryptoDigestAlgorithm(algorithm));
5+
cryptoDigest->addBytes(contentCString.data(), contentCString.length());
6+
Vector<uint8_t> digest = cryptoDigest->computeHash();
7+
+ ContentSecurityPolicyHash hash = std::make_pair(algorithm, digest);
8+
for (auto& policy : policies) {
9+
- if ((policy.get()->*allowed)(std::make_pair(algorithm, digest)))
10+
+ if ((policy.get()->*allowed)(hash))
11+
return true;
12+
}
13+
}

srcpkgs/qt5-webkit/template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'qt5-webkit'
22
pkgname=qt5-webkit
33
version=5.212.0
4-
revision=16
4+
revision=17
55
_snap=1586819898
66
_v=${version%.*}
77
build_style=cmake

0 commit comments

Comments
 (0)