From e99052d2c76950b6a41c3b5dac2ba8833cccdada Mon Sep 17 00:00:00 2001
From: bartus <szczepaniak.bartek+github@gmail.com>
Date: Tue, 5 Oct 2021 08:45:27 +0200
Subject: [PATCH] Fix pkgver(): tag lagging behind the project version

Signed-off-by: Greyson Christoforo <grey@christoforo.net>
---
 .SRCINFO | 2 +-
 PKGBUILD | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 62204e1..272044f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freecad-git
 	pkgdesc = A general purpose 3D CAD modeler - git checkout
-	pkgver = 0.19.r909.gc401e3efe3
+	pkgver = 0.20.0.r1693.g8bb582f23f
 	pkgrel = 1
 	epoch = 0
 	url = https://www.freecadweb.org/
diff --git a/PKGBUILD b/PKGBUILD
index dab90be..f184a7f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Grey Christoforo <first name at last name dot net>
 
 pkgname=freecad-git
-pkgver=0.19.r909.gc401e3efe3
+pkgver=0.20.0.r1693.g8bb582f23f
 pkgrel=1
 epoch=0
 pkgdesc='A general purpose 3D CAD modeler - git checkout'
@@ -59,7 +59,10 @@ md5sums=('SKIP')
 
 pkgver() {
   cd FreeCAD
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  read -d$'/n' -r major minor patch < <(grep -Po "set\(PACKAGE_VERSION_(MAJOR|MINOR|PATCH) \"\K[0-9]*" CMakeLists.txt) || true
+  count=$(git rev-list --count $(git tag --sort=-creatordate|head -1)..HEAD)
+  hash=$(git rev-parse --short HEAD)
+  printf "%d.%d.%d.r%d.g%s" "$major" "$minor" "$patch" "$count" "$hash"
 }
 
 prepare() {