From 045bd6a6add5ec44affa2dc8a5e4809b21f338bf Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Wed, 23 Mar 2016 10:34:55 +0300
Subject: [PATCH] qbs: Update to 1.4.5

---
 ...instead-of-.a-for-mingw-import-librar.1.4.patch | 14 +++++++-------
 mingw-w64-qbs/PKGBUILD                             | 13 ++++++-------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/mingw-w64-qbs/0004-Use-.dll.a-instead-of-.a-for-mingw-import-librar.1.4.patch b/mingw-w64-qbs/0004-Use-.dll.a-instead-of-.a-for-mingw-import-librar.1.4.patch
index 6aebc0d826..46d6d51b5c 100644
--- a/mingw-w64-qbs/0004-Use-.dll.a-instead-of-.a-for-mingw-import-librar.1.4.patch
+++ b/mingw-w64-qbs/0004-Use-.dll.a-instead-of-.a-for-mingw-import-librar.1.4.patch
@@ -11,15 +11,15 @@ diff --git a/src/lib/qtprofilesetup/qtmoduleinfo.cpp b/src/lib/qtprofilesetup/qt
 index 8e07335..acc58c4 100644
 --- a/src/lib/qtprofilesetup/qtmoduleinfo.cpp
 +++ b/src/lib/qtprofilesetup/qtmoduleinfo.cpp
-@@ -252,7 +252,7 @@ void QtModuleInfo::setupLibraries(const QtEnvironment &qtEnv, bool debugBuild,
-             if (qtEnv.mkspecName.contains(QLatin1String("msvc")))
-                 libFilePath += QLatin1String(".lib");
-             else if (isMingw)
--                libFilePath += QLatin1String(".a");
-+                libFilePath += isStaticLibrary ? QLatin1String(".a") : QLatin1String(".dll.a");
+@@ -255,7 +255,7 @@ void QtModuleInfo::setupLibraries(const QtEnvironment &qtEnv, bool debugBuild,
+                 if (qtEnv.mkspecName.contains(QLatin1String("msvc")))
+                     libFilePath += QLatin1String(".lib");
+                 else if (isMingw)
+-                    libFilePath += QLatin1String(".a");
++                    libFilePath += isStaticLibrary ? QLatin1String(".a") : QLatin1String(".dll.a");
+             }
              continue;
          }
-         if (!simplifiedLine.startsWith("QMAKE_PRL_LIBS"))
 -- 
 2.3.5
 
diff --git a/mingw-w64-qbs/PKGBUILD b/mingw-w64-qbs/PKGBUILD
index b6e5a4fc31..2f0a2415eb 100644
--- a/mingw-w64-qbs/PKGBUILD
+++ b/mingw-w64-qbs/PKGBUILD
@@ -22,10 +22,10 @@
 _realname=qbs
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.4.3
+pkgver=1.4.5
 pkgrel=1
 _pkgfqn="${_realname}-src-${pkgver}"
-pkgdesc='Qt Build Suite'
+pkgdesc="Qt Build Suite (mingw-w64)"
 url='http://qt-project.org'
 arch=('any')
 depends=("${MINGW_PACKAGE_PREFIX}-qt5")
@@ -41,10 +41,10 @@ source=("http://download.qt-project.org/official_releases/qbs/${pkgver}/${_pkgfq
         "0008-add-many-files-to-installed-headers.1.4.patch"
         "0090-WIP-Xcode-generator.1.4.patch"
         "0091-Disable-WIP-Xcode-generator.1.4.patch")
-sha256sums=('0c47291ac578c1fc8f2bd6ab20fbeeb58630c4c6ddc085f6081ae570f825f787'
+sha256sums=('f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19'
             '838098b25a8044176b3139b4003594570c62a8d64f5470fbbd769f3bf44e0855'
             '18f1bfe2434ccf97e1366a96b83bdc41bbd4399185bb701d061710b292a5ad59'
-            '6daa43c65e4ac440470687a31c74ab6d4bdcfa0fb3c195678e62a9f800356b1a'
+            'a6f3316cd4756ba60404ac17f0a60aa573b99c08501f3f423f4f71052e149ebc'
             '1a9499215f4fc8fc9a530a984fe7248ad55720a383ceb0984ad7afb25abda7d6'
             '40d53fca4e80ab63baa8649bae43882daf2c91de22412c71dec712ac59f4a39e'
             'f00efb4af427e4de5edb0c46196f0c6192294559c92a309eea6dfd81c0d302c3'
@@ -53,7 +53,7 @@ sha256sums=('0c47291ac578c1fc8f2bd6ab20fbeeb58630c4c6ddc085f6081ae570f825f787'
 
 prepare() {
   cd ${_pkgfqn}
-  [ -d src/plugins/generator ] && rm -rf src/plugins/generator
+  [[ -d src/plugins/generator ]] && rm -rf src/plugins/generator
   rm -rf src/lib/corelib/api/generator.*
   rm -rf src/lib/corelib/tools/generat*
   if [ -d .git ]; then
@@ -81,7 +81,7 @@ build() {
     _config="debug"
   fi
   cd ${srcdir}/${_pkgfqn}
-  [ -d build-${CARCH} ] && rm -rf build-${CARCH}
+  [[ -d build-${CARCH} ]] && rm -rf build-${CARCH}
   mkdir build-${CARCH}
   cd build-${CARCH}
   
@@ -110,4 +110,3 @@ package() {
     cp ${srcdir}/manifest ${pkgdir}${MINGW_PREFIX}/bin/${ff}.exe.manifest
   done
 }
-