From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 66D59139118 for ; Wed, 23 Oct 2019 23:32:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6633E0848; Wed, 23 Oct 2019 23:32:42 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C231DE0848 for ; Wed, 23 Oct 2019 23:32:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0EE0F34C2A6 for ; Wed, 23 Oct 2019 23:32:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9637D889 for ; Wed, 23 Oct 2019 23:32:36 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1571873540.e8bfdb22e96271b014eef1e73f9cef49bc76c4ad.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20190629-icu-65.patch dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild X-VCS-Directories: dev-qt/qtwebkit/files/ dev-qt/qtwebkit/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e8bfdb22e96271b014eef1e73f9cef49bc76c4ad X-VCS-Branch: master Date: Wed, 23 Oct 2019 23:32:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 664d17e7-38ae-4080-996d-30064d8969ab X-Archives-Hash: bb17203c52257152bb9ec034ecb1243b commit: e8bfdb22e96271b014eef1e73f9cef49bc76c4ad Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 22 19:46:14 2019 +0000 Commit: Andreas Sturmlechner gentoo 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 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-queue@webkit.org" + +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 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"