[arch-commits] Commit in qtcreator/trunk (PKGBUILD)

[Antonio Rojas via arch-commits]

    Date: Friday, July 6, 2018 @ 14:17:24
  Author: arojas
Revision: 328033

Fix widgets state saving with Qt 5.11.1 (FS#59233)

Modified:
  qtcreator/trunk/PKGBUILD

----------+
 PKGBUILD |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2018-07-06 11:03:53 UTC (rev 328032)
+++ PKGBUILD    2018-07-06 14:17:24 UTC (rev 328033)
@@ -10,7 +10,7 @@
 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'
@@ -28,16 +28,21 @@
             'mercurial: mercurial support'
             'bzr: bazaar support'
             'valgrind: analyze support')
-source=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz";)
-sha256sums=('bbaf667f51051c602df02e04c1d7369bef9553326d8377bc36a019ae718843cc')
+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";)
+sha256sums=('bbaf667f51051c602df02e04c1d7369bef9553326d8377bc36a019ae718843cc'
+            'eadbc3a730c52e2fc75b494b48c41bcb2fe74d8eb2bbec1cdd0bd466d1acb967')
 
 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
 }
 
 build() {
@@ -44,7 +49,7 @@
   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
 }