Update Git repo URL and pkgver

2 files changed, 7 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7e3a3cf0f42a..37857a18f8ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = grim-git
 	pkgdesc = Grab images from a Wayland compositor
-	pkgver = r69.fb7261f
+	pkgver = 1.4.0.r6.g1573b1020ce2
 	pkgrel = 1
-	url = http://github.com/emersion/grim
+	url = https://sr.ht/~emersion/grim
 	arch = i686
 	arch = x86_64
 	license = MIT
@@ -17,8 +17,7 @@ pkgbase = grim-git
 	conflicts = grim
 	options = debug
 	options = !strip
-	source = grim::git+https://github.com/emersion/grim.git
+	source = grim::git+https://git.sr.ht/~emersion/grim
 	sha1sums = SKIP
 
 pkgname = grim-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 48d4f3f12d31..6fb23dd49ada 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: emersion <contact emersion fr>
 pkgname=grim-git
 _pkgname=grim
-pkgver=r69.fb7261f
+pkgver=1.4.0.r6.g1573b1020ce2
 pkgrel=1
 license=('MIT')
 pkgdesc='Grab images from a Wayland compositor'
@@ -13,8 +13,8 @@ depends=(
 	"libjpeg-turbo"
 )
 arch=("i686" "x86_64")
-url='http://github.com/emersion/grim'
-source=("${pkgname%-*}::git+https://github.com/emersion/grim.git")
+url='https://sr.ht/~emersion/grim'
+source=("${pkgname%-*}::git+https://git.sr.ht/~emersion/grim")
 sha1sums=('SKIP')
 provides=('grim')
 conflicts=('grim')
@@ -22,7 +22,7 @@ options=(debug !strip)
 
 pkgver() {
 	cd "${srcdir}/${_pkgname}"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
+	git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {