epienbro pushed to mingw-qt (epel7). "Fix FTBFS against gcc5"

[notifications at fedoraproject.org]

>From 0436522bd57092e27370cfb707e1522767f8f98e Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sun, 22 Mar 2015 00:19:28 +0100
Subject: Fix FTBFS against gcc5


diff --git a/mingw-qt.spec b/mingw-qt.spec
index 8392960..0d42fb3 100644
--- a/mingw-qt.spec
+++ b/mingw-qt.spec
@@ -81,6 +81,9 @@ Patch30:        qt-4.8.6-fix-out-of-tree-compilation.patch
 # When using pkg-config to detect static libraries, the --static flag should also be used
 Patch31:        qt4-use-correct-pkg-config-static-flags.patch
 
+# Add support for gcc5 (needed to build WebKit)
+Patch32:        qt4-fix-gcc5-compatibility.patch
+
 BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-gcc-c++
@@ -254,6 +257,7 @@ Static version of the mingw64-qt library.
 %patch29 -p1 -b .QTBUG-38367
 %patch30 -p1 -b .out_of_tree
 %patch31 -p1 -b .pkgconfig_static
+%patch32 -p1 -b .gcc5
 
 # Patch 19 (openssl) needs an additional change
 # qt loads openssl libraries (ssleay32, libeay32)  at runtime, but they are called libssl-OPENSSL_SONAME
@@ -1115,6 +1119,7 @@ sed -i s@'$${QT_LIBINFIX}d'@'d$${QT_LIBINFIX}'@ $RPM_BUILD_ROOT%{mingw64_datadir
 %changelog
 * Sat Mar 21 2015 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.8.6-7
 - Fix FTBFS against latest mingw-dbus
+- Fix FTBFS against gcc5
 
 * Sun Nov 30 2014 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.8.6-6
 - Ship translations
diff --git a/qt4-fix-gcc5-compatibility.patch b/qt4-fix-gcc5-compatibility.patch
new file mode 100644
index 0000000..1f2213a
--- /dev/null
+++ b/qt4-fix-gcc5-compatibility.patch
@@ -0,0 +1,11 @@
+--- qt-everywhere-opensource-src-4.8.6/configure.orig	2015-03-22 00:17:15.147163966 +0100
++++ qt-everywhere-opensource-src-4.8.6/configure	2015-03-22 00:17:32.434342291 +0100
+@@ -7734,7 +7734,7 @@
+     *-g++*)
+ 	# Check gcc's version
+ 	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+-	    4*|3.4*)
++	    5*|4*|3.4*)
+ 		;;
+             3.3*)
+                 canBuildWebKit="no"
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mingw-qt.git/commit/?h=epel7&id=0436522bd57092e27370cfb707e1522767f8f98e