Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
systemsmanagement:Ardana:8:CentOS:7.3
phantomjs
qt5-webkit-icu59.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File qt5-webkit-icu59.patch of Package phantomjs
From: Konstantin Tokarev <annulen@yandex.ru> Date: Thu, 4 May 2017 12:12:37 +0000 (+0300) Subject: Fix compilation with ICU 59 X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtwebkit.git;a=commitdiff_plain;h=96660f0082e1c8372795f20fdc64fa512e19e988;hp=f27089657a207ef8c5c9d27d661d3d12c3af8df2 Fix compilation with ICU 59 Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612 Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843 --- diff --git a/src/qt/qtwebkit/Source/JavaScriptCore/API/JSStringRef.cpp b/src/qt/qtwebkit/Source/JavaScriptCore/API/JSStringRef.cpp index 812f3d4..77a3fd0 100644 --- a/src/qt/qtwebkit/Source/JavaScriptCore/API/JSStringRef.cpp +++ b/src/qt/qtwebkit/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/src/qt/qtwebkit/Source/JavaScriptCore/runtime/DateConversion.cpp b/src/qt/qtwebkit/Source/JavaScriptCore/runtime/DateConversion.cpp index 0b57f01..05e2733 100644 --- a/src/qt/qtwebkit/Source/JavaScriptCore/runtime/DateConversion.cpp +++ b/src/qt/qtwebkit/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/src/qt/qtwebkit/Source/WTF/wtf/TypeTraits.h b/src/qt/qtwebkit/Source/WTF/wtf/TypeTraits.h index 9df2c95..e3eee6d 100644 --- a/src/qt/qtwebkit/Source/WTF/wtf/TypeTraits.h +++ b/src/qt/qtwebkit/Source/WTF/wtf/TypeTraits.h @@ -72,6 +72,7 @@ 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; }; + template<> struct IsInteger<char16_t> { static const bool value = true; }; #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) template<> struct IsInteger<wchar_t> { static const bool value = true; }; #endif diff --git a/src/qt/qtwebkit/Source/WebKit2/Shared/API/c/WKString.cpp b/src/qt/qtwebkit/Source/WebKit2/Shared/API/c/WKString.cpp index cbac67d..23400a6 100644 --- a/src/qt/qtwebkit/Source/WebKit2/Shared/API/c/WKString.cpp +++ b/src/qt/qtwebkit/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)
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor