commit phantomjs for openSUSE:Factory

Hello community, here is the log from the commit of package phantomjs for openSUSE:Factory checked in at 2017-06-01 16:33:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phantomjs (Old) and /work/SRC/openSUSE:Factory/.phantomjs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phantomjs" Thu Jun 1 16:33:28 2017 rev:6 rq:500032 version:2.1.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/phantomjs/phantomjs.changes 2017-01-25 23:34:38.328548661 +0100 +++ /work/SRC/openSUSE:Factory/.phantomjs.new/phantomjs.changes 2017-06-01 16:33:35.263899173 +0200 @@ -1,0 +2,6 @@ +Wed May 31 08:29:50 UTC 2017 - qantas94heavy@gmail.com + +- Add qt5-webkit-icu59.patch: + * Fix build with ICU 59 (boo#1041280) + +------------------------------------------------------------------- New: ---- qt5-webkit-icu59.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phantomjs.spec ++++++ --- /var/tmp/diff_new_pack.90NC3j/_old 2017-06-01 16:33:39.111356435 +0200 +++ /var/tmp/diff_new_pack.90NC3j/_new 2017-06-01 16:33:39.111356435 +0200 @@ -37,6 +37,7 @@ Source1: https://github.com/Vitallium/qtbase/archive/%{commit1}.tar.gz#/qtbase-%{commit1}.tar.gz Source2: https://github.com/Vitallium/qtwebkit/archive/%{commit2}.tar.gz#/qtwebkit-%{commit2}.tar.gz Patch1: unset-QT_QPA_PLATFORM.patch +Patch2: qt5-webkit-icu59.patch BuildRequires: bison BuildRequires: flex @@ -66,6 +67,8 @@ tar -zxf %{SOURCE2} -C src/qt/qtwebkit --strip-components=1 %patch1 -p1 +# https://bugreports.qt.io/browse/QTBUG-60532 +%patch2 -p1 %build # github issue #13930 ++++++ qt5-webkit-icu59.patch ++++++ From: Konstantin Tokarev 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_pl... 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(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/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(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 { static const bool value = true; }; #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) template<> struct IsInteger { 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(buffer), bufferLength)); + return (toImpl(stringRef)->getCharacters(reinterpret_cast(buffer), bufferLength)); } size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)