Remove qbs and use build reciept from release PKGBUILD

2 files changed, 35 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 98a4e815d8d1..6d277d7b3b7d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,43 +1,41 @@
 pkgbase = qtcreator-git
 	pkgdesc = Lightweight, cross-platform integrated development environment
-	pkgver = v6.0.0.r260.ga3af941adf
+	pkgver = v6.0.1.r219.g57381ab358
 	pkgrel = 1
 	url = https://www.qt.io
 	arch = x86_64
 	license = LGPL
-	makedepends = git
+	makedepends = cmake
 	makedepends = llvm
-	makedepends = mesa
 	makedepends = python
+	depends = qt6-tools
+	depends = qt6-svg
+	depends = qt6-quick3d
+	depends = qt6-webengine
+	depends = qt6-serialport
+	depends = qt6-shadertools
+	depends = qt6-5compat
 	depends = clang
 	depends = clazy
-	depends = qt5-quickcontrols
-	depends = qt5-quickcontrols2
-	depends = qt5-script
-	depends = qt5-tools
-	depends = qt5-webengine
+	depends = yaml-cpp
 	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 = qt6-doc: integrated Qt documentation
+	optdepends = qt6-examples: welcome page examples
+	optdepends = qt6-translations: other languages
 	optdepends = subversion: subversion support
 	optdepends = valgrind: analyze support
 	optdepends = x11-ssh-askpass: ssh support
 	provides = qtcreator
-	provides = qbs
 	conflicts = qtcreator
-	conflicts = qbs
 	options = docs
 	source = git+https://code.qt.io/qt-creator/qt-creator.git
-	source = git+https://code.qt.io/qbs/qbs.git
 	source = org.qt-project.qtcreator.desktop
 	sha256sums = SKIP
-	sha256sums = SKIP
 	sha256sums = 90addb552923db0897f7096d166c2d1bf1c3390ae9c79687fc4ce7c4e57ee810
 
 pkgname = qtcreator-git
diff --git a/PKGBUILD b/PKGBUILD
index a799dad49e90..9918cb74387b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,14 +8,15 @@
 # Contributor: Tobias Hunger <tobias dot hunger at gmail dot com>
 
 pkgname=qtcreator-git
-pkgver=v6.0.0.r260.ga3af941adf
+pkgver=v6.0.1.r219.g57381ab358
 pkgrel=1
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('x86_64')
 url='https://www.qt.io'
 license=(LGPL)
-depends=(clang clazy qt5-quickcontrols qt5-quickcontrols2 qt5-script qt5-tools qt5-webengine)
-makedepends=(git llvm mesa python)
+depends=(qt6-tools qt6-svg qt6-quick3d qt6-webengine qt6-serialport qt6-shadertools qt6-5compat
+         clang clazy yaml-cpp) # syntax-highlighting
+makedepends=(cmake llvm python)
 options=(docs)
 optdepends=('bzr: bazaar support'
             'cmake: cmake project support'
@@ -23,19 +24,17 @@ optdepends=('bzr: bazaar support'
             'gdb: debugger'
             'git: git support'
             'mercurial: mercurial support'
-            'qt5-doc: integrated Qt documentation'
-            'qt5-examples: welcome page examples'
-            'qt5-translations: other languages'
+            'qt6-doc: integrated Qt documentation'
+            'qt6-examples: welcome page examples'
+            'qt6-translations: other languages'
             'subversion: subversion support'
             'valgrind: analyze support'
             'x11-ssh-askpass: ssh support')
-provides=(qtcreator qbs)
-conflicts=(qtcreator qbs)
+provides=(qtcreator)
+conflicts=(qtcreator)
 source=('git+https://code.qt.io/qt-creator/qt-creator.git'
-        'git+https://code.qt.io/qbs/qbs.git'
         'org.qt-project.qtcreator.desktop')
 sha256sums=('SKIP'
-            'SKIP'
             '90addb552923db0897f7096d166c2d1bf1c3390ae9c79687fc4ce7c4e57ee810')
 
 pkgver() {
@@ -51,26 +50,28 @@ prepare() {
 
     # fix hardcoded libexec path
     sed -e 's|libexec\/qtcreator|lib\/qtcreator|g' -i qtcreator.pri
-
-    # Do *NOT* use system Qbs: qt creator master is *NOT* compatible with any released Qbs!
-    ( cd src/shared && rm -rf qbs && ln -s ../../../qbs qbs )
 }
 
 build() {
     cd build
-
-    qmake LLVM_INSTALL_DIR=/usr CONFIG+=journald QMAKE_CFLAGS_ISYSTEM=-I \
-        "${srcdir}/qt-creator/qtcreator.pro"
-
-    make
-    make docs
+    
+    cmake -B . -S "${srcdir}/qt-creator" \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBEXECDIR=lib \
+        -DWITH_DOCS=ON \
+        -DBUILD_DEVELOPER_DOCS=ON \
+        -DBUILD_QBS=OFF \
+        -DQTC_CLANG_BUILDMODE_MATCH=ON
+    cmake --build .
+    cmake --build . --target docs
 }
 
 package() {
     cd build
 
-    make INSTALL_ROOT="${pkgdir}/usr/" install
-    make INSTALL_ROOT="${pkgdir}/usr/" install_docs
+    DESTDIR="$pkgdir" cmake --install .
+    # Install docs
+    cp -r share/doc "$pkgdir"/usr/share
 
     install -Dm644 "${srcdir}/qt-creator/LICENSE.GPL3-EXCEPT" \
         "${pkgdir}/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT"