From 2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 19 Aug 2017 15:44:17 +0200 Subject: qt: refresh remaining patches and add links to meta-qt5 repos * remove qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch which is already applied and fuzzy patch just apply the same section twice * restore qttools/0001-add-noqtwebkit-configuration.patch which was removed from SRC_URI in 5.9 upgrade * add comment with link to meta-qt5 repository where the meta-qt5 .patch files are maintained, include branch and tag name so that it's more clear from where these changes are exported (with: git format-patch --no-numbered --no-signature) Signed-off-by: Martin Jansa --- .../0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | 4 +- ...ude-backtrace-API-for-non-glibc-libraries.patch | 35 ++++++++ ...ude-backtrace-API-for-non-glibc-libraries.patch | 35 -------- .../0003-Fix-compilation-with-ICU-59.patch | 89 +++++++++++++++++++++ .../0004-Fix-compilation-with-ICU-59.patch | 92 ---------------------- 5 files changed, 126 insertions(+), 129 deletions(-) create mode 100644 recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch delete mode 100644 recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch create mode 100644 recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch delete mode 100644 recipes-qt/qt5/qtwebkit/0004-Fix-compilation-with-ICU-59.patch (limited to 'recipes-qt/qt5/qtwebkit') diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch index d96636e6..d393dc41 100644 --- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch @@ -1,4 +1,4 @@ -From 86bdd059606252b16c24432fbe4bba461406c1e4 Mon Sep 17 00:00:00 2001 +From f8bcac01fd5d95d0df8342809c53917aff1bf798 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Fri, 7 Feb 2014 04:07:17 +0100 Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) @@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa 1 file changed, 1 deletion(-) diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf -index fd66af6..ef754c3 100644 +index fd66af670..ef754c367 100644 --- a/Tools/qmake/mkspecs/features/unix/default_post.prf +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf @@ -61,7 +61,6 @@ linux-*g++* { diff --git a/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch b/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch new file mode 100644 index 00000000..147a7baa --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch @@ -0,0 +1,35 @@ +From 5d4f3219be0b66d63765e077644a51e18b1f4502 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 5 Jun 2015 19:55:05 -0700 +Subject: [PATCH] Exclude backtrace() API for non-glibc libraries + +It was excluding musl with current checks, so lets make it such that it +considers only glibc when using backtrace API + +Signed-off-by: Khem Raj +--- + Source/WTF/wtf/Assertions.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp +index 1b2091f53..ba03a28ec 100644 +--- a/Source/WTF/wtf/Assertions.cpp ++++ b/Source/WTF/wtf/Assertions.cpp +@@ -61,7 +61,7 @@ + #include + #endif + +-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) ++#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) + #include + #include + #include +@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f + + void WTFGetBacktrace(void** stack, int* size) + { +-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) ++#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) + *size = backtrace(stack, *size); + #elif OS(WINDOWS) && !OS(WINCE) + // The CaptureStackBackTrace function is available in XP, but it is not defined diff --git a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch deleted file mode 100644 index a16801b5..00000000 --- a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ed626df67e8287fadbfe2801c241c9717472dcf4 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 5 Jun 2015 19:55:05 -0700 -Subject: [PATCH] Exclude backtrace() API for non-glibc libraries - -It was excluding musl with current checks, so lets make it such that it -considers only glibc when using backtrace API - -Signed-off-by: Khem Raj ---- - Source/WTF/wtf/Assertions.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp -index 1b2091f..ba03a28 100644 ---- a/Source/WTF/wtf/Assertions.cpp -+++ b/Source/WTF/wtf/Assertions.cpp -@@ -61,7 +61,7 @@ - #include - #endif - --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) - #include - #include - #include -@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f - - void WTFGetBacktrace(void** stack, int* size) - { --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) - *size = backtrace(stack, *size); - #elif OS(WINDOWS) && !OS(WINCE) - // The CaptureStackBackTrace function is available in XP, but it is not defined diff --git a/recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch b/recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch new file mode 100644 index 00000000..debbda1e --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch @@ -0,0 +1,89 @@ +From 240bd33ba3e78fcc0e5e3299d9e0e53299ea07f8 Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev +Date: Thu, 4 May 2017 15:12:37 +0300 +Subject: [PATCH] Fix compilation with ICU 59 + +Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612 + +Task-number: QTBUG-60532 +Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843 +Reviewed-by: Allan Sandfeld Jensen +--- + Source/JavaScriptCore/API/JSStringRef.cpp | 6 +++--- + Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++- + Source/WTF/wtf/TypeTraits.h | 3 +++ + Source/WebKit2/Shared/API/c/WKString.cpp | 2 +- + 4 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp +index 812f3d413..77a3fd0f4 100644 +--- a/Source/JavaScriptCore/API/JSStringRef.cpp ++++ b/Source/JavaScriptCore/API/JSStringRef.cpp +@@ -37,7 +37,7 @@ using namespace WTF::Unicode; + JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(chars, numChars).leakRef(); ++ return OpaqueJSString::create(reinterpret_cast(chars), numChars).leakRef(); + } + + JSStringRef JSStringCreateWithUTF8CString(const char* string) +@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) + JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); ++ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); + } + + JSStringRef JSStringRetain(JSStringRef string) +@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string) + + const JSChar* JSStringGetCharactersPtr(JSStringRef string) + { +- return string->characters(); ++ return reinterpret_cast(string->characters()); + } + + size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) +diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp +index 0b57f012d..05e27338b 100644 +--- a/Source/JavaScriptCore/runtime/DateConversion.cpp ++++ b/Source/JavaScriptCore/runtime/DateConversion.cpp +@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as + #if OS(WINDOWS) + TIME_ZONE_INFORMATION timeZoneInformation; + GetTimeZoneInformation(&timeZoneInformation); +- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ String timeZoneName(reinterpret_cast(winTimeZoneName)); + #else + struct tm gtm = t; + char timeZoneName[70]; +diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h +index 9df2c95cf..f5d6121fd 100644 +--- a/Source/WTF/wtf/TypeTraits.h ++++ b/Source/WTF/wtf/TypeTraits.h +@@ -72,6 +72,9 @@ namespace WTF { + template<> struct IsInteger { static const bool value = true; }; + template<> struct IsInteger { static const bool value = true; }; + template<> struct IsInteger { static const bool value = true; }; ++#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT) ++ template<> struct IsInteger { static const bool value = true; }; ++#endif + #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) + template<> struct IsInteger { static const bool value = true; }; + #endif +diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp +index cbac67dd8..23400a64e 100644 +--- a/Source/WebKit2/Shared/API/c/WKString.cpp ++++ b/Source/WebKit2/Shared/API/c/WKString.cpp +@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef) + size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) + { + COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); +- return (toImpl(stringRef)->getCharacters(static_cast(buffer), bufferLength)); ++ return (toImpl(stringRef)->getCharacters(reinterpret_cast(buffer), bufferLength)); + } + + size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) diff --git a/recipes-qt/qt5/qtwebkit/0004-Fix-compilation-with-ICU-59.patch b/recipes-qt/qt5/qtwebkit/0004-Fix-compilation-with-ICU-59.patch deleted file mode 100644 index e4a108e8..00000000 --- a/recipes-qt/qt5/qtwebkit/0004-Fix-compilation-with-ICU-59.patch +++ /dev/null @@ -1,92 +0,0 @@ -From d8d9b1eb468f5e5d5d9f0b196fc0acb641998c8b Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev -Date: Thu, 4 May 2017 15:12:37 +0300 -Subject: [PATCH] Fix compilation with ICU 59 - -Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612 - -Task-number: QTBUG-60532 -Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843 -Reviewed-by: Allan Sandfeld Jensen ---- - Source/JavaScriptCore/API/JSStringRef.cpp | 6 +++--- - Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++- - Source/WTF/wtf/TypeTraits.h | 3 +++ - Source/WebKit2/Shared/API/c/WKString.cpp | 2 +- - 4 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp -index 812f3d413..77a3fd0f4 100644 ---- a/Source/JavaScriptCore/API/JSStringRef.cpp -+++ b/Source/JavaScriptCore/API/JSStringRef.cpp -@@ -37,7 +37,7 @@ using namespace WTF::Unicode; - JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) - { - initializeThreading(); -- return OpaqueJSString::create(chars, numChars).leakRef(); -+ return OpaqueJSString::create(reinterpret_cast(chars), numChars).leakRef(); - } - - JSStringRef JSStringCreateWithUTF8CString(const char* string) -@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) - JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) - { - initializeThreading(); -- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); -+ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); - } - - JSStringRef JSStringRetain(JSStringRef string) -@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string) - - const JSChar* JSStringGetCharactersPtr(JSStringRef string) - { -- return string->characters(); -+ return reinterpret_cast(string->characters()); - } - - size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) -diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp -index 0b57f012d..05e27338b 100644 ---- a/Source/JavaScriptCore/runtime/DateConversion.cpp -+++ b/Source/JavaScriptCore/runtime/DateConversion.cpp -@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as - #if OS(WINDOWS) - TIME_ZONE_INFORMATION timeZoneInformation; - GetTimeZoneInformation(&timeZoneInformation); -- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; -+ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; -+ String timeZoneName(reinterpret_cast(winTimeZoneName)); - #else - struct tm gtm = t; - char timeZoneName[70]; -diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h -index 9df2c95cf..f5d6121fd 100644 ---- a/Source/WTF/wtf/TypeTraits.h -+++ b/Source/WTF/wtf/TypeTraits.h -@@ -72,6 +72,9 @@ namespace WTF { - template<> struct IsInteger { static const bool value = true; }; - template<> struct IsInteger { static const bool value = true; }; - template<> struct IsInteger { static const bool value = true; }; -+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT) -+ template<> struct IsInteger { static const bool value = true; }; -+#endif - #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) - template<> struct IsInteger { static const bool value = true; }; - #endif -diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp -index cbac67dd8..23400a64e 100644 ---- a/Source/WebKit2/Shared/API/c/WKString.cpp -+++ b/Source/WebKit2/Shared/API/c/WKString.cpp -@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef) - size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) - { - COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); -- return (toImpl(stringRef)->getCharacters(static_cast(buffer), bufferLength)); -+ return (toImpl(stringRef)->getCharacters(reinterpret_cast(buffer), bufferLength)); - } - - size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) --- -2.13.3 - -- cgit v1.2.3-54-g00ecf