Merged with official ABS ksnip PKGBUILD

2 files changed, 18 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ad74739135a8..ac3eb0a7bda5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,18 @@
 pkgbase = ksnip-git
 	pkgdesc = Qt-based screenshot tool that provides many annotation features
-	pkgver = 1.9.0_r2028.gff73c81
+	pkgver = 1.11.0_r2770.g99327370
 	pkgrel = 1
-	url = https://github.com/DamirPorobic/ksnip
+	url = https://github.com/ksnip/ksnip
 	arch = x86_64
 	license = GPL2
-	makedepends = git
 	makedepends = cmake
-	makedepends = extra-cmake-modules-git
+	makedepends = extra-cmake-modules
 	makedepends = ninja
 	makedepends = qt5-tools
 	depends = hicolor-icon-theme
-	depends = kcolorpicker-git
-	depends = kimageannotator-git
+	depends = kimageannotator-qt5-git
 	depends = qt5-x11extras
-	provides = ksnip
-	conflicts = ksnip
-	source = git+https://github.com/DamirPorobic/ksnip.git
+	source = git+https://github.com/ksnip/ksnip.git
 	sha256sums = SKIP
 
 pkgname = ksnip-git
diff --git a/PKGBUILD b/PKGBUILD
index 1bcf6a2600c2..c44d7b6d45e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,32 @@
-# Maintainer: dr460nf1r3 <dr460nf1r3 at garudalinux dot org>
+# Merged with official ABS ksnip PKGBUILD by João, 2024/03/01 (all respective contributors apply herein)
+# Maintainer: João Figueiredo & chaotic-aur <islandc0der@chaotic.cx>
+# Contributor: dr460nf1r3 <dr460nf1r3 at garudalinux dot org>
 # Merged with official ABS ksnip PKGBUILD by João, 2021/05/15 (all respective contributors apply herein)
 # Contributor: João Figueiredo <jf.mundox@gmail.com>
 # Contributor: dracorp aka Piotr Rogoza <piotr.r.public at gmail.com>
 
 pkgname=ksnip-git
-pkgver=1.9.0_r2028.gff73c81
+pkgver=1.11.0_r2770.g99327370
 pkgrel=1
 pkgdesc='Qt-based screenshot tool that provides many annotation features'
 arch=($CARCH)
-url='https://github.com/DamirPorobic/ksnip'
+url="https://github.com/ksnip/${pkgname%-git}"
 license=(GPL2)
-depends=(hicolor-icon-theme kcolorpicker-git kimageannotator-git qt5-x11extras)
-makedepends=(git cmake extra-cmake-modules-git ninja qt5-tools)
-conflicts=(${pkgname%-git})
-provides=(${pkgname%-git})
-source=("git+$url.git")
+depends=(hicolor-icon-theme kimageannotator-qt5-git qt5-x11extras)
+makedepends=(cmake extra-cmake-modules ninja qt5-tools)
+source=("git+https://github.com/ksnip/${pkgname%-git}.git")
 sha256sums=('SKIP')
 
+
 pkgver() {
   cd ${pkgname%-git}
-  _ver="$(grep -m1 'project(ksnip' CMakeLists.txt | sed 's/.* //g' | tr - .)"
-  echo "${_ver%)}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
+  _ver="$(grep -m1 "project(${pkgname%-git}" CMakeLists.txt | sed -e 's/.* //' -e 's/-/./g' -e 's/)//')"
+  echo "${_ver}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cmake -S ${pkgname%-git} -B build -G Ninja -DCMAKE_INSTALL_PREFIX='/usr'
+  cmake -S ${pkgname%-git} -B build -G Ninja \
+    -DCMAKE_INSTALL_PREFIX='/usr'
   cmake --build build
 }