[arch-commits] Commit in qt4/trunk (PKGBUILD qt4-icu59.patch)

[Antonio Rojas]

    Date: Tuesday, April 25, 2017 @ 11:10:59
  Author: arojas
Revision: 294643

Fix build with ICU 59 (pld-linux)

Added:
  qt4/trunk/qt4-icu59.patch
Modified:
  qt4/trunk/PKGBUILD

-----------------+
 PKGBUILD        |    5 ++++-
 qt4-icu59.patch |   11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-25 10:49:50 UTC (rev 294642)
+++ PKGBUILD	2017-04-25 11:10:59 UTC (rev 294643)
@@ -37,7 +37,7 @@
         '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')
 md5sums=('d990ee66bf7ab0c785589776f35ba6ad'
          'a16638f4781e56e7887ff8212a322ecc'
          '8a28b3f52dbeb685d4b69440b520a3e1'
@@ -94,6 +94,9 @@
 
   # 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() {

Added: qt4-icu59.patch
===================================================================
--- qt4-icu59.patch	                        (rev 0)
+++ qt4-icu59.patch	2017-04-25 11:10:59 UTC (rev 294643)
@@ -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"
+