build with qt6-base and some fixes

1 files changed, 14 insertions, 10 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 489bbe51e5b6..2309c4042ffe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,26 @@
 # Maintainer: Sandro Kalbermatter <info.kalsan [ät-symbol] valaiscom.ch>
+# Maintainer: m8D2 <omui (at) proton mail (dot) com>
 
 pkgname=f3-qt-git
-pkgver=v2.0.0.r4.g9445116
-pkgrel=2
-pkgdesc="This is a simple GUI for F3 - Fight Flash Fraud."
-arch=('i686' 'x86_64')
+pkgver=2.1.0.r16.g10ab886
+pkgrel=1
+pkgdesc="A simple GUI for F3 - Fight Flash Fraud."
+arch=(i686 x86_64)
 url="https://github.com/zwpwjwtz/f3-qt"
 license=('GPL3')
-makedepends=('git' 'qt5-base')
-depends=('f3' 'qt5-base')
-provides=('f3-qt')
-conflicts=('f3-qt')
+makedepends=(git)
+depends=(f3 qt6-base)
+provides=(f3-qt)
+conflicts=(f3-qt)
 source=('git+https://github.com/zwpwjwtz/f3-qt.git')
 md5sums=('SKIP')
 
 pkgver() {
   cd "$srcdir/f3-qt"
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+
+  #git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  # cutting off 'v' prefix that presents in the git tag
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
@@ -31,8 +35,8 @@ build() {
 
 package() {
   cd "$srcdir/f3-qt"
-  msg2 'Installing f3-qt...'
   install -Dm755 "$srcdir/f3-qt/f3-qt" "$pkgdir/usr/bin/f3-qt"
+  install -Dm644 "$srcdir/f3-qt/f3-qt.desktop" "$pkgdir/usr/share/applications/f3-qt.desktop"
 }
 
 # vim:set ts=8 sts=2 sw=2 et: