summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2017-07-18 19:11:27 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-10-01 11:13:49 +0200
commit507adfe5d5148469b332eed2218823ed8a62d727 (patch)
treeb89bf190e29453fcbbee6f44d57f4ca2488e51a5
parent6c9664c14935f257e5a4c5058b792879851abc52 (diff)
downloadkde-507adfe5d5148469b332eed2218823ed8a62d727.tar.gz
kde-507adfe5d5148469b332eed2218823ed8a62d727.tar.xz
qt: Fix build with icu-59
Change-Id: Ia4c818ab18863626520c57867a36664f258a4560 Reviewed-on: https://galileo.mailstation.de/gerrit/10163 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Heiko Becker <heirecka@exherbo.org>
-rw-r--r--packages/x11-libs/qt/files/qt-Fix-build-with-icu-59.1.patch43
-rw-r--r--packages/x11-libs/qt/qt-4.8.7-r4.exheres-01
2 files changed, 44 insertions, 0 deletions
diff --git a/packages/x11-libs/qt/files/qt-Fix-build-with-icu-59.1.patch b/packages/x11-libs/qt/files/qt-Fix-build-with-icu-59.1.patch
new file mode 100644
index 0000000..0275546
--- /dev/null
+++ b/packages/x11-libs/qt/files/qt-Fix-build-with-icu-59.1.patch
@@ -0,0 +1,43 @@
+Upstream: no, EOL upstream
+
+From c8f8c2d8feda29ec02a6df6c72c1129e6212dca0 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Sat, 30 Sep 2017 21:12:48 +0200
+Subject: [PATCH] Fix build with icu-59.1
+
+Based on a patch from PLD Linux:
+https://git.pld-linux.org/gitweb.cgi?p=packages/qt4.git;a=blob;f=icu59.patch;h=ed6a8b52bfd66fc62544382113617dce84a10b9c;hb=HEAD
+---
+ config.tests/unix/icu/icu.cpp | 2 ++
+ src/corelib/tools/qlocale_icu.cpp | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/config.tests/unix/icu/icu.cpp b/config.tests/unix/icu/icu.cpp
+index b767c934ed..859202bc8b 100644
+--- a/config.tests/unix/icu/icu.cpp
++++ b/config.tests/unix/icu/icu.cpp
+@@ -39,6 +39,8 @@
+ **
+ ****************************************************************************/
+
++#define UCHAR_TYPE unsigned short
++
+ #include <unicode/utypes.h>
+ #include <unicode/ucol.h>
+ #include <unicode/ustring.h>
+diff --git a/src/corelib/tools/qlocale_icu.cpp b/src/corelib/tools/qlocale_icu.cpp
+index 0b2ac2c8fb..da085aa7b8 100644
+--- a/src/corelib/tools/qlocale_icu.cpp
++++ b/src/corelib/tools/qlocale_icu.cpp
+@@ -43,6 +43,8 @@
+ #include "qlibrary.h"
+ #include "qdebug.h"
+
++#define UCHAR_TYPE unsigned short
++
+ #include "unicode/uversion.h"
+ #include "unicode/ucol.h"
+
+--
+2.14.2
+
diff --git a/packages/x11-libs/qt/qt-4.8.7-r4.exheres-0 b/packages/x11-libs/qt/qt-4.8.7-r4.exheres-0
index 3b6e075..3043dde 100644
--- a/packages/x11-libs/qt/qt-4.8.7-r4.exheres-0
+++ b/packages/x11-libs/qt/qt-4.8.7-r4.exheres-0
@@ -16,5 +16,6 @@ DEFAULT_SRC_PREPARE_PATCHES+=(
"${FILES}"/${PN}-Fix-compile-error-if-openssl-if-built-with-n-ssl3-me.patch
"${FILES}"/qt-everywhere-opensource-src-4.8.7-gcc6.patch
"${FILES}"/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch
+ "${FILES}"/${PN}-Fix-build-with-icu-59.1.patch
)