X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=qt4.spec;h=4150dbf5a06b2d994297ec6441872423a4face4f;hb=ea68ef3282f32;hp=ba1f53a4d03d8e0c86ab0d6ed91c87ef8cd5547d;hpb=06e2274e2ee0cff7d6c5cf1bc545417b08fd5fd1;p=packages%2Fqt4.git

diff --git a/qt4.spec b/qt4.spec
index ba1f53a..4150dbf 100644
--- a/qt4.spec
+++ b/qt4.spec
@@ -54,7 +54,7 @@
 %define		_withsql	1
 %{!?with_sqlite3:%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%{!?with_oci:%undefine _withsql}}}}}}}
 
-%define		icu_abi		64
+%define		icu_abi		67
 %define		next_icu_abi	%(echo $((%{icu_abi} + 1)))
 
 Summary:	The Qt GUI application framework
@@ -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:	21
+Release:	28
 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
@@ -90,7 +90,7 @@ Patch9:		qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 Patch10:	webkit-no_Werror.patch
 Patch11:	%{name}-wkhtml.patch
 Patch12:	openssl.patch
-
+Patch13:	qt-asm-volatile.patch
 Patch14:	x32.patch
 # backported from Qt5 (essentially)
 # http://bugzilla.redhat.com/702493
@@ -128,6 +128,10 @@ 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
+Patch50:	mysql-link.patch
+Patch51:	gcc9.patch
+Patch52:	gcc9-qforeach.patch
+Patch53:	cxx11.patch
 URL:		http://qt-project.org/
 %{?with_ibase:BuildRequires:	Firebird-devel}
 %{?with_openvg:BuildRequires:	Mesa-libOpenVG-devel}
@@ -1532,7 +1536,7 @@ Programas exemplo para o Qt versão.
 %patch10 -p1
 %{?with_wkhtml:%patch11 -p1}
 %patch12 -p1
-
+%patch13 -p1
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
@@ -1566,6 +1570,10 @@ Programas exemplo para o Qt versão.
 %patch47 -p1
 %patch48 -p1
 %patch49 -p1
+%patch50 -p1
+%patch51 -p1
+%patch52 -p1
+%patch53 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
 	mkspecs/common/linux.conf
@@ -1577,9 +1585,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} -std=gnu++98|;
+	s|QMAKE_CXXFLAGS_RELEASE.*|QMAKE_CXXFLAGS_RELEASE\t+= %{rpmcppflags} %{rpmcxxflags}|;
 	s|QMAKE_CFLAGS_DEBUG.*|QMAKE_CFLAGS_DEBUG\t+= %{debugcflags}|;
-	s|QMAKE_CXXFLAGS_DEBUG.*|QMAKE_CXXFLAGS_DEBUG\t+= %{debugcflags} -std=gnu++98|;
+	s|QMAKE_CXXFLAGS_DEBUG.*|QMAKE_CXXFLAGS_DEBUG\t+= %{debugcflags}|;
 	' mkspecs/common/g++-base.conf
 
 %{__sed} -i -e '
@@ -1752,7 +1760,7 @@ install bin/qdoc3 $RPM_BUILD_ROOT%{_qtdir}/bin/qdoc3
 	' $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
+#%{__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