From 958905ab244802e8a0c1fe86210e8d4b2fb9b534 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 6 Jul 2018 14:37:55 +0000
Subject: [PATCH] extra/qtcreator to 4.6.2-2

---
 extra/qtcreator/PKGBUILD | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/extra/qtcreator/PKGBUILD b/extra/qtcreator/PKGBUILD
index 12cfdb9e5..f3b4edea9 100644
--- a/extra/qtcreator/PKGBUILD
+++ b/extra/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86795 2013-03-22 10:46:14Z svenstaro $
+# $Id$
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Maintainer: Antonio Rojas <arojas@archlinux.org>
 # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
@@ -16,7 +16,7 @@ buildarch=12
 pkgname=qtcreator
 pkgver=4.6.2
 _clangver=6.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=(x86_64)
 url='http://qt-project.org'
@@ -34,19 +34,23 @@ optdepends=('qt5-doc: integrated Qt documentation'
             'mercurial: mercurial support'
             'bzr: bazaar support')
 source=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"
+        qtcreatorbug-20721.patch::"http://code.qt.io/cgit/qt-creator/qt-creator.git/patch/?id=cb572773"
         '0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch')
 sha256sums=('bbaf667f51051c602df02e04c1d7369bef9553326d8377bc36a019ae718843cc'
+            'eadbc3a730c52e2fc75b494b48c41bcb2fe74d8eb2bbec1cdd0bd466d1acb967'
             '56e6876f41ee8909ee197f7ab5a2bb18ad5a7fe26ce490a48cdf062fa199ffc6')
 
 prepare() {
   mkdir -p build
 
+  cd qt-creator-opensource-src-$pkgver
   # fix hardcoded libexec path
-  sed -e 's|libexec\/qtcreator|lib\/qtcreator|g' -i qt-creator-opensource-src-${pkgver}/qtcreator.pri
+  sed -e 's|libexec\/qtcreator|lib\/qtcreator|g' -i qtcreator.pri
   # use system qbs
-  rm -r qt-creator-opensource-src-${pkgver}/src/shared/qbs
+  rm -r src/shared/qbs
+  # Fix widgets state saving with Qt 5.11.1
+  patch -p1 -i ../qtcreatorbug-20721.patch
 
-  cd qt-creator-opensource-src-${pkgver}
   git apply ../0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch
 }
 
@@ -54,7 +58,7 @@ build() {
   cd build
 
   qmake LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr CONFIG+=journald QMAKE_CFLAGS_ISYSTEM=-I \
-    DEFINES+=QBS_ENABLE_PROJECT_FILE_UPDATES "$srcdir"/qt-creator-opensource-src-${pkgver}/qtcreator.pro
+    DEFINES+=QBS_ENABLE_PROJECT_FILE_UPDATES "$srcdir"/qt-creator-opensource-src-$pkgver/qtcreator.pro
   make
   make docs
 }