summaryrefslogtreecommitdiff
path: root/user/qt5-qtwebkit/icu-75.patch
blob: aaba87abd68a461e76707d979597e3aef280b730 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
Required for compatibility with ICU 75.

--- qtwebkit-opensource-src-5.212/Source/cmake/OptionsCommon.cmake.old	2020-09-22 06:30:04.000000000 -0500
+++ qtwebkit-opensource-src-5.212/Source/cmake/OptionsCommon.cmake	2024-08-12 23:20:50.344794822 -0500
@@ -31,7 +31,7 @@
 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")
--- qtwebkit-opensource-src-5.212/Source/WTF/wtf/StdLibExtras.h.old	2020-09-22 06:30:04.000000000 -0500
+++ qtwebkit-opensource-src-5.212/Source/WTF/wtf/StdLibExtras.h	2024-08-12 23:38:15.214914980 -0500
@@ -292,7 +292,7 @@
 // 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<class T> struct _Unique_if {
     typedef unique_ptr<T> _Single_object;
 };
@@ -323,7 +323,7 @@
 #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).
--- qtwebkit-opensource-src-5.212/Source/WebCore/xml/XSLTProcessor.h.old	2020-09-22 06:30:04.000000000 -0500
+++ qtwebkit-opensource-src-5.212/Source/WebCore/xml/XSLTProcessor.h	2024-08-13 00:27:21.354699921 -0500
@@ -64,7 +64,7 @@
 
     void reset();
 
-    static void parseErrorFunc(void* userData, xmlError*);
+    static void parseErrorFunc(void* userData, const xmlError*);
     static void genericErrorFunc(void* userData, const char* msg, ...);
     
     // Only for libXSLT callbacks
--- qtwebkit-opensource-src-5.212/Source/WebCore/xml/XSLTProcessorLibxslt.cpp.old	2020-09-22 06:30:04.000000000 -0500
+++ qtwebkit-opensource-src-5.212/Source/WebCore/xml/XSLTProcessorLibxslt.cpp	2024-08-13 00:28:32.207221034 -0500
@@ -78,7 +78,7 @@
     // It would be nice to do something with this error message.
 }
 
-void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error)
+void XSLTProcessor::parseErrorFunc(void* userData, const xmlError* error)
 {
     PageConsoleClient* console = static_cast<PageConsoleClient*>(userData);
     if (!console)