- fix building with icu 65.1

- rel 8

diff --git a/gtk-webkit3.spec b/gtk-webkit3.spec
index 1eb729b93048c13ce9aacd23f3c1f7b81b5d5cba..4ebc7d2d75e94d64c7516c417609d3a1ba90a684 100644 (file)
--- a/gtk-webkit3.spec
+++ b/gtk-webkit3.spec
@@ -16,7 +16,7 @@ Summary(pl.UTF-8):    Port osadzalnego komponentu WWW WebKit do GTK+ 3
 Name:          gtk-webkit3
 # note: for 2.6.x series see gtk-webkit4
 Version:       2.4.11
-Release:       7
+Release:       8
 License:       BSD-like
 Group:         X11/Libraries
 Source0:       http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
@@ -25,6 +25,7 @@ Patch0:               atomic-ops.patch
 Patch1:                x32.patch
 Patch2:                abs.patch
 Patch3:                %{name}-icu59.patch
+Patch4:                icu65.patch
 URL:           http://webkitgtk.org/
 BuildRequires: /usr/bin/ld.gold
 BuildRequires: EGL-devel
@@ -149,6 +150,7 @@ Dokumentacja API WebKita.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}

diff --git a/icu65.patch b/icu65.patch
new file mode 100644 (file)
index 0000000..fbe5dee
--- /dev/null
+++ b/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;
+     }