From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 18 Apr 2019 13:58:22 +0000 (+0200)
Subject: - icu59 patch replaced by Fedora patch (compile icu related sources with -std=c+... 
X-Git-Tag: auto/th/qt4-4.8.7-21
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fth%2Fqt4-4.8.7-21;p=packages%2Fqt4.git

- icu59 patch replaced by Fedora patch (compile icu related sources with -std=c++11); release 21
---

diff --git a/icu59.patch b/icu59.patch
index ed6a8b5..3edcdef 100644
--- a/icu59.patch
+++ b/icu59.patch
@@ -1,11 +1,28 @@
---- 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"
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Subject: Fix build with ICU >= 59
+
+ICU >= 59 requires C++11 for its header files.
+Qt can't be compiled with -std=c++11 as a whole, so only enable
+it for qlocale_icu.cpp.
+
+Index: qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri
+===================================================================
+--- qt-everywhere-opensource-src-4.8.7.orig/src/corelib/tools/tools.pri
++++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri
+@@ -102,7 +102,15 @@ contains(QT_CONFIG, zlib):include($$PWD/
+ else:include($$PWD/../../3rdparty/zlib_dependency.pri)
  
-+#define UCHAR_TYPE unsigned short
+ contains(QT_CONFIG,icu) {
+-    SOURCES += tools/qlocale_icu.cpp
++    cpp11.name = cpp11
++    cpp11.input = SOURCES_CPP11
++    cpp11.dependency_type = TYPE_C
++    cpp11.variable_out = OBJECTS
++    cpp11.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${first(QMAKE_EXT_OBJ)}
++    cpp11.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++11 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
++    QMAKE_EXTRA_COMPILERS += cpp11
 +
- #include "unicode/uversion.h"
- #include "unicode/ucol.h"
++    SOURCES_CPP11 += tools/qlocale_icu.cpp
+     DEFINES += QT_USE_ICU
+ }
  
diff --git a/qt4.spec b/qt4.spec
index b832e86..ba1f53a 100644
--- a/qt4.spec
+++ b/qt4.spec
@@ -63,7 +63,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:	20
+Release:	21
 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
@@ -182,7 +182,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		_noautoreqdep	libGL.so.1 libGLU.so.1
 %define		_noautostrip	'.*_debug\\.so*'
 
-%define		specflags	-fno-strict-aliasing -std=gnu++98
+%define		specflags	-fno-strict-aliasing
 
 %define		_qtdir		%{_libdir}/qt4
 
@@ -1577,9 +1577,9 @@ Programas exemplo para o Qt versão.
 	s|QMAKE_LINK.*=.*g++|QMAKE_LINK\t\t= %{__cxx}|;
 	s|QMAKE_LINK_SHLIB.*=.*g++|QMAKE_LINK_SHLIB\t= %{__cxx}|;
 	s|QMAKE_CFLAGS_RELEASE.*|QMAKE_CFLAGS_RELEASE\t+= %{rpmcppflags} %{rpmcflags}|;
-	s|QMAKE_CXXFLAGS_RELEASE.*|QMAKE_CXXFLAGS_RELEASE\t+= %{rpmcppflags} %{rpmcxxflags}|;
+	s|QMAKE_CXXFLAGS_RELEASE.*|QMAKE_CXXFLAGS_RELEASE\t+= %{rpmcppflags} %{rpmcxxflags} -std=gnu++98|;
 	s|QMAKE_CFLAGS_DEBUG.*|QMAKE_CFLAGS_DEBUG\t+= %{debugcflags}|;
-	s|QMAKE_CXXFLAGS_DEBUG.*|QMAKE_CXXFLAGS_DEBUG\t+= %{debugcflags}|;
+	s|QMAKE_CXXFLAGS_DEBUG.*|QMAKE_CXXFLAGS_DEBUG\t+= %{debugcflags} -std=gnu++98|;
 	' mkspecs/common/g++-base.conf
 
 %{__sed} -i -e '
@@ -1597,7 +1597,7 @@ Programas exemplo para o Qt versão.
 	' mkspecs/common/linux.conf
 
 # disable webkit tests, broken build
-rm -r src/3rdparty/webkit/Source/WebKit/qt/tests
+%{__rm} -r src/3rdparty/webkit/Source/WebKit/qt/tests
 
 %build
 # pass OPTFLAGS to build qmake itself with optimization
@@ -1790,7 +1790,7 @@ ln -sf ../%{_lib}/qt4/bin/xmlpatternsvalidator .
 cd -
 
 # multilib
-mv $RPM_BUILD_ROOT%{_qtdir}/bin/{qdbus,qdbusviewer} $RPM_BUILD_ROOT%{_bindir}
+%{__mv} $RPM_BUILD_ROOT%{_qtdir}/bin/{qdbus,qdbusviewer} $RPM_BUILD_ROOT%{_bindir}
 ln -sf %{_bindir}/qdbus $RPM_BUILD_ROOT%{_qtdir}/bin/qdbus
 ln -sf %{_bindir}/qdbusviewer $RPM_BUILD_ROOT%{_qtdir}/bin/qdbusviewer