From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Wed, 23 Aug 2017 19:12:01 +0000 (+0200)
Subject: - rel 16; stop -std=XYZ from qmake config
X-Git-Tag: auto/th/qt4-4.8.7-16
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=7c9916d97800e314936c68b54e25e8216ffbb128;p=packages%2Fqt4.git

- rel 16; stop -std=XYZ from qmake config
---

diff --git a/qt4.spec b/qt4.spec
index b9e517d..62ed167 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:	15
+Release:	16
 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
@@ -1749,6 +1749,9 @@ install bin/qdoc3 $RPM_BUILD_ROOT%{_qtdir}/bin/qdoc3
 	s|uic_location=.*|uic_location=%{_bindir}/uic-qt4|;
 	' $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
 
+# kill -std=XYZ, so qmake won't pass it over to other projects
+%{__sed} -i -e 's#^\(.*\) -std=[a-z0-9\+]\+ \(.*\)#\1 \2#g' $RPM_BUILD_ROOT%{_datadir}/qt4/mkspecs/common/g++-base.conf
+
 # libQtWebKit.la contains '-ljscore' and '-lwebcore', they come
 # from src/3rdparty/webkit/{JavaScriptCore,WebCore}} but those libs aren't installed
 %{__sed} -i -e "s,-lwebcore,,g;s,-ljscore,,g;" $RPM_BUILD_ROOT%{_libdir}/libQtWebKit.la