From 2f551836d85994e9fad4f9e0b5ba5b3189e67e83 Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Wed, 3 May 2017 05:41:28 +0200
Subject: nonprism/webkitgtk: updated to icu-59.1

---
 nonprism/webkitgtk/PKGBUILD | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'nonprism/webkitgtk/PKGBUILD')

diff --git a/nonprism/webkitgtk/PKGBUILD b/nonprism/webkitgtk/PKGBUILD
index ed248a9b1..f660ecedd 100644
--- a/nonprism/webkitgtk/PKGBUILD
+++ b/nonprism/webkitgtk/PKGBUILD
@@ -5,13 +5,13 @@
 pkgbase=webkitgtk
 pkgname=(webkitgtk webkitgtk2)
 pkgver=2.4.11
-pkgrel=4.nonprism1
+pkgrel=4.nonprism2
 pkgdesc="Legacy Web content engine"
 arch=(i686 x86_64)
 url="https://webkitgtk.org/"
 license=(custom)
 depends=(libxt libxslt sqlite libsoup enchant libgl gst-plugins-base-libs
-         libsecret libwebp harfbuzz-icu)
+         libsecret libwebp harfbuzz-icu 'icu=59.1')
 makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby)
 optdepends=('gst-plugins-base: free media decoding'
             'gst-plugins-good: media decoding'
@@ -28,7 +28,15 @@ prepare() {
   ln -s /usr/bin/python2 path/python
 
   cd $pkgbase-$pkgver
-  patch -Np1 -i ../webkitgtk-2.4.9-abs.patch
+  patch -Np1 -i ${srcdir}/webkitgtk-2.4.9-abs.patch
+
+  # fix icu-59.1 build issues
+  sed -i 's/unsigned short/char16_t/'       \
+    Source/JavaScriptCore/API/JSStringRef.h \
+    Source/WebKit2/Shared/API/c/WKString.h
+
+  sed -i '/stdbool.h/ a#include <uchar.h>'  \
+    Source/JavaScriptCore/API/JSBase.h
 }
 
 _build() (
-- 
cgit v1.2.3