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 6DAC4138334 for ; Tue, 29 Oct 2019 22:22:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D90BAE089C; Tue, 29 Oct 2019 22:22:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 9938BE0880 for ; Tue, 29 Oct 2019 22:22:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6498134C563 for ; Tue, 29 Oct 2019 22:22:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D77AE773 for ; Tue, 29 Oct 2019 22:22:26 +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: <1572387694.442114d9e7d9bc2062d990d22451211b22ffcf51.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild X-VCS-Directories: net-libs/webkit-gtk/files/ net-libs/webkit-gtk/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 442114d9e7d9bc2062d990d22451211b22ffcf51 X-VCS-Branch: master Date: Tue, 29 Oct 2019 22:22:26 +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: f090d969-14e8-499b-99b1-557fc59e28b1 X-Archives-Hash: ad571512beb5610e3c8398df75220e32 commit: 442114d9e7d9bc2062d990d22451211b22ffcf51 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 29 19:03:19 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 29 22:21:34 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=442114d9 net-libs/webkit-gtk: Add upstream patch to fix build against ICU-65 https://bugs.webkit.org/show_bug.cgi?id=202600 Acked-by: Mart Raudsepp gentoo.org> Closes: https://bugs.gentoo.org/698596 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/webkit-gtk-2.24.4-icu-65.patch | 53 ++++++++++++++++++++++ net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild | 1 + 2 files changed, 54 insertions(+) diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch new file mode 100644 index 00000000000..475c9851e63 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch @@ -0,0 +1,53 @@ +From 9b60e834454dc93f46f05b1cfdc0aad0c6b7de97 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Fri, 4 Oct 2019 22:17:11 +0200 +Subject: [PATCH] Add missing semicolons to fix build with icu 65.1 + +--- + Source/WTF/wtf/URLHelpers.cpp | 2 +- + Source/WebCore/dom/Document.cpp | 6 +++--- + 4 files changed, 25 insertions(+), 4 deletions(-) + +diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp +index 18e7f13cd61..c584f1a0cb7 100644 +--- a/Source/WTF/wtf/URLHelpers.cpp ++++ b/Source/WTF/wtf/URLHelpers.cpp +@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt + Optional previousCodePoint; + while (i < length) { + UChar32 c; +- U16_NEXT(buffer, i, length, c) ++ U16_NEXT(buffer, i, length, c); + UErrorCode error = U_ZERO_ERROR; + UScriptCode script = uscript_getScript(c, &error); + if (error != U_ZERO_ERROR) { +diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp +index 0fd0fa090bf..01f76850f3d 100644 +--- a/Source/WebCore/dom/Document.cpp ++++ b/Source/WebCore/dom/Document.cpp +@@ -4954,12 +4954,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; + } +@@ -5019,7 +5019,7 @@ ExceptionOr> Document::parseQualifiedName(cons + + for (unsigned i = 0; i < length; ) { + UChar32 c; +- U16_NEXT(qualifiedName, i, length, c) ++ U16_NEXT(qualifiedName, i, length, c); + if (c == ':') { + if (sawColon) + return Exception { InvalidCharacterError }; +-- +2.23.0 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild index f8ed8e6fec9..d90cc8c26a4 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild @@ -159,6 +159,7 @@ pkg_setup() { } src_prepare() { + eapply "${FILESDIR}/${P}-icu-65.patch" # bug 698596 cmake-utils_src_prepare gnome2_src_prepare }