Fix make dependencies and pkgver function

Signed-off-by: Christopher Arndt <chris@chrisarndt.de>

3 files changed, 15 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0fef896105de..5a80e6312fd8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,13 @@
 pkgbase = peasy-git
 	pkgdesc = A plugin for Geany which allows to load other plugins written in Python or Lua (Git version)
-	pkgver = 0.9.r146.b3d43ff
-	pkgrel = 2
+	pkgver = v0.9.r7.g1756415
+	pkgrel = 1
 	url = https://github.com/kugel-/peasy/
 	arch = x86_64
 	arch = i686
 	license = GPL3
+	makedepends = gobject-introspection
+	makedepends = intltool
 	makedepends = vala
 	depends = libpeas
 	depends = geany
diff --git a/.gitignore b/.gitignore
index 6e8e75c3a589..f84fcdd21608 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
-pkg
-src
-peasy
+pkg/
+src/
+peasy/
 peasy-git-*.src.tar.gz
 peasy-git-*.pkg.tar.xz
-.AURINFO
-
+peasy-git-*.pkg.tar.zst
diff --git a/PKGBUILD b/PKGBUILD
index 17b5e14ece0c..70257267587f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 
 _pkgname=peasy
 pkgname="${_pkgname}-git"
-pkgver=0.9.r146.b3d43ff
-pkgrel=2
+pkgver=v0.9.r7.g1756415
+pkgrel=1
 pkgdesc="A plugin for Geany  which allows to load other plugins written in Python or Lua (Git version)"
 url="https://github.com/kugel-/peasy/"
 arch=('x86_64' 'i686')
 license=('GPL3')
 depends=('libpeas' 'geany')
-makedepends=('vala')
+makedepends=('gobject-introspection' 'intltool' 'vala')
 optdepends=('python: support plugins written in Python'
             'lua51: support plugins written in Lua')
 conflicts=("${_pkgname}")
@@ -21,8 +21,10 @@ sha256sums=('SKIP')
 pkgver() {
   cd "${srcdir}/${_pkgname}"
 
-  ver=$(git describe --tags | sed -e 's/^v//' -e 's/-/_/g')
-  echo $ver.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+  ( set -o pipefail
+    git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
 }
 
 prepare() {