* [Buildroot] [PATCH 1/2] qt5webkit: correct download URL and hash for 5.6 variant
@ 2017-11-16 14:23 Peter Korsgaard
2017-11-16 14:23 ` [Buildroot] [PATCH 2/2] qt5webkit: backport upstream icu-59 fix from 5.9 branch to 5.6.3 Peter Korsgaard
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Peter Korsgaard @ 2017-11-16 14:23 UTC (permalink / raw)
To: buildroot
Commit 06a4975d4bd03 (qt5: bump LTS version to 5.6.3) added an empty hash
for the 5.6.3 variant of qt5webkit, causing failures.
It also forgot to adjust the download URL as the qt5webkit tarballs are no
longer available under official_releases/ like the other submodules, but only
under community_releases/.
Fix both issues.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/qt5/qt5webkit/qt5webkit.hash | 4 ++--
package/qt5/qt5webkit/qt5webkit.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash
index 1a5e72664f..aa3a71c8d0 100644
--- a/package/qt5/qt5webkit/qt5webkit.hash
+++ b/package/qt5/qt5webkit/qt5webkit.hash
@@ -1,5 +1,5 @@
-# Hash from: http://download.qt.io/snapshots/qt/5.6/5.6.3/latest_src/submodules/qtwebkit-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 qtwebkit-opensource-src-5.6.3.tar.xz
+# Hash from: http://download.qt.io/community_releases/5.6/5.6.3/qtwebkit-opensource-src-5.6.3.tar.xz.mirrorlist
+sha256 098c6bb25798fbf1b619b540621287787064efc9b586d76ac0ce7e39b87a3896 qtwebkit-opensource-src-5.6.3.tar.xz
# hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz.mirrorlist
sha256 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf qtwebkit-opensource-src-5.9.1.tar.xz
diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index 6e982e6bc7..592eae908d 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -10,7 +10,7 @@ QT5WEBKIT_VERSION = 5.9.1
QT5WEBKIT_SITE = http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules
else
QT5WEBKIT_VERSION = $(QT5_VERSION)
-QT5WEBKIT_SITE = $(QT5_SITE)
+QT5WEBKIT_SITE = http://download.qt.io/community_releases/5.6/$(QT5_VERSION)/submodules
endif
QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 2/2] qt5webkit: backport upstream icu-59 fix from 5.9 branch to 5.6.3 2017-11-16 14:23 [Buildroot] [PATCH 1/2] qt5webkit: correct download URL and hash for 5.6 variant Peter Korsgaard @ 2017-11-16 14:23 ` Peter Korsgaard 2017-11-17 9:32 ` Peter Korsgaard 2017-11-27 9:33 ` Peter Korsgaard 2017-11-17 9:32 ` [Buildroot] [PATCH 1/2] qt5webkit: correct download URL and hash for 5.6 variant Peter Korsgaard 2017-11-27 9:33 ` Peter Korsgaard 2 siblings, 2 replies; 6+ messages in thread From: Peter Korsgaard @ 2017-11-16 14:23 UTC (permalink / raw) To: buildroot icu-59.x slightly changed the API, breaking qt5webkit builds. For details, see: https://bugreports.qt.io/browse/QTBUG-60532 Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- .../5.6.3/0004-Fix-compilation-with-ICU-59.patch | 93 ++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch diff --git a/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch b/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch new file mode 100644 index 0000000000..f3b590eadd --- /dev/null +++ b/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch @@ -0,0 +1,93 @@ +From bf172ae289a1348842005a9421797970f9b72060 Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev <annulen@yandex.ru> +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 <allan.jensen@qt.io> +Signed-off-by: Peter Korsgaard <peter@korsgaard.com> +--- + 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<const UChar*>(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<const UChar*>(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<const JSChar*>(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<const UChar*>(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<unsigned long> { static const bool value = true; }; + template<> struct IsInteger<long long> { static const bool value = true; }; + template<> struct IsInteger<unsigned long long> { 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<char16_t> { static const bool value = true; }; ++#endif + #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) + template<> struct IsInteger<wchar_t> { 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<UChar*>(buffer), bufferLength)); ++ return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength)); + } + + size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) +-- +2.11.0 + -- 2.11.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] qt5webkit: backport upstream icu-59 fix from 5.9 branch to 5.6.3 2017-11-16 14:23 ` [Buildroot] [PATCH 2/2] qt5webkit: backport upstream icu-59 fix from 5.9 branch to 5.6.3 Peter Korsgaard @ 2017-11-17 9:32 ` Peter Korsgaard 2017-11-27 9:33 ` Peter Korsgaard 1 sibling, 0 replies; 6+ messages in thread From: Peter Korsgaard @ 2017-11-17 9:32 UTC (permalink / raw) To: buildroot >>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes: > icu-59.x slightly changed the API, breaking qt5webkit builds. For details, see: > https://bugreports.qt.io/browse/QTBUG-60532 > Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] qt5webkit: backport upstream icu-59 fix from 5.9 branch to 5.6.3 2017-11-16 14:23 ` [Buildroot] [PATCH 2/2] qt5webkit: backport upstream icu-59 fix from 5.9 branch to 5.6.3 Peter Korsgaard 2017-11-17 9:32 ` Peter Korsgaard @ 2017-11-27 9:33 ` Peter Korsgaard 1 sibling, 0 replies; 6+ messages in thread From: Peter Korsgaard @ 2017-11-27 9:33 UTC (permalink / raw) To: buildroot >>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes: > icu-59.x slightly changed the API, breaking qt5webkit builds. For details, see: > https://bugreports.qt.io/browse/QTBUG-60532 > Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Committed to 2017.08.x, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] qt5webkit: correct download URL and hash for 5.6 variant 2017-11-16 14:23 [Buildroot] [PATCH 1/2] qt5webkit: correct download URL and hash for 5.6 variant Peter Korsgaard 2017-11-16 14:23 ` [Buildroot] [PATCH 2/2] qt5webkit: backport upstream icu-59 fix from 5.9 branch to 5.6.3 Peter Korsgaard @ 2017-11-17 9:32 ` Peter Korsgaard 2017-11-27 9:33 ` Peter Korsgaard 2 siblings, 0 replies; 6+ messages in thread From: Peter Korsgaard @ 2017-11-17 9:32 UTC (permalink / raw) To: buildroot >>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes: > Commit 06a4975d4bd03 (qt5: bump LTS version to 5.6.3) added an empty hash > for the 5.6.3 variant of qt5webkit, causing failures. > It also forgot to adjust the download URL as the qt5webkit tarballs are no > longer available under official_releases/ like the other submodules, but only > under community_releases/. > Fix both issues. > Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] qt5webkit: correct download URL and hash for 5.6 variant 2017-11-16 14:23 [Buildroot] [PATCH 1/2] qt5webkit: correct download URL and hash for 5.6 variant Peter Korsgaard 2017-11-16 14:23 ` [Buildroot] [PATCH 2/2] qt5webkit: backport upstream icu-59 fix from 5.9 branch to 5.6.3 Peter Korsgaard 2017-11-17 9:32 ` [Buildroot] [PATCH 1/2] qt5webkit: correct download URL and hash for 5.6 variant Peter Korsgaard @ 2017-11-27 9:33 ` Peter Korsgaard 2 siblings, 0 replies; 6+ messages in thread From: Peter Korsgaard @ 2017-11-27 9:33 UTC (permalink / raw) To: buildroot >>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes: > Commit 06a4975d4bd03 (qt5: bump LTS version to 5.6.3) added an empty hash > for the 5.6.3 variant of qt5webkit, causing failures. > It also forgot to adjust the download URL as the qt5webkit tarballs are no > longer available under official_releases/ like the other submodules, but only > under community_releases/. > Fix both issues. > Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Committed to 2017.02.x and 2017.08.x, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-11-27 9:33 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-11-16 14:23 [Buildroot] [PATCH 1/2] qt5webkit: correct download URL and hash for 5.6 variant Peter Korsgaard 2017-11-16 14:23 ` [Buildroot] [PATCH 2/2] qt5webkit: backport upstream icu-59 fix from 5.9 branch to 5.6.3 Peter Korsgaard 2017-11-17 9:32 ` Peter Korsgaard 2017-11-27 9:33 ` Peter Korsgaard 2017-11-17 9:32 ` [Buildroot] [PATCH 1/2] qt5webkit: correct download URL and hash for 5.6 variant Peter Korsgaard 2017-11-27 9:33 ` Peter Korsgaard
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox