gentoo resync : 03.11.2019

3 files changed, 60 insertions, 2 deletions

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index ebb26f7ad526..768d6c34f5d0 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -2,8 +2,9 @@ AUX qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch 4466 BL
 AUX qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch 1164 BLAKE2B d0d12652387ed24a21548746687fb4689d3d9198e66ba5bb3fa6ec3aeb83db610f5f9e9910ec6c5f240ac6a0f2af855afa4413f971585588fe0d9bd6b718203c SHA512 52f34491d15cc8ca381347427cb440788f8ac6d7d8e52bab067fe997e321bd9e693c9d48669b6bbc23f060c9475d25563496e368b7a94198aff25a21a1491e3e
 AUX qtwebkit-5.212.0_pre20180120-functional.patch 723 BLAKE2B dec67933a798f485e59ea87fbcc2f9475f426427cbc80dff39808b48bcf4dd74f802b648db11f2611e85364e978f55eab029e09c7c88d9524a961bb6627682c1 SHA512 7f54f26a18f91ba7dd71e1c82c22533b13707d045c0d693c4102bd95c9a77ba74678c90394ea65816e9fa80845d46735d7c8b178e1b5ad34e6214e9a5ae8947f
 AUX qtwebkit-5.212.0_pre20180120-js-build-error.patch 2124 BLAKE2B 2c09bff3d9bcc950b7305c7aa943d5af8d47572b2b38063fe4de0e8d48768e9fd337e09fdcc314bd9ceda3e51f8bd6731beb4660a95104c0f1d8e6063d01c294 SHA512 01e090b390dcb78a998203806baa0677d39aa680107ee523e4fe1c26d9fa8750836a715a107eb00487e1ef100cdbfcb8ee9d2d9bb47f5f336dd153b591fb26d3
+AUX qtwebkit-5.212.0_pre20190629-icu-65.patch 1845 BLAKE2B c5bf1f575f55d61d57b6f603c66a18079e746c5cc7e124dd8cf950c4db7927d7fc2ad04606dacbcf41765d4d0e81d4106f5d08752066ab140b69581cf5a3051f SHA512 d934cfb5ef1373617db6b2cfc0ff5d542595b06b180bdd00124f91e9587936e6ab1b92842cdc18127d52db80d86e242febc39ac2f6697ee57489cdc1421c5c14
 DIST qtwebkit-5.212.0-alpha3.tar.xz 12457896 BLAKE2B 1b6ce78706a9696f0eb1fbe287d0d095d0089daf645a9ca60f9f31b9057669180b14d67a3bdfb387fc09dbbeee658c0e895a95edc46b2020f06f2b58188ba65d SHA512 38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f
 DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047
 EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3978 BLAKE2B f07d92bb3373319701138006ebd3408e25b728d58c1755134966be06b9b70c94dc0e7fc4baec54241db37f37261d9cb7e8e494798ada848bb2dd655bbb67c89d SHA512 3825142883d045a5fedd02848000d212173e6552bfb4b330041e6e1d9930d6fedeb4f0d8c15f41eb00375cb74f5e177c0ce56f37a722c9a5c5c43612bacb5d12
-EBUILD qtwebkit-5.212.0_pre20190629.ebuild 3723 BLAKE2B 51e8f64a16ebdce32ed0ec8dd2e6bea15afa8716cd6e9c5ded08174dd4b8b3f25925a582581d30c6b6017574ac70f3d211c1da65f55130b66e9d2065e1a6f280 SHA512 15468c603a52cdf8b51aa33ad29398a1899b18a232f3c2605d7c5198792ae3ff63eb1373d1b8b1e8e905215702360325e04ebd76adf0cc0ef75930b8363e4d46
+EBUILD qtwebkit-5.212.0_pre20190629.ebuild 3766 BLAKE2B 8db1082a7451770aa2ece8be804594b5d67a13164dc2face2908ad3bd89341b15ff69fcabb929cbc2032f77ad0a016b5927c22f1f2d71ad24bb48d2a09632645 SHA512 7e771a67e33e62e53a973b35eb0fc539e6d791388a355b9a1afbf00362e7981aed4bfa39dccfe8bebddda9ac5513e6b894660ffca64331d75f66d7a214fbb1d2
 MISC metadata.xml 1225 BLAKE2B 29d533721955dea3cd9f1d23494438d3abc079d713cf77d707920a765e3eba4e2160d0f80b05ec2ba8cbcf7999aad51201bbf002e8b59161bb2d0d85cd945e50 SHA512 b382f115f4705a577e210760d499fde421d0091818914674f0c2eb7fc4967d19d5dbf752be19f43f0edb27493ebec58b89e07a65ffa505842a089d06353aa122
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch
new file mode 100644
index 000000000000..1891f73d5a44
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch
@@ -0,0 +1,55 @@
+From dc02ec4080010e33b737db6491d71d6bb961a77d Mon Sep 17 00:00:00 2001
+From: "commit-queue@webkit.org"
+ <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Fri, 4 Oct 2019 21:51:37 +0000
+Subject: [PATCH] Fix build with icu 65.1
+ https://bugs.webkit.org/show_bug.cgi?id=202600
+
+Patch by Heiko Becker <heirecka@exherbo.org> on 2019-10-04
+Reviewed by Konstantin Tokarev.
+
+Source/WebCore:
+
+* dom/Document.cpp:
+(WebCore::isValidNameNonASCII):
+(WebCore::Document::parseQualifiedName):
+
+Source/WTF:
+
+* wtf/URLHelpers.cpp:
+(WTF::URLHelpers::allCharactersInIDNScriptWhiteList):
+
+Change-Id: I1b087322cbae43fbe155facdf933717ac8569b6c
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@250747 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WebCore/dom/Document.cpp |  6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
+index 1bca2d0a66f8..19355f166019 100644
+--- a/Source/WebCore/dom/Document.cpp
++++ b/Source/WebCore/dom/Document.cpp
+@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
+     unsigned i = 0;
+ 
+     UChar32 c;
+-    U16_NEXT(characters, i, length, c)
++    U16_NEXT(characters, i, length, c);
+     if (!isValidNameStart(c))
+         return false;
+ 
+     while (i < length) {
+-        U16_NEXT(characters, i, length, c)
++        U16_NEXT(characters, i, length, c);
+         if (!isValidNamePart(c))
+             return false;
+     }
+@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S
+ 
+     for (unsigned i = 0; i < length;) {
+         UChar32 c;
+-        U16_NEXT(qualifiedName, i, length, c)
++        U16_NEXT(qualifiedName, i, length, c);
+         if (c == ':') {
+             if (sawColon) {
+                 ec = NAMESPACE_ERR;
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
index ce0302f95ae5..bcf7027ae698 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar
 
 LICENSE="BSD LGPL-2+"
 SLOT="5/5.212"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
 IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X"
 
 REQUIRED_USE="
@@ -77,6 +77,8 @@ S="${WORKDIR}/${MY_P}"
 
 CHECKREQS_DISK_BUILD="16G" # bug 417307
 
+PATCHES=( "${FILESDIR}/${P}-icu-65.patch" )
+
 _check_reqs() {
 	if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0"; then
 		einfo "Checking for sufficient disk space to build ${PN} with debugging flags"