Upgrade to Qt6

2 files changed, 22 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 979e328c42eb..70a01eac366d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,26 @@
 pkgbase = kongress-git
 	pkgdesc = Companion application for conferences
-	pkgver = 1.0_r162.gf5eceec
+	pkgver = 24.04.70_r452.g322779d
 	pkgrel = 1
 	url = https://github.com/KDE/kongress
 	arch = x86_64
-	license = BSD
-	license = GPL
-	license = LGPL
+	license = GPL-2.0-or-later
+	license = LGPL-2.0-or-later
 	makedepends = git
-	makedepends = extra-cmake-modules
-	makedepends = kconfig-git
-	makedepends = kcoreaddons-git
-	makedepends = kirigami2-git
-	makedepends = qt5-base
-	makedepends = qt5-declarative
-	makedepends = qt5-imageformats
-	makedepends = qt5-quickcontrols2
-	makedepends = qt5-svg
-	makedepends = qt5-wayland
-	makedepends = qt5-webengine
-	depends = hicolor-icon-theme
+	makedepends = extra-cmake-modules-git
+	makedepends = python
+	depends = gcc-libs
+	depends = glibc
 	depends = kcalendarcore-git
+	depends = kconfig-git
+	depends = kcoreaddons-git
 	depends = kdbusaddons-git
 	depends = ki18n-git
+	depends = kirigami-git
 	depends = knotifications-git
+	depends = qt6-base
+	depends = qt6-declarative
 	source = git+https://github.com/KDE/kongress.git
 	sha256sums = SKIP
 
 pkgname = kongress-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 4134279beea4..252a7493f069 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,28 @@
-# Maintainer: João Figueiredo <jf.mundox@gmail.com>
+# Maintainer: João Figueiredo <islandc0der@chaotic.cx>
 
 pkgname=kongress-git
-pkgver=1.0_r162.gf5eceec
+pkgver=24.04.70_r452.g322779d
 pkgrel=1
 pkgdesc="Companion application for conferences"
 arch=($CARCH)
 url="https://github.com/KDE/kongress"
-license=(BSD GPL LGPL)
-depends=(hicolor-icon-theme kcalendarcore-git kdbusaddons-git ki18n-git knotifications-git)
-makedepends=(git extra-cmake-modules kconfig-git kcoreaddons-git kirigami2-git qt5-base qt5-declarative qt5-imageformats qt5-quickcontrols2 qt5-svg qt5-wayland qt5-webengine)
+license=(GPL-2.0-or-later LGPL-2.0-or-later)
+depends=(gcc-libs glibc kcalendarcore-git kconfig-git kcoreaddons-git kdbusaddons-git ki18n-git kirigami-git knotifications-git qt6-base qt6-declarative)
+makedepends=(git extra-cmake-modules-git python)
 source=("git+$url.git")
 sha256sums=('SKIP')
 
 pkgver() {
   cd ${pkgname%-git}
-  _ver="$(grep -m1 "project(${pkgname%-git} VERSION" CMakeLists.txt | cut -d '"' -f2 | tr - .)"
-  echo "${_ver}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
+  _major_ver="$(grep -m1 'set *(RELEASE_SERVICE_VERSION_MAJOR' CMakeLists.txt | cut -d '"' -f2)"
+  _minor_ver="$(grep -m1 'set *(RELEASE_SERVICE_VERSION_MINOR' CMakeLists.txt | cut -d '"' -f2)"
+  _micro_ver="$(grep -m1 'set *(RELEASE_SERVICE_VERSION_MICRO' CMakeLists.txt | cut -d '"' -f2)"
+  echo "${_major_ver}.${_minor_ver}.${_micro_ver}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
 }
 
 build() {
   cmake -B build -S ${pkgname%-git} \
+    -DQT_MAJOR_VERSION=6 \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DBUILD_TESTING=OFF
   cmake --build build