commit: e8bfdb22e96271b014eef1e73f9cef49bc76c4ad Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Oct 22 19:46:14 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Oct 23 23:32:20 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8bfdb22
dev-qt/qtwebkit: Fix build against ICU-65 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../qtwebkit-5.212.0_pre20190629-icu-65.patch | 55 ++++++++++++++++++++++ .../qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild | 2 + 2 files changed, 57 insertions(+) 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 00000000000..1891f73d5a4 --- /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-qu...@webkit.org" + <commit-qu...@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 <heire...@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 025efa83545..bcf7027ae69 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild @@ -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"
