From 63b92c5db2eb60ae98ffd429b1a5c0eb70722a1b Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 29 Apr 2017 16:18:50 +0000
Subject: [PATCH] extra/qt4 to 4.8.7-19

---
 extra/qt4/PKGBUILD        | 42 +++++++++++++++++++++------------------
 extra/qt4/qt4-icu59.patch | 11 ++++++++++
 2 files changed, 34 insertions(+), 19 deletions(-)
 create mode 100644 extra/qt4/qt4-icu59.patch

diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD
index 9b7112432..51c0a57c6 100644
--- a/extra/qt4/PKGBUILD
+++ b/extra/qt4/PKGBUILD
@@ -12,7 +12,7 @@
 
 pkgname=qt4
 pkgver=4.8.7
-pkgrel=18
+pkgrel=19
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -44,25 +44,26 @@ source=("http://download.qt.io/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar
         'disable-sslv3.patch'
         'l-qclipboard_fix_recursive.patch'
         'l-qclipboard_delay.patch'
-        'qt4-gcc6.patch' 'qt4-glibc-2.25.patch'
+        'qt4-gcc6.patch' 'qt4-glibc-2.25.patch' 'qt4-icu59.patch'
         'qt-aarch64.patch')
-md5sums=('d990ee66bf7ab0c785589776f35ba6ad'
-         'a16638f4781e56e7887ff8212a322ecc'
-         '8a28b3f52dbeb685d4b69440b520a3e1'
-         '9727c406c240990870c905696a8c5bd1'
-         '0e384663d3dd32abe35f5331c4147569'
-         'b859c5673e5098c39f72b2252947049e'
-         'c439c7731c25387352d8453ca7574971'
-         'da387bde22ae1c446f12525d2a31f070'
-         'a523644faa8f98a73f55c4aa23c114a6'
-         '66dfea63916c8dbf47b23cb012ffdccc'
-         '85679531c8a7310317adfb7002d9f99a'
-         '1803ab6313df762d807678e58fc85f53'
-         '009de09b4e589a7770fba74405656c99'
-         'addc5e88d538ee55e17bd49ba337ca67'
-         '98e00c5c7e5fee12e11ecbedd03f01ff'
-         'a6e217c159d9c0f588d4b5611493f0ea'
-         '296a06554222ff5839cccc41c5d3987e')
+sha256sums=('e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0'
+            '157eb47865f0b43e4717819783823c569127a2e9fc48309982ca0f2b753517a1'
+            'd63f22858174489068c30a12b9115d1b4e23ade00c31c117513212e9a225c1ce'
+            'c154de65da1b81564fa68f29c773b5f1751e0ee821e858ee8f0684b8d027da58'
+            '22bd69ee3ba986448a63e41f529a7d28d0f2e6d83d6114e763eba761db302e01'
+            '915a1cb0f7328840cac742c03f5121dc6e19498952c082b46c0bf7263bf6676d'
+            '3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33'
+            '876c681ef8fbcc25f28cd4ad6c697abf8a4165d540bae37433bc40256dbf9d62'
+            '9fad22674c5eec835613a7f16c11b865aa793b448e90974c0f804105284a548b'
+            'ce97da195445f145d9f82df8f8e5d8716128e869ec6632db66c7125be663d813'
+            'e7f8d1c906640b836454e8202a48602352609d8e44a33a3de05dc1d20f5b1a8a'
+            '829b02ba10f208c2beba8e8a0110b6d10c63932612dabc08d536f099b9f66101'
+            '5db36cbb0686b8a503941779c821febc4a0330dc260e51d603f7aa1e4d8860ad'
+            'af3648ddb2372333b0e428788fd2ffbcfe571653fb46f898a55ae5a202f7e242'
+            '51da49e41edac66559d3ec8dd0a152995a51a53e5d1f63f09fa089a8af7e3112'
+            'e6555f4a681227447e94e9f14e11626d50b7e5108aad06088311e87063bc0347'
+            '61d6bf45649c728dec5f8d22be5b496ed9d40f52c2c70102696d07133cd1750d'
+            '9269bd8552688b75be1468eaca6afdc0c054e644a73a9cffddb6855a96faf86f')
 
 prepare() {
   cd ${_pkgfqn}
@@ -108,6 +109,9 @@ prepare() {
 
   # Fix build of Qt4 applications with glibc 2.25 (Fedora)
   patch -p1 -i "$srcdir"/qt4-glibc-2.25.patch
+
+  # Fix build with ICU 59 (pld-linux)
+  patch -p1 -i "$srcdir"/qt4-icu59.patch
 }
 
 build() {
diff --git a/extra/qt4/qt4-icu59.patch b/extra/qt4/qt4-icu59.patch
new file mode 100644
index 000000000..ed6a8b52b
--- /dev/null
+++ b/extra/qt4/qt4-icu59.patch
@@ -0,0 +1,11 @@
+--- qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qlocale_icu.cpp~	2017-04-25 07:42:22.000000000 +0000
++++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qlocale_icu.cpp	2017-04-25 07:44:34.675363008 +0000
+@@ -43,6 +43,8 @@
+ #include "qlibrary.h"
+ #include "qdebug.h"
+ 
++#define UCHAR_TYPE unsigned short
++
+ #include "unicode/uversion.h"
+ #include "unicode/ucol.h"
+