adding commit count to package version to prevent AUR helpers from always trying to update when the git commit hash seems to decrease

2 files changed, 6 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5426df7614e0..5703ebe176cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kdiff3-git
 	pkgdesc = A KDE file comparator/merge tool
-	pkgver = 1.8.70_4622189
-	pkgrel = 1
+	pkgver = 1.8.70.r1162.0fa8910
+	pkgrel = 2
 	url = https://cgit.kde.org/kdiff3.git
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 4ab2211a4384..3a557811d117 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 _basename=kdiff3
 pkgname=${_basename}-git
-pkgver=1.8.70_4622189
-pkgrel=1
+pkgver=1.8.70.r1162.0fa8910
+pkgrel=2
 pkgdesc="A KDE file comparator/merge tool"
 arch=('i686' 'x86_64')
 url="https://cgit.kde.org/kdiff3.git"
@@ -13,9 +13,9 @@ source=("git+https://github.com/KDE/kdiff3.git")
 sha512sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/$_basename"
+  cd "$srcdir/${_basename}"
   ver=`grep -Po 'ecm_setup_version\(\K([0-9.]+)' CMakeLists.txt`
-  git describe --always | sed "s/-/./g" | sed "s/^/${ver}_/g"
+  printf "%s.r%s.%s" "${ver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {