dev-qt/qtwebkit: sync with upstream

5 files changed, 114 insertions, 7 deletions

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 26bc9ee0..f4781f18 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -4,8 +4,9 @@ AUX qtwebkit-5.4.2-system-leveldb.patch 711 SHA256 791a952174e5b50b0fc2a0e7b12fd
 AUX qtwebkit-5.5.0-fix-backtrace-detection-musl.patch 963 SHA256 191811606733d24b368bb25a4b0b737a504b1b78b5bb6ef88bb0450be1b6ff16 SHA512 5cfe5f73e9f9017a73034e45355a4e8772c43b6beface7e7964df54e396eb04e5ca2e39dd3e8e1e7ea2cc0893dc620d8cf65d72703e5fa94786957dbe2af3bd7 WHIRLPOOL 005fc53e8ed1e02bdd88ffa3189b28db063dc4695c3277f65f0a459b343a85a378b517e8328f6e9762e9c5b4868fb768531fe24943bed1d25949d6a0e8b01fb3
 AUX qtwebkit-5.5.1-disable-jit.patch 460 SHA256 d4f64d992bdfde58d87bfb3fe131200bda55324ddbc9a7204d26f9df6dc14ec4 SHA512 d9af937475bed746a0e47698b432370488b644a5aeeb008eaa201f4d264fe9f52525345b47757eec08b2adc8dc46d15a044e6ff5e49420f897f1bb416ca06749 WHIRLPOOL 5515613b1fddd09a5b05200dea5b843d875b4bd1e9e42d139fba77e47db15ab7967e2d9c21cc0194dac2f63d01d91d10c5ec48f4201801e2e41eed65f11cd7ec
 AUX qtwebkit-5.5.1-fix-stack-size-musl.patch 979 SHA256 bc19a89dc3fe8867b129f18f4ded4d582571989a9ea68ecee495e48468afdfe5 SHA512 f41eadec259da6bf14e709fa7e1f3ecef988a382a4952f641a7319253805a89dcabd273a23aa4523f2aa54e425ca84b76352ebd4d51b15a132ce74eef30e76ec WHIRLPOOL ae6fdda41dd661ceecf00bc7dd6c93c11115de5e3b91cb2167e4ac808a13db4056b2a4175e2fe1b36e07a5363f59a4cd917de4ce9c024f4e36bff125b944e038
+AUX qtwebkit-5.6.2-icu-59.patch 4683 SHA256 45af86da2d8b0621b213668808aee4136022c5a16b8baae11367d98acd5838b2 SHA512 189b523c8ee6ae8b62b93e8a46319a2a656280a6aca476fc2bc04d8066f497a9fd3f18029659558bedf985ba7c500eb2d541c4140158e2410cc01db29612f356 WHIRLPOOL 838c887a0af099c6a22e4516a2aa24428c5266f2d0eb99e68ccf21aa4c0ce625cac2cd1d763ec6fcf6843fd7409fb79092643c4e7b2aedad7d2313590c9e47ef
 DIST qtwebkit-opensource-src-5.6.2.tar.xz 35306252 SHA256 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966 SHA512 d3f795463c957b4927d61280df831d08282bf6c9e624cf1db2709ab56ab218eb028192a4efaef21e0bdb28edd42de8ec08995f37fc828bde99000cf6919c33c3 WHIRLPOOL 9667f2f68bb832fdf3f5de14da641afd3b71a0c270e436257bc37ae86ed7d8d3434cdcada3b8818ab73ac6866bd4a69892ae682618d6d6a00cccccd287bda4bf
 DIST qtwebkit-opensource-src-5.7.1.tar.xz 35298736 SHA256 a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03 SHA512 538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a WHIRLPOOL d2dce72777a6babb1c35025ff6d882b7f48895dca4425b9e29b099e45282e8538548a653f0757998d6a619d706544fad0363199d8979ccca94762ba39b6516bd
-EBUILD qtwebkit-5.6.2.ebuild 3331 SHA256 850f6d425db7f2544cbbb878b4dc7cab11b64207b4b0a706a036f3379e2dd1fc SHA512 f4c869ef19fbf63346d6a3e9c9894bce6285adcabfb40d125f3c060579123c3dfcf54ee36a5255ca9851cdc847bdbfcc3e253b7dd4ac4778b930b391d035a204 WHIRLPOOL ef6501a0e4792208207e7f15d6eed6afc7631deefb9b19af8b4300e550120b6c4616e3d2ac18bc8a9d7430c4451fbd5012da172c717e6e848af63ff20f6e51eb
-EBUILD qtwebkit-5.7.1.ebuild 3335 SHA256 8a7e340b36bb39f40e3934738983e8e6f70812b591ad72b71e9afa8553a9a433 SHA512 5728411789befd23eb385cc68cc8f0bdaeb77073a936890530e641d2d261f1c5526e8714a287cb487221b0a11ae227feee994acdb20deec9d0b23bcbfd37c415 WHIRLPOOL 0979a4da56902dfb48b349f71764e093e8f6146800973d051acceba73e03ae100d34ac863695d7d68bdbecd614020324cc6fdebc01a92468a7b61d110749816d
-MISC metadata.xml 1333 SHA256 8fefd129187060620948d41b0587b51f1e408bdecbd2a2ac04884753ea7f4e03 SHA512 1e62e92fb25869311204d842684e2cd56b888bd8ae3acb69304edd84b77c1a97eb9cfe0d572837a8ca960448f290306e23699d457b6f1a82a8cf9724b277aaff WHIRLPOOL 8d603d7bf6407edcb288ecbbd699d6f1240a24cb486657b091f97136a2ad428c749c79acd0c1160e6e76edf15eea882555d96b191499ae72c2d76a719020af0d
+EBUILD qtwebkit-5.6.2.ebuild 3377 SHA256 dc14e53d257db7b00419c05e401ae23c8a1aba786f592570e5e3835f9e0c0d78 SHA512 f48dffc5e8bd2ebc20306d13b055db0cdf1f4bf1c401ccbdc29ee285a1b5f6b2cc200c194ca582148914a7370aab0130fa6c84ac63f4cf3292bc04022871b6ad WHIRLPOOL b2262eaf8596f2ebc25c770e549fce793ba59378322a80a10f8eb42c0bfc77fa9a97fa83808527a0b8ca84e338c801f6c933e08c35d92b23d61bae3dc71c2c18
+EBUILD qtwebkit-5.7.1.ebuild 3659 SHA256 383b2b08d2d9be3af4bd46518a216ad25bb05a069ab725a834d74eeecd951933 SHA512 24e228f01ed0fd34c28fd63d6545e2848f84ea67cda2f4c3d8816f5d8456b3028f252e3f7e3e067b3594126d01e7e9e684a52fbf4d346b28f498ba90a74848d5 WHIRLPOOL 1d2083526b0f56d602e9f6d7743f26f2478eb589a302a37d5d4cfc2d8b21c59329068e34d19f55782d2fef22fd49cec01938ca5eaf7d06eb3b82dd1d9a1dae6d
+MISC metadata.xml 1466 SHA256 612a469c263c500dda7de545c7d505edf035ee1a6fa2307847e0fcb7731a5849 SHA512 6540b79626a2478da6ec737b025a17704233a7f8de93573d3cb06ba0223031a34f7f2eccbecc8e88f22b0a93173141d4b2f909e5ea9faef44b18ceefb1da79ed WHIRLPOOL 3f72a600410c7afd6923132853495059e476b9dcd096f294542f30aa829e269d6c7d9061c2796d977e740655ccd32ed5cac0ca66696613ed0ae26c78350c43b2
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch b/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch
new file mode 100644
index 00000000..2a2709b3
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.6.2-icu-59.patch
@@ -0,0 +1,92 @@
+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>
+---
+ 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.13.1
+
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 534bff92..cd82bd3b 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -6,6 +6,8 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
+		<flag name="exceptions">Add support for exceptions - like catching them
+			inside the event loop (recommended by upstream)</flag>
 		<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
 		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag>
 		<flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg> using SLOT 0.10</flag>
@@ -18,7 +20,7 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://doc.qt.io/</doc>
+		<doc>https://doc.qt.io/</doc>
 	</upstream>
 	<slots>
 		<subslots>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild
index fd6068f1..97ecca8d 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.6.2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
 SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ppc64 x86"
+	KEYWORDS="amd64 arm ppc64 x86"
 fi
 
 # TODO: qttestlib
@@ -66,6 +66,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
+	"${FILESDIR}/${PN}-5.6.2-icu-59.patch" # bug 618644
 	"${FILESDIR}/${PN}-5.5.0-fix-backtrace-detection-musl.patch"
 	"${FILESDIR}/${PN}-5.5.1-fix-stack-size-musl.patch"
 )
diff --git a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild
index 7fa0dc68..202227ea 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
 SRC_URI="https://download.qt.io/community_releases/${PV%.*}/${PV}/${PN}-opensource-src-${PV}.tar.xz"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm ~arm64 ppc64 x86"
 fi
 
 # TODO: qttestlib
@@ -66,6 +66,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
+	"${FILESDIR}/${PN}-5.6.2-icu-59.patch" # bug 618644
 	"${FILESDIR}/${PN}-5.5.0-fix-backtrace-detection-musl.patch"
 	"${FILESDIR}/${PN}-5.5.1-fix-stack-size-musl.patch"
 )
@@ -108,3 +109,13 @@ src_prepare() {
 
 	qt5-build_src_prepare
 }
+
+src_install() {
+	qt5-build_src_install
+
+	# bug 572056
+	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebKit.so ]]; then
+		eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment."
+		die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH'
+	fi
+}