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

[Sven-Hendrik Haase]

    Date: Wednesday, May 11, 2016 @ 16:36:03
  Author: svenstaro
Revision: 267810

upgpkg: qtcreator 4.0.0-1

upstream release 4.0.0

Modified:
  qtcreator/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-11 13:57:24 UTC (rev 267809)
+++ PKGBUILD	2016-05-11 14:36:03 UTC (rev 267810)
@@ -7,9 +7,9 @@
 # Contributor: delor <bartekpiech gmail com>
 
 pkgname=qtcreator
-pkgver=3.6.1
-_pkgver=v3.6.1
-pkgrel=3
+pkgver=4.0.0
+_pkgver=v4.0.0
+pkgrel=1
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
 url='http://qt-project.org'
@@ -43,12 +43,6 @@
   git config submodule.qbs.url $srcdir/qbs
   git submodule update
 
-  # Debugger: Allow LLDB-MI to be used as debugger
-  # https://bugreports.qt.io/browse/QTCREATORBUG-15131
-  # https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=97e9f113879c
-  # https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=e57b0db0f959
-  git cherry-pick -n 97e9f113879c e57b0db0f959
-
   # Fix build with GCC 6 (patch from Fedora)
   # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Q5SWCUUMWQ4EMS7CU2CBOZHV3WZYOOTT/
   patch -Np1 -i ../qt-creator_llvmincdir.patch
@@ -76,5 +70,5 @@
   chmod +x "${pkgdir}"/usr/bin/qtcreator
 
   install -Dm644 ${srcdir}/qtcreator.desktop ${pkgdir}/usr/share/applications/qtcreator.desktop
-  install -Dm644 ${srcdir}/qt-creator/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT
+  install -Dm644 ${srcdir}/qt-creator/LICENSE.GPL3-EXCEPT ${pkgdir}/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT
 }