[packages/gtk-webkit] - added icu59 patch (fix build with icu >= 59) - release 4 (rebuild with icu 59)

[qboosh]

commit d2b882551a96020aaf618e5e3256ea28e821f1f2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 23 08:17:42 2017 +0200

    - added icu59 patch (fix build with icu >= 59)
    - release 4 (rebuild with icu 59)

 gtk-webkit-icu59.patch | 38 ++++++++++++++++++++++++++++++++++++++
 gtk-webkit.spec        |  6 ++++--
 2 files changed, 42 insertions(+), 2 deletions(-)
---
diff --git a/gtk-webkit.spec b/gtk-webkit.spec
index 4241298..2cf1e14 100644
--- a/gtk-webkit.spec
+++ b/gtk-webkit.spec
@@ -7,13 +7,14 @@ 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:	3
+Release:	4
 License:	BSD-like
 Group:		X11/Libraries
 Source0:	http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 # Source0-md5:	24a25ccc30a7914ae50922aedf24b7bc
 Patch0:		x32.patch
 Patch1:		abs.patch
+Patch2:		%{name}-icu59.patch
 URL:		http://webkitgtk.org/
 BuildRequires:	/usr/bin/ld.gold
 BuildRequires:	EGL-devel
@@ -41,7 +42,7 @@ BuildRequires:	gtk+2-devel >= 2:2.24.10
 BuildRequires:	gtk-doc >= 1.10
 BuildRequires:	harfbuzz-devel >= 0.9.7
 BuildRequires:	harfbuzz-icu-devel >= 0.9.7
-BuildRequires:	libicu-devel >= 4.2.1
+BuildRequires:	libicu-devel >= 59
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libsecret-devel
@@ -112,6 +113,7 @@ Pliki programistyczne komponentu WebKit dla GTK+ 2.
 %setup -q -n webkitgtk-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
diff --git a/gtk-webkit-icu59.patch b/gtk-webkit-icu59.patch
new file mode 100644
index 0000000..39ff89e
--- /dev/null
+++ b/gtk-webkit-icu59.patch
@@ -0,0 +1,38 @@
+--- webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h.orig	2017-02-20 17:20:08.000000000 +0100
++++ webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h	2017-04-22 14:35:00.926530142 +0200
+@@ -32,6 +32,7 @@
+ #include <stdbool.h>
+ #endif
+ #include <stddef.h> /* for size_t */
++#include <uchar.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -46,7 +47,7 @@
+  character. As with all scalar types, endianness depends on the underlying
+  architecture.
+ */
+-    typedef unsigned short JSChar;
++    typedef char16_t JSChar;
+ #else
+     typedef wchar_t JSChar;
+ #endif
+--- webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h.orig	2017-02-20 17:20:17.000000000 +0100
++++ webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h	2017-04-22 14:35:56.853196170 +0200
+@@ -28,6 +28,7 @@
+ 
+ #include <WebKit/WKBase.h>
+ #include <stddef.h>
++#include <uchar.h>
+ 
+ #ifndef __cplusplus
+ #include <stdbool.h>
+@@ -39,7 +40,7 @@
+ 
+ #if !defined(WIN32) && !defined(_WIN32) \
+     && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */
+-    typedef unsigned short WKChar;
++    typedef char16_t WKChar;
+ #else
+     typedef wchar_t WKChar;
+ #endif
================================================================

---- gitweb:

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