[jhbuild] core-deps-latest: Fix WebKit build with icu 65.1



commit e8b48870602c3a8e474e54cf1c6151b98651aae9
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Tue Oct 8 07:25:15 2019 +0800

    core-deps-latest: Fix WebKit build with icu 65.1
    
    https://bugs.webkit.org/show_bug.cgi?id=202600
    https://trac.webkit.org/changeset/250747/webkit

 modulesets/gnome-suites-core-deps-latest.modules |  4 +-
 patches/WebKit-icu-65.1-fix.patch                | 62 ++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)
---
diff --git a/modulesets/gnome-suites-core-deps-latest.modules 
b/modulesets/gnome-suites-core-deps-latest.modules
index e36c0e9c..d75aad90 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -2116,7 +2116,9 @@
     <branch repo="webkitgtk.org"
             module="webkitgtk-2.27.1.tar.xz" version="2.27.1"
             hash="sha256:8a008adc8e6fb971e53fa3ba26995ef143f57aa27ea0fd89578cf2f2dc3d77cc"
-            size="20712056"/>
+            size="20712056">
+      <patch file="WebKit-icu-65.1-fix.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="c++"/>
       <dep package="at-spi2-core"/>
diff --git a/patches/WebKit-icu-65.1-fix.patch b/patches/WebKit-icu-65.1-fix.patch
new file mode 100644
index 00000000..d5250be8
--- /dev/null
+++ b/patches/WebKit-icu-65.1-fix.patch
@@ -0,0 +1,62 @@
+------------------------------------------------------------------------
+r250747 | commit-queue webkit org | 2019-10-05 05:51:37 +0800 (六, 05 10月 2019) | 16 lines
+
+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):
+
+Index: trunk/Source/WTF/wtf/URLHelpers.cpp
+===================================================================
+--- trunk/Source/WTF/wtf/URLHelpers.cpp        (revision 250746)
++++ trunk/Source/WTF/wtf/URLHelpers.cpp        (revision 250747)
+@@ -301,7 +301,7 @@
+     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) {
+Index: trunk/Source/WebCore/dom/Document.cpp
+===================================================================
+--- trunk/Source/WebCore/dom/Document.cpp      (revision 250746)
++++ trunk/Source/WebCore/dom/Document.cpp      (revision 250747)
+@@ -4954,12 +4954,12 @@
+     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 @@
+ 
+     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 };
+------------------------------------------------------------------------


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]