Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 476010 Details for
Bug 618644
dev-qt/qtwebkit-5.7.1:5 fails to build with ICU >=59
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
upstream patch
qtwebkit-5.7.1-icu59.patch (text/plain), 4.49 KB, created by
Andreas K. Hüttel
on 2017-06-11 10:26:35 UTC
(
hide
)
Description:
upstream patch
Filename:
MIME Type:
Creator:
Andreas K. Hüttel
Created:
2017-06-11 10:26:35 UTC
Size:
4.49 KB
patch
obsolete
>From eba3355cd46595332760ab4a37893d0be6a76577 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 >--- > 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..360414c07 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(_MSC_VER) && (_MSC_VER >= 1900)) >+ 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.13.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 618644
:
472774
|
472778
|
476010