From 28fa0eb2643b2dc59b208dfbdf335c71a87e124e Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Fri, 12 Dec 2014 23:11:43 +0000
Subject: [PATCH] qt5: Fix 0034-qt-5.3.2-Use-QMAKE_PREFIX_STATICLIB..

---
 ...PREFIX_STATICLIB-in-create_cmake-prf.patch | 25 +++++++++++--------
 mingw-w64-qt5/PKGBUILD                        | 11 +++-----
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/mingw-w64-qt5/0034-qt-5.3.2-Use-QMAKE_PREFIX_STATICLIB-in-create_cmake-prf.patch b/mingw-w64-qt5/0034-qt-5.3.2-Use-QMAKE_PREFIX_STATICLIB-in-create_cmake-prf.patch
index 97e9b1caef..aeb3928ba9 100644
--- a/mingw-w64-qt5/0034-qt-5.3.2-Use-QMAKE_PREFIX_STATICLIB-in-create_cmake-prf.patch
+++ b/mingw-w64-qt5/0034-qt-5.3.2-Use-QMAKE_PREFIX_STATICLIB-in-create_cmake-prf.patch
@@ -1,21 +1,24 @@
---- a/qtbase/mkspecs/features/create_cmake.prf	2014-10-13 17:52:38.691086600 +0100
-+++ b/qtbase/mkspecs/features/create_cmake.prf	2014-10-13 19:47:45.828532600 +0100
-@@ -133,11 +133,16 @@
-     CMAKE_PLUGIN_NAME = $$PLUGIN_CLASS_NAME
+--- qt-everywhere-opensource-src-5.4.0-rc/qtbase/mkspecs/features/create_cmake.prf.orig	2014-12-01 01:49:24.066920200 +0000
++++ qt-everywhere-opensource-src-5.4.0-rc/qtbase/mkspecs/features/create_cmake.prf	2014-12-01 01:59:39.496120700 +0000
+@@ -134,15 +134,15 @@
  
      win32 {
--        isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dll
--        else: CMAKE_PlUGIN_EXT = .$${QMAKE_EXTENSION_STATICLIB}
-+        isEmpty(CMAKE_STATIC_TYPE) {
+         isEmpty(CMAKE_STATIC_TYPE) {
+-            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll
+-            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll
+-        } else:mingw {
+-            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a
+-            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a
+-        } else {                         # MSVC static
+-            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib
+-            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib
 +            CMAKE_PlUGIN_EXT = .dll
 +            CMAKE_PlUGIN_PREFIX =
 +        } else {
 +            CMAKE_PlUGIN_EXT = .$${QMAKE_EXTENSION_STATICLIB}
 +            CMAKE_PlUGIN_PREFIX = $${QMAKE_PREFIX_STATICLIB}
-+        }
- 
--        CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}$${CMAKE_PlUGIN_EXT}
--        CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d$${CMAKE_PlUGIN_EXT}
+         }
++
 +        CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_PlUGIN_PREFIX}$${TARGET}$${CMAKE_PlUGIN_EXT}
 +        CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_PlUGIN_PREFIX}$${TARGET}d$${CMAKE_PlUGIN_EXT}
      } else {
diff --git a/mingw-w64-qt5/PKGBUILD b/mingw-w64-qt5/PKGBUILD
index 03a37d8dd7..b1a4afe4f5 100644
--- a/mingw-w64-qt5/PKGBUILD
+++ b/mingw-w64-qt5/PKGBUILD
@@ -206,7 +206,7 @@ md5sums=('21843b00ecde8956217faab391bc007b'
          'e009d2a1c7edc41c1f5974883d4f38b2'
          '516036cb0721d1603009e01f5bd728aa'
          '47e70b9a063aa99aba0096007ed5b83d'
-         'c242bb998d1117544018e169bdd66136'
+         '3049f9e43e24f7eaafb4659c72ca4789'
          'cbef002e6f4b0d043ca6a6e9d60ceca5')
 
 # Translates using cygpath according to the ${_make} being used
@@ -236,7 +236,7 @@ pkg_config_qt5() {
 prepare() {
   cd ${startdir}
   [ -d ${srcdir}/${_pkgfqn} ] && rm -rf ${srcdir}/${_pkgfqn}
-  tar -xJvf ${startdir}/${_pkgfqn}.tar.xz -C ${srcdir} || true
+  tar -xJf ${startdir}/${_pkgfqn}.tar.xz -C ${srcdir} || true
   
   # cp -rf qt3d ${_pkgfqn}/
   cd ${srcdir}/${_pkgfqn}
@@ -244,11 +244,6 @@ prepare() {
   # MSYS2 gperf cannot handle \r\n.
   find . -name "*.gperf" -exec dos2unix "{}" \;
 
-  #pushd qtbase > /dev/null
-  #  rm -f mkspecs/features/ltcg.prf > /dev/null 2>&1 || true
-  #  patch -p1 -i ${srcdir}/0001-Add-link-time-optimization-support-for-Clang-GCC-and.patch
-  #popd
-
   patch -p1 -i ${srcdir}/0001-qt-5.3.0-oracle-driver-prompt.patch
   patch -p1 -i ${srcdir}/0002-qt-5.3.0-use-fbclient-instead-of-gds32.patch
   patch -p1 -i ${srcdir}/0003-qt-5.3.0-use-mingw-built-mysql-library.patch
@@ -317,7 +312,7 @@ prepare() {
   patch -p1 -i ${srcdir}/0031-qt-5.3.1-Fix-masm-pri-build-race-condition.patch
   ###patch -p1 -i ${srcdir}/0032-qt-5.3.2-Disable-jitted-Regexp-for-Mingw-64-bit-94712.patch
   ###patch -p1 -i ${srcdir}/0033-qt-5.3.2-Use-QMAKE_EXTENSION_STATICLIB-in-create_cmake-prf.patch
-  ###patch -p1 -i ${srcdir}/0034-qt-5.3.2-Use-QMAKE_PREFIX_STATICLIB-in-create_cmake-prf.patch
+  patch -p1 -i ${srcdir}/0034-qt-5.3.2-Use-QMAKE_PREFIX_STATICLIB-in-create_cmake-prf.patch
   patch -p1 -i ${srcdir}/0035-qt-5.3.2-dont-add-resource-files-to-qmake-libs.patch
 
   # See: https://bugreports.qt-project.org/browse/QTBUG-37902