[mingw-qt] Fix build regression in Qt 4.8.3 (upstream commit 57069f)

[Erik van Pienbroek]

commit 183dd18cb342cda4db6cd6009a10930dd15fb322
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Sep 14 23:01:56 2012 +0200

    Fix build regression in Qt 4.8.3 (upstream commit 57069f)

 mingw-qt.spec          |    5 +++++
 qt-commit-57069f.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 0 deletions(-)
---
diff --git a/mingw-qt.spec b/mingw-qt.spec
index 55f49ea..917bee6 100644
--- a/mingw-qt.spec
+++ b/mingw-qt.spec
@@ -68,6 +68,10 @@ Patch23:        qt-4.8.1-fix-activeqt-compilation.patch
 # lrelease-qt4 tries to run qmake not qmake-qt4 (http://bugzilla.redhat.com/820767)
 Patch24:        qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch
 
+# Upstream commit 57069f
+# Fixes build regression in Qt 4.8.3
+Patch25:        qt-commit-57069f.patch
+
 BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-gcc-c++
@@ -198,6 +202,7 @@ Static version of the mingw64-qt library.
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1 -b .linguist_qtmake-qt4
+%patch25 -p1
 
 # Patch 19 (openssl) needs an additional change
 # qt loads openssl libraries (ssleay32, libeay32)  at runtime, but they are called libssl-OPENSSL_SONAME
diff --git a/qt-commit-57069f.patch b/qt-commit-57069f.patch
new file mode 100644
index 0000000..dbce037
--- /dev/null
+++ b/qt-commit-57069f.patch
@@ -0,0 +1,41 @@
+From 57069f1bd5e8cd5450f1d1ceae0d6d315b4a66c8 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand at mabrand.nl>
+Date: Wed, 12 Sep 2012 00:22:28 +0200
+Subject: [PATCH] Partial Revert "Disable pkg-config, when x-compiling for
+ mingw"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This partially reverts commit c7d5071afc6c76925c90ff35041dc4eb86511271.
+
+Despite what the commit message said, pkg-config previously worked
+and was useful, particularly for static Qt. Qt itself even installs
+its own .pc files.
+
+Note: The mkspec win32-g++-cross had a PKG_CONFIG definition to avoid
+using the pkg-config installation on the build machine.
+
+cherry-picked from qt5/qtbase commit 7d9b5e8e7d2094dedbe7e3e2f961544f233ce57e
+Change-Id: I6c6ed81b2ab42c9cf7f7e250feeeb9c34c8877e7
+Reviewed-by: Peter Kümmel <syntheticpp at gmx.net>
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen at nokia.com>
+---
+ configure |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure b/configure
+index d19f443..bfaee0e 100755
+--- a/configure
++++ b/configure
+@@ -1684,7 +1684,6 @@ while [ "$#" -gt 0 ]; do
+         case `basename "$XPLATFORM"` in win32-g++*)
+             XPLATFORM_MINGW=yes
+             CFG_RPATH=no
+-            PKG_CONFIG=no
+             CFG_REDUCE_EXPORTS=no
+             ;;
+         esac
+-- 
+1.7.10
+