!7 Fix build with icu 65.1

Merge pull request !7 from ultra_planet/master

Fix-build-with-icu-65.1.patch

@@ -0,0 +1,55 @@
+From dc02ec4080010e33b737db6491d71d6bb961a77d 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):
+
+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 files 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;

qt5-qtwebkit.spec

@@ -5,7 +5,7 @@
 
 Name:           qt5-qtwebkit
 Version:        5.212.0
-Release:        2
+Release:        3
 Summary:        QtWebKit components of Qt5
 License:        LGPLv2 and BSD
 URL:            https://github.com/annulen/webkit
@@ -44,6 +44,8 @@ Patch0005:      0031-Disable-ES6-Proxy-object.patch
 Patch0006:      0111-ECM-Update-ECMGeneratePkgConfigFile-to-latest-versio.patch
 ## upstream patches (qtwebkit-stable branch)
 Patch0007:      0012-cmake-Fix-include-dir-in-the-generated-pkg-config-fi.patch
+## Fix build with icu 65.1
+Patch0008:      Fix-build-with-icu-65.1.patch
 
 %description
 QtWebKit components of Qt5.
@@ -112,6 +114,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)"
 %{_qt5_archdatadir}/mkspecs/modules/*.pri
 
 %changelog
+* Mon Aug 03 2020 lingsheng <lingsheng@huawei.com> - 5.212.0-3
+- Fix build with icu 65.1
+
 * Tue Mar 17 2020 Ling Yang <lingyang2@huawei.com> - 5.212.0-2
 - Fixed building error