reinstate repo blueprint-compiler

2 files changed, 5 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93395360299a..1b34ba6dfdc6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = wayfarer-git
 	pkgdesc = Screen recorder for GNOME / Wayland or X11 / Pipewire / XDG Portal
-	pkgver = 1.1.0.r72.20230304.b77ac60
+	pkgver = 1.1.0.r0.b77ac60
 	pkgrel = 1
 	url = https://github.com/stronnag/wayfarer.git
 	arch = i686
@@ -14,6 +14,7 @@ pkgbase = wayfarer-git
 	makedepends = vala
 	makedepends = meson
 	makedepends = gobject-introspection
+	makedepends = blueprint-compiler
 	depends = gtk4
 	depends = libpulse
 	provides = wayfarer
diff --git a/PKGBUILD b/PKGBUILD
index 9ff7d5a1aa6d..480439db530e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
 
 _pkgname=wayfarer
 pkgname=wayfarer-git
-pkgver=1.1.0.r72.20230304.b77ac60
+pkgver=1.1.0.r0.b77ac60
 pkgrel=1
 pkgdesc='Screen recorder for GNOME / Wayland or X11 / Pipewire / XDG Portal'
 arch=('i686' 'x86_64' 'arm' 'aarch64' 'armv7h' 'pentium4')
 url='https://github.com/stronnag/wayfarer.git'
 license=('GPL3')
-makedepends=('git' 'vala' 'meson' 'gobject-introspection')
+makedepends=('git' 'vala' 'meson' 'gobject-introspection' 'blueprint-compiler')
 depends=('gtk4' 'libpulse')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
@@ -17,18 +17,7 @@ sha512sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
-
-  _ver="$(git describe --tags | sed -E -e 's|^[vV]||' -e 's|\-g[0-9a-f]*$||' | tr '-' '+')"
-  _rev="$(git rev-list --count HEAD)"
-  _date="$(git log -1 --date=format:"%Y%m%d" --format="%ad")"
-  _hash="$(git rev-parse --short HEAD)"
-
-  if [ -z "${_ver}" ]; then
-    error "Could not determine version."
-    return 1
-  else
-    printf '%s' "${_ver}.r${_rev}.${_date}.${_hash}"
-  fi
+  printf "%s" "$(git describe --long --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
 build() {