[arch-commits] Commit in qtcreator/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Antonio Rojas]

    Date: Friday, July 6, 2018 @ 14:17:49
  Author: arojas
Revision: 328034

archrelease: copy trunk to extra-x86_64

Added:
  qtcreator/repos/extra-x86_64/PKGBUILD
    (from rev 328033, qtcreator/trunk/PKGBUILD)
Deleted:
  qtcreator/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |  123 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 64 insertions(+), 59 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-06 14:17:24 UTC (rev 328033)
+++ PKGBUILD	2018-07-06 14:17:49 UTC (rev 328034)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Imanol Celaya <ornitorrincos at archlinux-es.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
-# Contributor: Dan Vratil <progdan at progdansoft.com>
-# Contributor: thotypous <matiasΘarchlinux-br·org>
-# Contributor: delor <bartekpiech gmail com>
-
-pkgname=qtcreator
-pkgver=4.6.2
-_clangver=6.0.0
-pkgrel=1
-pkgdesc='Lightweight, cross-platform integrated development environment'
-arch=(x86_64)
-url='http://qt-project.org'
-license=(LGPL)
-depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 qt5-webengine clang=$_clangver qbs)
-makedepends=(git mesa llvm)
-options=(docs)
-optdepends=('qt5-doc: integrated Qt documentation'
-            'qt5-examples: welcome page examples'
-            'qt5-translations: for other languages'
-            'gdb: debugger'
-            'cmake: cmake project support'
-            'x11-ssh-askpass: ssh support'
-            'git: git support'
-            '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')
-
-prepare() {
-  mkdir -p 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
-}
-
-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
-  make
-  make docs
-}
-
-package() {
-  cd build
-
-  make INSTALL_ROOT="$pkgdir/usr/" install
-  make INSTALL_ROOT="$pkgdir/usr/" install_docs
-
-  install -Dm644 "$srcdir"/qt-creator-opensource-src-$pkgver/LICENSE.GPL3-EXCEPT "$pkgdir"/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT
-}

Copied: qtcreator/repos/extra-x86_64/PKGBUILD (from rev 328033, qtcreator/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-07-06 14:17:49 UTC (rev 328034)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Imanol Celaya <ornitorrincos at archlinux-es.org>
+# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+# Contributor: Dan Vratil <progdan at progdansoft.com>
+# Contributor: thotypous <matiasΘarchlinux-br·org>
+# Contributor: delor <bartekpiech gmail com>
+
+pkgname=qtcreator
+pkgver=4.6.2
+_clangver=6.0.0
+pkgrel=2
+pkgdesc='Lightweight, cross-platform integrated development environment'
+arch=(x86_64)
+url='http://qt-project.org'
+license=(LGPL)
+depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 qt5-webengine clang=$_clangver qbs)
+makedepends=(git mesa llvm)
+options=(docs)
+optdepends=('qt5-doc: integrated Qt documentation'
+            'qt5-examples: welcome page examples'
+            'qt5-translations: for other languages'
+            'gdb: debugger'
+            'cmake: cmake project support'
+            'x11-ssh-askpass: ssh support'
+            'git: git support'
+            '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"
+        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 qtcreator.pri
+  # use system qbs
+  rm -r src/shared/qbs
+  # Fix widgets state saving with Qt 5.11.1
+  patch -p1 -i ../qtcreatorbug-20721.patch
+}
+
+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
+  make
+  make docs
+}
+
+package() {
+  cd build
+
+  make INSTALL_ROOT="$pkgdir/usr/" install
+  make INSTALL_ROOT="$pkgdir/usr/" install_docs
+
+  install -Dm644 "$srcdir"/qt-creator-opensource-src-$pkgver/LICENSE.GPL3-EXCEPT "$pkgdir"/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT
+}