[packages/gtk-webkit] attempt to fix build against icu 65; rel 7

[atler]

commit 4a318b531afa39fc041ca39937b3309bcf2b9b7f
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Oct 8 16:21:59 2019 +0200

    attempt to fix build against icu 65; rel 7

 gtk-webkit-icu65.patch | 39 +++++++++++++++++++++++++++++++++++++++
 gtk-webkit.spec        |  4 +++-
 2 files changed, 42 insertions(+), 1 deletion(-)
---
diff --git a/gtk-webkit.spec b/gtk-webkit.spec
index ade3fca..c3b6ea0 100644
--- a/gtk-webkit.spec
+++ b/gtk-webkit.spec
@@ -12,7 +12,7 @@ Summary(pl.UTF-8):	Port osadzalnego komponentu WWW WebKit do GTK+ 2
 Name:		gtk-webkit
 # note: 2.4.x is the last series with webkitgtk-1 API and GTK+ 2.x support
 Version:	2.4.11
-Release:	6
+Release:	7
 License:	BSD-like
 Group:		X11/Libraries
 Source0:	http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
@@ -20,6 +20,7 @@ Source0:	http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 Patch0:		x32.patch
 Patch1:		abs.patch
 Patch2:		%{name}-icu59.patch
+Patch3:		%{name}-icu65.patch
 URL:		http://webkitgtk.org/
 BuildRequires:	/usr/bin/ld.gold
 BuildRequires:	EGL-devel
@@ -119,6 +120,7 @@ Pliki programistyczne komponentu WebKit dla GTK+ 2.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
diff --git a/gtk-webkit-icu65.patch b/gtk-webkit-icu65.patch
new file mode 100644
index 0000000..fbe5dee
--- /dev/null
+++ b/gtk-webkit-icu65.patch
@@ -0,0 +1,39 @@
+diff -urN webkitgtk-2.4.11.orig/Source/WebCore/dom/Document.cpp webkitgtk-2.4.11/Source/WebCore/dom/Document.cpp
+--- webkitgtk-2.4.11.orig/Source/WebCore/dom/Document.cpp	2016-04-10 08:48:37.000000000 +0200
++++ webkitgtk-2.4.11/Source/WebCore/dom/Document.cpp	2019-10-08 16:20:01.556876686 +0200
+@@ -3912,12 +3912,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;
+     }
+@@ -3980,7 +3980,7 @@
+     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 -urN webkitgtk-2.4.11.orig/Source/WebCore/platform/graphics/SegmentedFontData.cpp webkitgtk-2.4.11/Source/WebCore/platform/graphics/SegmentedFontData.cpp
+--- webkitgtk-2.4.11.orig/Source/WebCore/platform/graphics/SegmentedFontData.cpp	2016-04-10 08:48:37.000000000 +0200
++++ webkitgtk-2.4.11/Source/WebCore/platform/graphics/SegmentedFontData.cpp	2019-10-08 16:19:54.853148560 +0200
+@@ -61,7 +61,7 @@
+ {
+     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;
+     }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit.git/commitdiff/4a318b531afa39fc041ca39937b3309bcf2b9b7f