Use Qt 6

2 files changed, 25 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8690440d3d6e..7ae95341f014 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = syncthingtray-git
 	pkgdesc = Tray application for Syncthing
 	pkgver = 1714.7846301
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Martchus/syncthingtray
 	arch = i686
 	arch = x86_64
@@ -14,27 +14,28 @@ pkgbase = syncthingtray-git
 	checkdepends = iproute2
 	makedepends = cmake
 	makedepends = ninja
-	makedepends = qt5-tools
+	makedepends = qt6-tools
+	makedepends = qt6-declarative
 	makedepends = git
 	makedepends = boost
-	makedepends = kio5
-	makedepends = plasma-framework5
+	makedepends = clang
+	makedepends = kio
+	makedepends = libplasma
 	makedepends = extra-cmake-modules
 	depends = libqtutilities-git.so
 	depends = libqtforkawesome-git.so
 	depends = libc++utilities-git.so
 	depends = libboost_filesystem.so
-	depends = qt5-svg
+	depends = qt6-svg
 	depends = openssl
 	depends = desktop-file-utils
 	depends = xdg-utils
-	depends = qt5-webengine
-	depends = qt5-declarative
-	optdepends = kio5: KIO plugin for Syncthing actions in Dolphin
-	optdepends = plasma-workspace: Plasmoid for Plasma 5 desktop
+	depends = qt6-webengine
+	depends = qt6-declarative
+	optdepends = kio: KIO plugin for Syncthing actions in Dolphin
+	optdepends = plasma-workspace: Plasmoid for Plasma 6 desktop
 	conflicts = syncthingtray
 	source = syncthingtray::git+https://github.com/Martchus/syncthingtray.git
 	sha256sums = SKIP
 
 pkgname = syncthingtray-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 3052111ddcad..a0c3e2f21e92 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,23 +26,23 @@ _reponame=syncthingtray
 pkgname=syncthingtray-git
 _name=${pkgname%-git}
 pkgver=1714.7846301
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='Tray application for Syncthing'
 license=('GPL')
 depends=('libqtutilities-git.so' 'libqtforkawesome-git.so' 'libc++utilities-git.so' 'libboost_filesystem.so'
-         'qt5-svg' 'openssl' 'desktop-file-utils' 'xdg-utils')
-[[ $_webview_provider == none ]] && [[ $_js_provider == none ]] && depends+=('qt5-base')
-[[ $_webview_provider == webkit ]] && depends+=('qt5-webkit')
-[[ $_webview_provider == webengine ]] && depends+=('qt5-webengine')
-[[ $_js_provider == script ]] && depends+=('qt5-script')
-[[ $_js_provider == qml ]] && depends+=('qt5-declarative')
-[[ $_enable_kio_plugin ]] && optdepends+=('kio5: KIO plugin for Syncthing actions in Dolphin')
-[[ $_enable_plasmoid ]] && optdepends+=('plasma-workspace: Plasmoid for Plasma 5 desktop')
-makedepends=('cmake' 'ninja' 'qt5-tools' 'git' 'boost')
+         'qt6-svg' 'openssl' 'desktop-file-utils' 'xdg-utils')
+[[ $_webview_provider == none ]] && [[ $_js_provider == none ]] && depends+=('qt6-base')
+[[ $_webview_provider == webkit ]] && depends+=('qt6-webkit')
+[[ $_webview_provider == webengine ]] && depends+=('qt6-webengine')
+[[ $_js_provider == script ]] && depends+=('qt6-script')
+[[ $_js_provider == qml ]] && depends+=('qt6-declarative')
+[[ $_enable_kio_plugin ]] && optdepends+=('kio: KIO plugin for Syncthing actions in Dolphin')
+[[ $_enable_plasmoid ]] && optdepends+=('plasma-workspace: Plasmoid for Plasma 6 desktop')
+makedepends=('cmake' 'ninja' 'qt6-tools' 'qt6-declarative' 'git' 'boost' 'clang')
 checkdepends=('cppunit' 'syncthing' 'iproute2')
-[[ $_enable_kio_plugin ]] && makedepends+=('kio5')
-[[ $_enable_plasmoid ]] && makedepends+=('plasma-framework5' 'extra-cmake-modules')
+[[ $_enable_kio_plugin ]] && makedepends+=('kio')
+[[ $_enable_plasmoid ]] && makedepends+=('libplasma' 'extra-cmake-modules')
 #provides=("${_name}")
 conflicts=("${_name}")
 url="https://github.com/Martchus/${_reponame}"
@@ -77,6 +77,8 @@ build() {
     -DLIB_SYNCTHING_MODEL_CONFIGURATION_TARGET_SUFFIX:STRING='git' \
     -DSYNCTHINGPLASMOID_CONFIGURATION_TARGET_SUFFIX:STRING='git' \
     -DSYNCTHINGWIDGETS_CONFIGURATION_TARGET_SUFFIX:STRING='git' \
+    -DQT_PACKAGE_PREFIX:STRING='Qt6' \
+    -DKF_PACKAGE_PREFIX:STRING='KF6' \
     -DBUILD_SHARED_LIBS:BOOL=ON \
     -DWEBVIEW_PROVIDER="${_webview_provider}" \
     -DJS_PROVIDER="${_js_provider}" \