From 0db0b7b9ac22e8d0ffc22527b92d5fcfdeb503b1 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 25 May 2017 01:51:21 +0000
Subject: [PATCH] extra/qtcreator to 4.3.0-1

---
 extra/qtcreator/PKGBUILD | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/extra/qtcreator/PKGBUILD b/extra/qtcreator/PKGBUILD
index 5c2923aa5..d6ef76609 100644
--- a/extra/qtcreator/PKGBUILD
+++ b/extra/qtcreator/PKGBUILD
@@ -14,8 +14,8 @@
 buildarch=12
 
 pkgname=qtcreator
-pkgver=4.2.2
-pkgrel=3
+pkgver=4.3.0
+pkgrel=1
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
 url='http://qt-project.org'
@@ -32,23 +32,28 @@ optdepends=('qt5-doc: integrated Qt documentation'
             'git: git support'
             'mercurial: mercurial support'
             'bzr: bazaar support')
-source=("http://download.qt.io/official_releases/qtcreator/4.2/${pkgver}/qt-creator-opensource-src-${pkgver}.tar.xz"
+source=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/${pkgver}/qt-creator-opensource-src-${pkgver}.tar.xz"
         '0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch')
-sha512sums=('cab23a75b3b8ef68cadf4fe57b81e96ef647bb48ab4c57618bf6dd25aed50abb412ac7fa76848b97da01f2df589ec763c95321956506aa4f159383f188efbf2d'
+sha512sums=('462d2494d54c5b528ed187a43365a296c08ad2b104ada451a91d381f070472433ef91856f80a4d94091919296c95820e5d546800fc26a43a9709a6329fba02bb'
             'af0a0d5a2fadcfce14def65be73c99bff8227794b9ad2be333713c89e226e2c6b43802a802b6e30f3e6c1b4b77f31183bffdcca3404d9686f15fa84dfc64d1a1')
 
 prepare() {
-  cd qt-creator-opensource-src-${pkgver}
+  [[ -d build ]] && rm -r build
+  mkdir build
 
+  # fix hardcoded libexec path
+  sed -e 's|libexec\/qtcreator|lib\/qtcreator|g' -i qt-creator-opensource-src-${pkgver}/qtcreator.pri
+  # use system qbs
+  rm -r qt-creator-opensource-src-${pkgver}/src/shared/qbs
+
+  cd qt-creator-opensource-src-${pkgver}
   git apply ../0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch
 }
 
 build() {
-  [[ -d build ]] && rm -r build
-  mkdir build && cd build
+  cd build
 
-  LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr qmake QMAKE_CFLAGS_ISYSTEM=-I \
-    CONFIG+=journald -r ../qt-creator-opensource-src-${pkgver}/qtcreator.pro
+  qmake CONFIG+=journald ../qt-creator-opensource-src-${pkgver}/qtcreator.pro
   make
   make docs
 }