Update dependencies based on the Arch repo package

4 files changed, 56 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50bac5b01648..6a2a5117fc9b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,36 +1,36 @@
 pkgbase = qtcreator-git
 	pkgdesc = Lightweight, cross-platform integrated development environment
-	pkgver = v3.6.0.beta1.r111.ga1f2b8c
+	pkgver = v4.3.0.r274.gee17a71a1f
 	pkgrel = 1
-	url = http://wiki.qt.io/Category:Tools::QtCreator
-	install = qtcreator-git.install
+	url = https://www.qt.io/ide/
 	arch = i686
 	arch = x86_64
 	license = LGPL
 	makedepends = git
+	makedepends = llvm
 	makedepends = mesa
-	makedepends = clang
-	depends = qt5-quick1
+	depends = clang
+	depends = qbs
+	depends = qt5-svg
 	depends = qt5-tools
-	depends = qt5-quickcontrols
-	optdepends = qt5-doc: for the integrated Qt documentation
-	optdepends = gdb: for the debugger
-	optdepends = cmake: for cmake project support
-	optdepends = openssh-askpass: for ssh support
-	optdepends = git: for git support
-	optdepends = mercurial: for mercurial support
-	optdepends = bzr: for bazaar support
-	optdepends = clang: Clang code model
-	optdepends = valgrind: for analyze support
+	depends = qt5-webengine
+	optdepends = bzr: bazaar support
+	optdepends = cmake: cmake project support
+	optdepends = cvs: cvs support
+	optdepends = gdb: debugger
+	optdepends = git: git support
+	optdepends = mercurial: mercurial support
+	optdepends = qt5-doc: integrated Qt documentation
+	optdepends = qt5-examples: welcome page examples
+	optdepends = qt5-translations: other languages
+	optdepends = subversion: subversion support
+	optdepends = valgrind: analyze support
+	optdepends = x11-ssh-askpass: ssh support
 	provides = qtcreator
 	conflicts = qtcreator
 	options = docs
 	source = git://code.qt.io/qt-creator/qt-creator.git
-	source = git://code.qt.io/qt-labs/qbs.git
-	source = qtcreator.desktop
 	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = 800c94165c547b64012a207d9830250a
 
 pkgname = qtcreator-git
 
diff --git a/PKGBUILD b/PKGBUILD
index b9ce94e378be..3526fe23d4e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,68 +8,63 @@
 # Contributor: Tobias Hunger <tobias dot hunger at gmail dot com>
 
 pkgname=qtcreator-git
-pkgver=v4.0.0.rc1.r117.g03acd1f
+pkgver=v4.3.0.r274.gee17a71a1f
 pkgrel=1
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
-url='http://wiki.qt.io/Category:Tools::QtCreator'
-license=('GPL')
-depends=('qt5-script' 'qt5-tools' 'qt5-quickcontrols' 'qt5-svg')
-makedepends=('git' 'mesa' 'clang')
+url='https://www.qt.io/ide/'
+license=('LGPL')
+depends=('clang' 'qbs' 'qt5-svg' 'qt5-tools' 'qt5-webengine')
+makedepends=('git' 'llvm' 'mesa')
 options=('docs')
-optdepends=('qt5-doc: for the integrated Qt documentation'
-            'gdb: for the debugger'
-            'cmake: for cmake project support'
-            'openssh-askpass: for ssh support'
-            'git: for git support'
-            'mercurial: for mercurial support'
-            'bzr: for bazaar support'
-            'clang: Clang code model'
-            'valgrind: for analyze support'
-            'subversion: for subversion support'
-            'cvs: for cvs support'
-            'valgrind: for valgrind support')
+optdepends=('bzr: bazaar support'
+            'cmake: cmake project support'
+            'cvs: cvs support'
+            'gdb: debugger'
+            'git: git support'
+            'mercurial: mercurial support'
+            'qt5-doc: integrated Qt documentation'
+            'qt5-examples: welcome page examples'
+            'qt5-translations: other languages'
+            'subversion: subversion support'
+            'valgrind: analyze support'
+            'x11-ssh-askpass: ssh support')
 provides=('qtcreator')
 conflicts=('qtcreator')
-install='qtcreator-git.install'
-source=("git://code.qt.io/qt-creator/qt-creator.git"
-        "git://code.qt.io/qt-labs/qbs.git"
-        'qtcreator.desktop')
-md5sums=('SKIP'
-         'SKIP'
-         '800c94165c547b64012a207d9830250a')
+source=("git://code.qt.io/qt-creator/qt-creator.git")
+md5sums=('SKIP')
 
 pkgver() {
-  cd qt-creator
+    cd qt-creator
 
-  git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
+    git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
 }
 
 prepare() {
-  cd qt-creator
+    [[ -d build ]] && rm -r build
+    mkdir build
 
-  git submodule init
-  git config submodule.qbs.url $srcdir/qbs
-  git submodule update
+    # fix hardcoded libexec path
+    sed -e 's|libexec\/qtcreator|lib\/qtcreator|g' -i qt-creator/qtcreator.pri
+    # use system qbs
+    rm -r qt-creator/src/shared/qbs
 }
 
 build() {
-  [[ -d build ]] && rm -r build
-  mkdir build && cd build
+    cd build
 
-  LLVM_INSTALL_DIR=/usr qmake CONFIG+=journald -r ../qt-creator/qtcreator.pro
-  make
-  make docs -j1
+    qmake LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr CONFIG+=journald QMAKE_CFLAGS_ISYSTEM=-I \
+        DEFINES+=QBS_ENABLE_PROJECT_FILE_UPDATES "$srcdir"/qt-creator/qtcreator.pro
+    make
+    make docs
 }
 
 package() {
-  cd build
+    cd build
 
-  make INSTALL_ROOT="${pkgdir}/usr/" install
-  make INSTALL_ROOT="${pkgdir}/usr/" install_docs
+    make INSTALL_ROOT="${pkgdir}/usr/" install
+    make INSTALL_ROOT="${pkgdir}/usr/" install_docs
 
-  install -Dm644 "${srcdir}/qtcreator.desktop" \
-    "${pkgdir}/usr/share/applications/qtcreator.desktop"
-  install -Dm644 "${srcdir}/qt-creator/LICENSE.GPL3-EXCEPT" \
-    "${pkgdir}/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT"
+    install -Dm644 "${srcdir}/qt-creator/LICENSE.GPL3-EXCEPT" \
+        "${pkgdir}/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT"
 }
diff --git a/qtcreator-git.install b/qtcreator-git.install
deleted file mode 100644
index 4d4a283dba5c..000000000000
--- a/qtcreator-git.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/qtcreator.desktop b/qtcreator.desktop
deleted file mode 100644
index a8fbbb4d1f03..000000000000
--- a/qtcreator.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=qtcreator %F
-Name=Qt Creator
-GenericName=C++ IDE for developing Qt applications
-X-KDE-StartupNotify=true
-Icon=QtProject-qtcreator
-Terminal=false
-Categories=Development;IDE;Qt;
-MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource;