1 |
commit: 442114d9e7d9bc2062d990d22451211b22ffcf51 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 29 19:03:19 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 29 22:21:34 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=442114d9 |
7 |
|
8 |
net-libs/webkit-gtk: Add upstream patch to fix build against ICU-65 |
9 |
|
10 |
https://bugs.webkit.org/show_bug.cgi?id=202600 |
11 |
|
12 |
Acked-by: Mart Raudsepp <leio <AT> gentoo.org> |
13 |
Closes: https://bugs.gentoo.org/698596 |
14 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
16 |
|
17 |
.../files/webkit-gtk-2.24.4-icu-65.patch | 53 ++++++++++++++++++++++ |
18 |
net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild | 1 + |
19 |
2 files changed, 54 insertions(+) |
20 |
|
21 |
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 |
22 |
new file mode 100644 |
23 |
index 00000000000..475c9851e63 |
24 |
--- /dev/null |
25 |
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch |
26 |
@@ -0,0 +1,53 @@ |
27 |
+From 9b60e834454dc93f46f05b1cfdc0aad0c6b7de97 Mon Sep 17 00:00:00 2001 |
28 |
+From: Heiko Becker <heirecka@×××××××.org> |
29 |
+Date: Fri, 4 Oct 2019 22:17:11 +0200 |
30 |
+Subject: [PATCH] Add missing semicolons to fix build with icu 65.1 |
31 |
+ |
32 |
+--- |
33 |
+ Source/WTF/wtf/URLHelpers.cpp | 2 +- |
34 |
+ Source/WebCore/dom/Document.cpp | 6 +++--- |
35 |
+ 4 files changed, 25 insertions(+), 4 deletions(-) |
36 |
+ |
37 |
+diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp |
38 |
+index 18e7f13cd61..c584f1a0cb7 100644 |
39 |
+--- a/Source/WTF/wtf/URLHelpers.cpp |
40 |
++++ b/Source/WTF/wtf/URLHelpers.cpp |
41 |
+@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt |
42 |
+ Optional<UChar32> previousCodePoint; |
43 |
+ while (i < length) { |
44 |
+ UChar32 c; |
45 |
+- U16_NEXT(buffer, i, length, c) |
46 |
++ U16_NEXT(buffer, i, length, c); |
47 |
+ UErrorCode error = U_ZERO_ERROR; |
48 |
+ UScriptCode script = uscript_getScript(c, &error); |
49 |
+ if (error != U_ZERO_ERROR) { |
50 |
+diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp |
51 |
+index 0fd0fa090bf..01f76850f3d 100644 |
52 |
+--- a/Source/WebCore/dom/Document.cpp |
53 |
++++ b/Source/WebCore/dom/Document.cpp |
54 |
+@@ -4954,12 +4954,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) |
55 |
+ unsigned i = 0; |
56 |
+ |
57 |
+ UChar32 c; |
58 |
+- U16_NEXT(characters, i, length, c) |
59 |
++ U16_NEXT(characters, i, length, c); |
60 |
+ if (!isValidNameStart(c)) |
61 |
+ return false; |
62 |
+ |
63 |
+ while (i < length) { |
64 |
+- U16_NEXT(characters, i, length, c) |
65 |
++ U16_NEXT(characters, i, length, c); |
66 |
+ if (!isValidNamePart(c)) |
67 |
+ return false; |
68 |
+ } |
69 |
+@@ -5019,7 +5019,7 @@ ExceptionOr<std::pair<AtomString, AtomString>> Document::parseQualifiedName(cons |
70 |
+ |
71 |
+ for (unsigned i = 0; i < length; ) { |
72 |
+ UChar32 c; |
73 |
+- U16_NEXT(qualifiedName, i, length, c) |
74 |
++ U16_NEXT(qualifiedName, i, length, c); |
75 |
+ if (c == ':') { |
76 |
+ if (sawColon) |
77 |
+ return Exception { InvalidCharacterError }; |
78 |
+-- |
79 |
+2.23.0 |
80 |
|
81 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild |
82 |
index f8ed8e6fec9..d90cc8c26a4 100644 |
83 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild |
84 |
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild |
85 |
@@ -159,6 +159,7 @@ pkg_setup() { |
86 |
} |
87 |
|
88 |
src_prepare() { |
89 |
+ eapply "${FILESDIR}/${P}-icu-65.patch" # bug 698596 |
90 |
cmake-utils_src_prepare |
91 |
gnome2_src_prepare |
92 |
} |