From 05dc32537ed98fb7b765b97ccf799292dd47b643ee902e7d303f8af99cc5f433 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 12 Nov 2019 12:31:31 +0000
Subject: [PATCH] Accepting request 747647 from GNOME:Next

- Add webkit2gtk3-icu-build-fix.patch: fix build with icu 65.1.

OBS-URL: https://build.opensuse.org/request/show/747647
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=238
---
 webkit2gtk3-icu-build-fix.patch | 73 +++++++++++++++++++++++++++++++++
 webkit2gtk3.changes             |  5 +++
 webkit2gtk3.spec                |  2 +
 3 files changed, 80 insertions(+)
 create mode 100644 webkit2gtk3-icu-build-fix.patch

diff --git a/webkit2gtk3-icu-build-fix.patch b/webkit2gtk3-icu-build-fix.patch
new file mode 100644
index 0000000..a07c589
--- /dev/null
+++ b/webkit2gtk3-icu-build-fix.patch
@@ -0,0 +1,73 @@
+From 730b80e691a4b9dd0e9727cfcd9806dfa542397b Mon Sep 17 00:00:00 2001
+From: "commit-queue@webkit.org"
+ <commit-queue@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 <heirecka@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):
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@250747 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WTF/ChangeLog            | 10 ++++++++++
+ Source/WTF/wtf/URLHelpers.cpp   |  2 +-
+ Source/WebCore/ChangeLog        | 11 +++++++++++
+ 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 2443e24c9bc..1fbb3a71600 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/webkit2gtk3.changes b/webkit2gtk3.changes
index bc5c177..7f91993 100644
--- a/webkit2gtk3.changes
+++ b/webkit2gtk3.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 11 22:31:54 UTC 2019 - Michael Gorse <mgorse@suse.com>
+
+- Add webkit2gtk3-icu-build-fix.patch: fix build with icu 65.1.
+
 -------------------------------------------------------------------
 Thu Nov  7 16:38:56 UTC 2019 - Michael Gorse <mgorse@suse.com>
 
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index a93fbc1..b128f7d 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -43,6 +43,8 @@ Source98:       baselibs.conf
 Source99:       webkit2gtk3.keyring
 # PATCH-FIX-OPENSUSE webkit2gtk3-fdo-soname.patch mgorse@suse.com -- don't call dlopen with an unversioned soname.
 Patch0:         webkit2gtk3-fdo-soname.patch
+# PATCh-FIX-UPSTREAM webkit2gtk3-icu-build-fix.patch mgorse@suse.com -- fix build with icu 65.1.
+Patch1:         webkit2gtk3-icu-build-fix.patch
 
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  Mesa-libGL-devel