- fix building with icu 59

- rel 15

diff --git a/icu59.patch b/icu59.patch
new file mode 100644 (file)
index 0000000..ed6a8b5
--- /dev/null
+++ b/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"
+ 

diff --git a/qt4.spec b/qt4.spec
index 7fc0bc9be60d53729e94b7ffdec53ba606665e98..d7b4fa3a8846835ecdf812c9db954fa64d7f6904 100644 (file)
--- a/qt4.spec
+++ b/qt4.spec
@@ -61,7 +61,7 @@ Summary(pl.UTF-8):    Biblioteka Qt do tworzenia GUI
 Summary(pt_BR.UTF-8):  Estrutura para rodar aplicações GUI Qt
 Name:          qt4
 Version:       4.8.7
-Release:       14
+Release:       15
 License:       LGPL v2.1 or GPL v3.0
 Group:         X11/Libraries
 Source0:       http://download.qt-project.org/official_releases/qt/4.8/%{version}/qt-everywhere-opensource-src-%{version}.tar.gz
@@ -124,6 +124,7 @@ Patch45:    qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
 Patch46:       qt-everywhere-opensource-src-4.8.3-qdbusconnection_no_debug.patch
 Patch47:       qt-everywhere-opensource-src-4.8.2--assistant-crash.patch
 Patch48:       qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch
+Patch49:       icu59.patch
 URL:           http://qt-project.org/
 %{?with_ibase:BuildRequires:   Firebird-devel}
 %{?with_openvg:BuildRequires:  Mesa-libOpenVG-devel}
@@ -1560,6 +1561,7 @@ Programas exemplo para o Qt versão.
 %patch46 -p1
 %patch47 -p1
 %patch48 -p1
+%patch49 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
        mkspecs/common/linux.conf