revision

2 files changed, 67 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5522c66cebea..a5daa13b035a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,36 +1,41 @@
 pkgbase = tokodon-git
 	pkgdesc = Native Mastodon client
-	pkgver = 23.08.2.r16.ge9f36469
+	pkgver = 24.02.2.r232.gd78745d
 	pkgrel = 2
 	url = https://invent.kde.org/network/tokodon
 	arch = x86_64
 	license = LGPL
+	checkdepends = xorg-server-xvfb
 	makedepends = extra-cmake-modules
 	makedepends = git
-	depends = kio5
-	depends = kirigami2
-	depends = kirigami-addons5
-	depends = qtkeychain-qt5
-	depends = kdbusaddons5
-	depends = ki18n5
-	depends = qt5-websockets
-	depends = knotifications5
-	depends = kitemmodels5
-	depends = qqc2-desktop-style5
-	depends = mpv
-	depends = glibc
 	depends = gcc-libs
-	depends = kconfig5
-	depends = qt5-base
-	depends = qt5-declarative
-	depends = qt5-quickcontrols2
-	depends = kconfigwidgets5
-	depends = kwindowsystem5
-	depends = kcoreaddons5
-	depends = hicolor-icon-theme
+	depends = glibc
+	depends = kcolorscheme
+	depends = kconfig
+	depends = kcoreaddons
+	depends = kdbusaddons
+	depends = ki18n
+	depends = kio
+	depends = kirigami
+	depends = kirigami-addons
+	depends = kitemmodels
+	depends = knotifications
+	depends = kservice
+	depends = kwindowsystem
+	depends = mpvqt
+	depends = purpose
+	depends = qqc2-desktop-style
+	depends = qt6-5compat
+	depends = qt6-base
+	depends = qt6-declarative
+	depends = qt6-websockets
+	depends = qt6-webview
+	depends = qtkeychain-qt6
+	optdepends = mesa-vdpau: solve Failed to open VDPAU backend libvdpau_radeonsi.so
+	optdepends = nvidia-utils: solve Cannot load libcuda.so.1
 	provides = tokodon
 	conflicts = tokodon
-	source = git+https://invent.kde.org/network/tokodon.git#branch=release/23.08
+	source = git+https://invent.kde.org/network/tokodon.git
 	sha256sums = SKIP
 
 pkgname = tokodon-git
diff --git a/PKGBUILD b/PKGBUILD
index c9f371fd9ed5..ba4210f29ef7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,37 +2,68 @@
 # Contributor: marcin mikołajczak <me@mkljczk.pl>
 
 pkgname=tokodon-git
-pkgver=23.08.2.r16.ge9f36469
+pkgver=24.02.2.r232.gd78745d
 pkgrel=2
 pkgdesc="Native Mastodon client"
 arch=(x86_64)
 url="https://invent.kde.org/network/tokodon"
 license=(LGPL)
-depends=(kio5 kirigami2 kirigami-addons5 qtkeychain-qt5 kdbusaddons5 ki18n5 qt5-websockets knotifications5
-         kitemmodels5 qqc2-desktop-style5 mpv
-
-         # namcap implicit depends
-         glibc gcc-libs kconfig5 qt5-base qt5-declarative qt5-quickcontrols2 kconfigwidgets5 kwindowsystem5 kcoreaddons5
-         hicolor-icon-theme)
+depends=(gcc-libs
+         glibc
+         kcolorscheme
+         kconfig
+         kcoreaddons
+         kdbusaddons
+         ki18n
+         kio
+         kirigami
+         kirigami-addons
+         kitemmodels
+         knotifications
+         kservice
+         kwindowsystem
+         mpvqt
+         purpose
+         qqc2-desktop-style
+         qt6-5compat
+         qt6-base
+         qt6-declarative
+         qt6-websockets
+         qt6-webview
+         qtkeychain-qt6)
 makedepends=(extra-cmake-modules git)
+checkdepends=(xorg-server-xvfb)
+optdepends=("mesa-vdpau: solve Failed to open VDPAU backend libvdpau_radeonsi.so"
+            "nvidia-utils: solve Cannot load libcuda.so.1")
 conflicts=(tokodon)
 provides=(tokodon)
-source=("git+https://invent.kde.org/network/tokodon.git#branch=release/23.08")
+source=(#"git+https://invent.kde.org/network/tokodon.git#branch=release/24.05"
+        "git+https://invent.kde.org/network/tokodon.git")
 sha256sums=('SKIP')
 
 pkgver() {
   cd tokodon
-  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  #git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  local _tag=$(git tag | sort -rV | head -1)
+  local _version="${_tag#v}"
+  local _revision=$(git rev-list --count --cherry-pick "$_tag"...HEAD)
+  local _hash=$(git rev-parse --short=7 HEAD)
+  printf '%s.r%s.g%s' "${_version:?}" "${_revision:?}" "${_hash:?}"
 }
 
 build() {
   cmake -B build -S tokodon -Wno-dev \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DBUILD_TESTING=ON \
     -DCMAKE_INSTALL_PREFIX=/usr
 
   cmake --build build
 }
 
+check() {
+  xvfb-run -s '-screen 0 1920x1080x24 -nolisten local'  ctest --test-dir build --output-on-failure
+}
+
 package() {
   DESTDIR="${pkgdir}" cmake --install build
 }