diff options
Diffstat (limited to 'deps/qt5-webkit/patches')
| -rw-r--r-- | deps/qt5-webkit/patches/qt5-webkit.gcc7.patch | 34 | ||||
| -rw-r--r-- | deps/qt5-webkit/patches/qt5-webkit.icu59.patch | 80 | ||||
| -rw-r--r-- | deps/qt5-webkit/patches/qt5-webkit.icu65.patch | 47 | ||||
| -rw-r--r-- | deps/qt5-webkit/patches/qt5-webkit.pthread.patch | 32 |
4 files changed, 0 insertions, 193 deletions
diff --git a/deps/qt5-webkit/patches/qt5-webkit.gcc7.patch b/deps/qt5-webkit/patches/qt5-webkit.gcc7.patch deleted file mode 100644 index bddb6fc..0000000 --- a/deps/qt5-webkit/patches/qt5-webkit.gcc7.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -u -r webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h ---- webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h 2017-02-20 17:20:15.000000000 +0100 -+++ webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h 2017-06-27 13:13:57.801527350 +0200 -@@ -581,29 +581,7 @@ - // FIXME: Does this really belong in StringImpl? - template <typename T> static void copyChars(T* destination, const T* source, unsigned numCharacters) - { -- if (numCharacters == 1) { -- *destination = *source; -- return; -- } -- -- if (numCharacters <= s_copyCharsInlineCutOff) { -- unsigned i = 0; --#if (CPU(X86) || CPU(X86_64)) -- const unsigned charsPerInt = sizeof(uint32_t) / sizeof(T); -- -- if (numCharacters > charsPerInt) { -- unsigned stopCount = numCharacters & ~(charsPerInt - 1); -- -- const uint32_t* srcCharacters = reinterpret_cast<const uint32_t*>(source); -- uint32_t* destCharacters = reinterpret_cast<uint32_t*>(destination); -- for (unsigned j = 0; i < stopCount; i += charsPerInt, ++j) -- destCharacters[j] = srcCharacters[j]; -- } --#endif -- for (; i < numCharacters; ++i) -- destination[i] = source[i]; -- } else -- memcpy(destination, source, numCharacters * sizeof(T)); -+ memcpy(destination, source, numCharacters * sizeof(T)); - } - - ALWAYS_INLINE static void copyChars(UChar* destination, const LChar* source, unsigned numCharacters) diff --git a/deps/qt5-webkit/patches/qt5-webkit.icu59.patch b/deps/qt5-webkit/patches/qt5-webkit.icu59.patch deleted file mode 100644 index 3eb73b2..0000000 --- a/deps/qt5-webkit/patches/qt5-webkit.icu59.patch +++ /dev/null @@ -1,80 +0,0 @@ -Submitted by: DJ Lucas (dj_AT_linuxfromscratch_DOT_org) -Date: 2017-04-29 -Initial Package Version: 5.8.0 -Upstream Status: Unknown -Origin: https://bugreports.qt.io/browse/QTBUG-35971 -Description: Fixes build with icu-59. - -diff -Naurp qtwebkit-opensource-src-5.8.0-orig/Source/JavaScriptCore/API/JSStringRef.h qtwebkit-opensource-src-5.8.0/Source/JavaScriptCore/API/JSStringRef.h ---- qtwebkit-opensource-src-5.8.0-orig/Source/JavaScriptCore/API/JSStringRef.h 2016-12-10 10:32:34.000000000 -0600 -+++ qtwebkit-opensource-src-5.8.0/Source/JavaScriptCore/API/JSStringRef.h 2017-04-29 17:03:35.280465079 -0500 -@@ -32,6 +32,7 @@ - #include <stdbool.h> - #endif - #include <stddef.h> /* for size_t */ -+#include <uchar.h> - - #ifdef __cplusplus - extern "C" { -@@ -43,7 +44,7 @@ extern "C" { - @typedef JSChar - @abstract A Unicode character. - */ -- typedef unsigned short JSChar; -+ typedef char16_t JSChar; - #else - typedef wchar_t JSChar; - #endif -diff -Naurp qtwebkit-opensource-src-5.8.0-orig/Source/WTF/wtf/Compiler.h qtwebkit-opensource-src-5.8.0/Source/WTF/wtf/Compiler.h ---- qtwebkit-opensource-src-5.8.0-orig/Source/WTF/wtf/Compiler.h 2016-12-10 10:32:34.000000000 -0600 -+++ qtwebkit-opensource-src-5.8.0/Source/WTF/wtf/Compiler.h 2017-04-29 17:03:35.280465079 -0500 -@@ -61,6 +61,7 @@ - #define WTF_COMPILER_SUPPORTS_HAS_TRIVIAL_DESTRUCTOR __has_feature(has_trivial_destructor) - #define WTF_COMPILER_SUPPORTS_CXX_STRONG_ENUMS __has_feature(cxx_strong_enums) - #define WTF_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS __has_feature(cxx_reference_qualified_functions) -+#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES !defined(_LIBCPP_HAS_NO_UNICODE_CHARS) - - #endif - -@@ -142,6 +143,7 @@ - #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1 - #endif - #if GCC_VERSION_AT_LEAST(4, 5, 0) -+#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES 1 - #define WTF_COMPILER_SUPPORTS_CXX_EXPLICIT_CONVERSIONS 1 - #endif - #if GCC_VERSION_AT_LEAST(4, 6, 0) -diff -Naurp qtwebkit-opensource-src-5.8.0-orig/Source/WTF/wtf/TypeTraits.h qtwebkit-opensource-src-5.8.0/Source/WTF/wtf/TypeTraits.h ---- qtwebkit-opensource-src-5.8.0-orig/Source/WTF/wtf/TypeTraits.h 2016-12-10 10:32:34.000000000 -0600 -+++ qtwebkit-opensource-src-5.8.0/Source/WTF/wtf/TypeTraits.h 2017-04-29 17:03:35.280465079 -0500 -@@ -75,6 +75,10 @@ namespace WTF { - #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) - template<> struct IsInteger<wchar_t> { static const bool value = true; }; - #endif -+#if COMPILER_SUPPORTS(CXX_NEW_CHAR_TYPES) -+ template<> struct IsInteger<char16_t> { static const bool value = true; }; -+ template<> struct IsInteger<char32_t> { static const bool value = true; }; -+#endif - - template<typename T> struct IsFloatingPoint { static const bool value = false; }; - template<> struct IsFloatingPoint<float> { static const bool value = true; }; -diff -Naurp qtwebkit-opensource-src-5.8.0-orig/Source/WebKit2/Shared/API/c/WKString.h qtwebkit-opensource-src-5.8.0/Source/WebKit2/Shared/API/c/WKString.h ---- qtwebkit-opensource-src-5.8.0-orig/Source/WebKit2/Shared/API/c/WKString.h 2016-12-10 10:32:34.000000000 -0600 -+++ qtwebkit-opensource-src-5.8.0/Source/WebKit2/Shared/API/c/WKString.h 2017-04-29 17:03:35.280465079 -0500 -@@ -31,6 +31,7 @@ - #ifndef __cplusplus - #include <stdbool.h> - #endif -+#include <uchar.h> - - #ifdef __cplusplus - extern "C" { -@@ -38,7 +39,7 @@ extern "C" { - - #if !defined(WIN32) && !defined(_WIN32) \ - && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */ -- typedef unsigned short WKChar; -+ typedef char16_t WKChar; - #else - typedef wchar_t WKChar; - #endif diff --git a/deps/qt5-webkit/patches/qt5-webkit.icu65.patch b/deps/qt5-webkit/patches/qt5-webkit.icu65.patch deleted file mode 100644 index fe27d24..0000000 --- a/deps/qt5-webkit/patches/qt5-webkit.icu65.patch +++ /dev/null @@ -1,47 +0,0 @@ -# ----------------------------------------------------------------------------- -# Patch obtained from FreeBSD: -# https://svnweb.freebsd.org/ports/head/www/qt5-webkit/files/patch-Source_WebCore_dom_Document.cpp?view=co -# ----------------------------------------------------------------------------- -Regressed by https://github.com/unicode-org/icu/commit/480bec3ea652 - -In file included from Source/WebCore/dom/DOMAllInOne.cpp:67: -Source/WebCore/dom/Document.cpp:4410:39: error: expected ';' after do/while statement - U16_NEXT(characters, i, length, c) - ^ - ; -Source/WebCore/dom/Document.cpp:4415:43: error: expected ';' after do/while statement - U16_NEXT(characters, i, length, c) - ^ - ; -Source/WebCore/dom/Document.cpp:4477:46: error: expected ';' after do/while statement - U16_NEXT(qualifiedName, i, length, c) - ^ - ; - ---- Source/WebCore/dom/Document.cpp.orig 2019-06-26 16:25:02 UTC -+++ Source/WebCore/dom/Document.cpp -@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* character - unsigned i = 0; - - UChar32 c; -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNameStart(c)) - return false; - - while (i < length) { -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNamePart(c)) - return false; - } -@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualif - - for (unsigned i = 0; i < length;) { - UChar32 c; -- U16_NEXT(qualifiedName, i, length, c) -+ U16_NEXT(qualifiedName, i, length, c); - if (c == ':') { - if (sawColon) { - ec = NAMESPACE_ERR; - diff --git a/deps/qt5-webkit/patches/qt5-webkit.pthread.patch b/deps/qt5-webkit/patches/qt5-webkit.pthread.patch deleted file mode 100644 index 53d5439..0000000 --- a/deps/qt5-webkit/patches/qt5-webkit.pthread.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5f359baacdf92fabcece83f0a2b30f74c7c02a3c Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> -Date: Mon, 22 Feb 2016 10:57:32 +0100 -Subject: [PATCH] Fix linking with libpthread - -WebKit use libpthread directly but is depending on other qt modules -causing it to be linked against, which might break unless -lpthread -is last. Instead just add it explicitly after the static libraries. - -Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33 -Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> -(cherry picked from commit 5dd4bb67cfce812fd7686e43616e2069f354a7df) -Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> ---- - Tools/qmake/mkspecs/features/default_post.prf | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf -index 67276b7..39bb3f7 100644 ---- a/Tools/qmake/mkspecs/features/default_post.prf -+++ b/Tools/qmake/mkspecs/features/default_post.prf -@@ -201,6 +201,7 @@ needToLink() { - linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir)) - LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs) - } -+ posix:!darwin: LIBS += -lpthread - } - - creating_module { --- -2.7.1 - |