public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
Date: Tue, 29 Oct 2019 22:22:26 +0000 (UTC)	[thread overview]
Message-ID: <1572387694.442114d9e7d9bc2062d990d22451211b22ffcf51.asturm@gentoo> (raw)

commit:     442114d9e7d9bc2062d990d22451211b22ffcf51
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 19:03:19 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <leio <AT> gentoo.org>
Closes: https://bugs.gentoo.org/698596
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 <heirecka@exherbo.org>
+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<UChar32> 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<std::pair<AtomString, AtomString>> 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
 }


             reply	other threads:[~2019-10-29 22:22 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-29 22:22 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-06 11:18 [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/ Sam James
2024-10-09 15:09 Michael Orlitzky
2024-06-25 16:45 Jakov Smolić
2024-04-20 11:42 Mart Raudsepp
2024-02-23 19:07 Sam James
2023-08-09 18:07 Matt Turner
2023-07-16 14:38 Matt Turner
2023-04-25 21:38 Matt Turner
2023-04-22  3:08 Matt Turner
2023-01-30  4:01 Sam James
2022-08-02 20:17 Matt Turner
2022-05-13 12:27 Matt Turner
2022-01-18 21:39 Mart Raudsepp
2022-01-05 16:22 Mart Raudsepp
2022-01-02 22:46 Mart Raudsepp
2021-05-31  2:00 Matt Turner
2021-05-12 22:00 Matt Turner
2020-11-27 20:54 Mart Raudsepp
2020-07-29 14:09 Mart Raudsepp
2020-07-19  6:00 Mart Raudsepp
2020-07-11 13:34 Mart Raudsepp
2020-01-31 19:19 Mart Raudsepp
2020-01-19 18:49 Mart Raudsepp
2019-11-23 19:28 Matt Turner
2018-07-25 16:47 Mart Raudsepp
2017-10-29 22:11 Mart Raudsepp
2017-04-17  8:10 Mart Raudsepp
2016-08-27 20:20 Sergei Trofimovich
2015-08-25  0:45 Alexandre Rostovtsev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1572387694.442114d9e7d9bc2062d990d22451211b22ffcf51.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox