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

[notifications at fedoraproject.org]

>From 4809d07a391b5f163bb2667d57d0d83aefdb5546 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sat, 21 Mar 2015 19:09:01 +0100
Subject: Fix FTBFS against latest mingw-dbus


diff --git a/mingw-qt.spec b/mingw-qt.spec
index 983a6fd..8392960 100644
--- a/mingw-qt.spec
+++ b/mingw-qt.spec
@@ -14,7 +14,7 @@
 
 Name:           mingw-qt
 Version:        4.8.6
-Release:        6%{?pre}%{?dist}
+Release:        7%{?pre}%{?dist}
 Summary:        Qt for Windows
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -78,6 +78,9 @@ Patch29:        qt-everywhere-opensource-src-4.8.6-QTBUG-38367.patch
 # Fix out of tree compilation
 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
+
 BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-gcc-c++
@@ -250,6 +253,7 @@ Static version of the mingw64-qt library.
 %patch28 -p1 -b .qt_dll_define
 %patch29 -p1 -b .QTBUG-38367
 %patch30 -p1 -b .out_of_tree
+%patch31 -p1 -b .pkgconfig_static
 
 # Patch 19 (openssl) needs an additional change
 # qt loads openssl libraries (ssleay32, libeay32)  at runtime, but they are called libssl-OPENSSL_SONAME
@@ -1109,6 +1113,9 @@ 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
+
 * Sun Nov 30 2014 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.8.6-6
 - Ship translations
 
diff --git a/qt4-use-correct-pkg-config-static-flags.patch b/qt4-use-correct-pkg-config-static-flags.patch
new file mode 100644
index 0000000..9e03964
--- /dev/null
+++ b/qt4-use-correct-pkg-config-static-flags.patch
@@ -0,0 +1,14 @@
+--- qt-everywhere-opensource-src-4.8.6/configure.orig	2015-03-21 18:07:24.056403965 +0100
++++ qt-everywhere-opensource-src-4.8.6/configure	2015-03-21 18:09:40.642912613 +0100
+@@ -5098,6 +5098,11 @@
+     echo "QT_BUILD_TREE = $outpath" > "$outpath/.qmake.cache.pkgconfig"
+     PKG_CONFIG=`"$outpath/bin/qmake" -cache "$outpath/.qmake.cache.pkgconfig" -spec "$XQMAKESPEC" "$outpath/dummy.pro" -o /dev/null 2>&1 > /dev/null | sed -n -e 's,Project MESSAGE: \(.*\),\1,p'`
+     rm "$outpath/.qmake.cache.pkgconfig" "$outpath/dummy.pro"
++
++    if [ "$CFG_SHARED" = "no" ] ; then
++        PKG_CONFIG="$PKG_CONFIG --static"
++        [ "$OPT_VERBOSE" = "yes" ] && echo "Using '$PKG_CONFIG' because we're doing a static build"
++    fi
+ fi
+ if [ -z "$PKG_CONFIG" ]; then
+     PKG_CONFIG=`"$WHICH" pkg-config 2>/dev/null`
-- 
cgit v0.10.2


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