[mingw-qt5-qtbase] Fix detection of the static dbus and harfbuzz libraries

[Erik van Pienbroek]

commit 1d4c8873eebf10b2258ba6e8d84df61793187a07
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Mar 8 19:16:53 2015 +0100

    Fix detection of the static dbus and harfbuzz libraries

 mingw-qt5-qtbase.spec                   |  7 +++++++
 qt5-fix-static-dbus-detection.patch     | 13 +++++++++++++
 qt5-fix-static-harfbuzz-detection.patch |  7 +++++++
 3 files changed, 27 insertions(+)
---
diff --git a/mingw-qt5-qtbase.spec b/mingw-qt5-qtbase.spec
index 33b9a11..77734fa 100644
--- a/mingw-qt5-qtbase.spec
+++ b/mingw-qt5-qtbase.spec
@@ -70,6 +70,10 @@ Patch3:         qt5-prevent-debug-library-names-in-pkgconfig-files.patch
 # Fix qmake to create implibs with .dll.a extension for MinGW
 Patch4:         qt5-qmake-implib-dll-a.patch
 
+# As of Qt 5.4.1 the detection of the static DBus and Harfbuzz libraries got broken
+Patch5:         qt5-fix-static-dbus-detection.patch
+Patch6:         qt5-fix-static-harfbuzz-detection.patch
+
 ###########################
 # Fedora specific patches #
 ###########################
@@ -295,6 +299,8 @@ Static version of the mingw64-qt5-qtbase library.
 %patch2 -p1 -b .res
 %patch3 -p1 -b .pkgconfig_debug
 %patch4 -p1 -b .qmake_implib
+%patch5 -p1 -b .dbus_static
+%patch6 -p1 -b .harfbuzz_static
 
 %patch100 -p0
 %patch101 -p0
@@ -798,6 +804,7 @@ ln -s %{mingw64_target}-qmake-qt5 $RPM_BUILD_ROOT%{_bindir}/mingw64-qmake-qt5
 - Update to 5.4.1
 - Added some more BuildRequires for mingw*-static libraries as the ./configure
   script now needs them to be available in the buildroot
+- Fix detection of the static dbus and harfbuzz libraries
 
 * Mon Jan 26 2015 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4.0-4
 - Rebuild against mingw-w64 v4.0rc1
diff --git a/qt5-fix-static-dbus-detection.patch b/qt5-fix-static-dbus-detection.patch
new file mode 100644
index 0000000..e12f9e3
--- /dev/null
+++ b/qt5-fix-static-dbus-detection.patch
@@ -0,0 +1,13 @@
+--- qtbase-opensource-src-5.4.1/config.tests/unix/dbus/dbus.cpp.orig	2015-03-08 17:05:21.216593135 +0100
++++ qtbase-opensource-src-5.4.1/config.tests/unix/dbus/dbus.cpp	2015-03-08 17:06:35.276826201 +0100
+@@ -31,6 +31,10 @@
+ **
+ ****************************************************************************/
+ 
++#ifdef QT_STATIC
++#define DBUS_STATIC_BUILD
++#endif
++
+ #define DBUS_API_SUBJECT_TO_CHANGE
+ #include <dbus/dbus.h>
+ 
diff --git a/qt5-fix-static-harfbuzz-detection.patch b/qt5-fix-static-harfbuzz-detection.patch
new file mode 100644
index 0000000..80dc3b2
--- /dev/null
+++ b/qt5-fix-static-harfbuzz-detection.patch
@@ -0,0 +1,7 @@
+--- qtbase-opensource-src-5.4.1/config.tests/unix/harfbuzz/harfbuzz.pro.orig	2015-03-08 17:47:58.522991158 +0100
++++ qtbase-opensource-src-5.4.1/config.tests/unix/harfbuzz/harfbuzz.pro	2015-03-08 17:48:19.491340185 +0100
+@@ -1,3 +1,3 @@
+ SOURCES = harfbuzz.cpp
+ CONFIG -= qt dylib
+-LIBS += -lharfbuzz
++LIBS += -lharfbuzz -lglib-2.0 -lws2_32 -lole32 -lwinmm -lshlwapi -lintl