[pkgsrc/trunk]: pkgsrc/www/webkit24-gtk Fix ICU fallout

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3b13791bcf36
branches:  trunk
changeset: 428925:3b13791bcf36
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Apr 13 19:11:55 2020 +0000

description:
Fix ICU fallout

diffstat:

 www/webkit24-gtk/distinfo                                                             |   4 +-
 www/webkit24-gtk/patches/patch-Source_WebCore_dom_Document.cpp                        |  28 ++++++++++
 www/webkit24-gtk/patches/patch-Source_WebCore_platform_graphics_SegmentedFontData.cpp |  13 ++++
 3 files changed, 44 insertions(+), 1 deletions(-)

diffs (67 lines):

diff -r d4a24db298c8 -r 3b13791bcf36 www/webkit24-gtk/distinfo
--- a/www/webkit24-gtk/distinfo Mon Apr 13 19:11:31 2020 +0000
+++ b/www/webkit24-gtk/distinfo Mon Apr 13 19:11:55 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2018/08/16 11:49:13 he Exp $
+$NetBSD: distinfo,v 1.8 2020/04/13 19:11:55 joerg Exp $
 
 SHA1 (webkitgtk-2.4.11.tar.xz) = e425ae86084ab6335dadb368c9e8f53600665d54
 RMD160 (webkitgtk-2.4.11.tar.xz) = e1f72498f911465f5ba152313dd9c62ae8d5eee6
@@ -16,6 +16,8 @@
 SHA1 (patch-Source_WTF_wtf_Platform.h) = 5eabed49099e03ddcf9c973ecca0508174a09ed6
 SHA1 (patch-Source_WTF_wtf_dtoa_utils.h) = 3e00331ef4ea5dd71a07f0952da089ccd67a9e66
 SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 2835657e04cdbc0cc7be8a6793061f0b98f84224
+SHA1 (patch-Source_WebCore_dom_Document.cpp) = c7f810b09a17b0a0e7534cfeacc7a2f2ac833c60
+SHA1 (patch-Source_WebCore_platform_graphics_SegmentedFontData.cpp) = dd37d10a794d832e87b4074ff08e8f2f2630b0e7
 SHA1 (patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp) = 6d3b9ee1559a18c17229698e44246f13c77278c9
 SHA1 (patch-Source_autotools_SetupCompilerFlags.m4) = 2802b09bc3bcb92a291f471cef4f3dbf6201a582
 SHA1 (patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp) = 994d1671ff2d8e3a961b9b7ed34f69215ed46f91
diff -r d4a24db298c8 -r 3b13791bcf36 www/webkit24-gtk/patches/patch-Source_WebCore_dom_Document.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/webkit24-gtk/patches/patch-Source_WebCore_dom_Document.cpp    Mon Apr 13 19:11:55 2020 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-Source_WebCore_dom_Document.cpp,v 1.1 2020/04/13 19:11:55 joerg Exp $
+
+--- Source/WebCore/dom/Document.cpp.orig       2020-04-13 01:14:26.456239680 +0000
++++ Source/WebCore/dom/Document.cpp
+@@ -3912,12 +3912,12 @@ static bool isValidNameNonASCII(const UC
+     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;
+     }
+@@ -3980,7 +3980,7 @@ bool Document::parseQualifiedName(const 
+     const UChar* s = qualifiedName.deprecatedCharacters();
+     for (unsigned i = 0; i < length;) {
+         UChar32 c;
+-        U16_NEXT(s, i, length, c)
++        U16_NEXT(s, i, length, c);
+         if (c == ':') {
+             if (sawColon) {
+                 ec = NAMESPACE_ERR;
diff -r d4a24db298c8 -r 3b13791bcf36 www/webkit24-gtk/patches/patch-Source_WebCore_platform_graphics_SegmentedFontData.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/webkit24-gtk/patches/patch-Source_WebCore_platform_graphics_SegmentedFontData.cpp     Mon Apr 13 19:11:55 2020 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-Source_WebCore_platform_graphics_SegmentedFontData.cpp,v 1.1 2020/04/13 19:11:55 joerg Exp $
+
+--- Source/WebCore/platform/graphics/SegmentedFontData.cpp.orig        2020-04-13 00:58:40.822544476 +0000
++++ Source/WebCore/platform/graphics/SegmentedFontData.cpp
+@@ -61,7 +61,7 @@ bool SegmentedFontData::containsCharacte
+ {
+     UChar32 c;
+     for (int i = 0; i < length; ) {
+-        U16_NEXT(characters, i, length, c)
++        U16_NEXT(characters, i, length, c);
+         if (!containsCharacter(c))
+             return false;
+     }