From 36b3e7800f1f567aefb95e072f39a05505baa9cb Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Mon, 5 Feb 2018 03:12:28 +0300
Subject: [PATCH] webkit-gtk2:rebuild

---
 network/misc/webkit-gtk2/actions.py        |  1 +
 network/misc/webkit-gtk2/files/icu59.patch | 38 ++++++++++++++++++++++
 network/misc/webkit-gtk2/pspec.xml         | 13 ++++++--
 3 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 network/misc/webkit-gtk2/files/icu59.patch

diff --git a/network/misc/webkit-gtk2/actions.py b/network/misc/webkit-gtk2/actions.py
index 50a7e0abb3..515b85f7ea 100755
--- a/network/misc/webkit-gtk2/actions.py
+++ b/network/misc/webkit-gtk2/actions.py
@@ -20,6 +20,7 @@ docs = ["AUTHORS", "ChangeLog", "COPYING.LIB", "THANKS", \
         "LICENSE-LGPL-2", "LICENSE-LGPL-2.1", "LICENSE"]
 
 def setup():
+    autotools.autoreconf("-fiv")
     shelltools.export("CFLAGS", cflags)
     shelltools.export("CXXFLAGS", cxxflags)
     autotools.configure("--prefix=/usr \
diff --git a/network/misc/webkit-gtk2/files/icu59.patch b/network/misc/webkit-gtk2/files/icu59.patch
new file mode 100644
index 0000000000..39ff89ee63
--- /dev/null
+++ b/network/misc/webkit-gtk2/files/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
diff --git a/network/misc/webkit-gtk2/pspec.xml b/network/misc/webkit-gtk2/pspec.xml
index 9813a4ae51..1cc8d36887 100755
--- a/network/misc/webkit-gtk2/pspec.xml
+++ b/network/misc/webkit-gtk2/pspec.xml
@@ -48,8 +48,8 @@
         </BuildDependencies>
         <Patches>
             <Patch level="1">install-minibrowser.patch</Patch>
-            <Patch level="1">fix-ftbfs-gcc6.patch</Patch>-->
-            <!--<Patch>webkitgtk-2.4.8-gmutexlocker.patch</Patch>-->
+            <Patch level="1">fix-ftbfs-gcc6.patch</Patch>
+            <Patch level="1">icu59.patch</Patch>
         </Patches>
     </Source>
 
@@ -121,6 +121,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2018-02-05</Date>
+            <Version>2.4.11</Version>
+            <Comment>Rebuild for new toolchain.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="4">
             <Date>2017-02-27</Date>
             <Version>2.4.11</Version>
@@ -150,4 +157,4 @@
             <Email>ayhanyalcinsoy@pisilinux.org</Email>
         </Update>
     </History>
-</PISI>
\ No newline at end of file
+</PISI>