Conform to packaging guidelines

2 files changed, 19 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 100b307a6de6..4a4d977d51da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = slurp-git
 	pkgdesc = Select a region in a Wayland compositor
-	pkgver = 20200407.8d2117c
-	pkgrel = 1
+	pkgver = v1.3.2.r7.gfa0d21f
+	pkgrel = 2
+	epoch = 1
 	url = https://github.com/emersion/slurp
 	arch = x86_64
 	license = MIT
@@ -11,10 +12,10 @@ pkgbase = slurp-git
 	makedepends = wayland-protocols
 	depends = cairo
 	depends = wayland
+	depends = libxkbcommon
 	provides = slurp
 	conflicts = slurp
 	source = git+https://github.com/emersion/slurp
 	sha256sums = SKIP
 
 pkgname = slurp-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 33fe96eb18a8..f447e08eb63c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,15 @@
+# Maintainer: Jason Nader <jason *add-dot-here* nader *you-know-what-goes-here* protonmail.com>
+
 pkgname=slurp-git
-pkgver=20200407.8d2117c
-pkgrel=1
+_pkgname=slurp
+pkgver=v1.3.2.r7.gfa0d21f
+pkgrel=2
+epoch=1
 pkgdesc='Select a region in a Wayland compositor'
 arch=('x86_64')
 url='https://github.com/emersion/slurp'
 license=('MIT')
-depends=('cairo' 'wayland')
+depends=('cairo' 'wayland' 'libxkbcommon')
 makedepends=('git' 'meson' 'scdoc' 'wayland-protocols')
 provides=('slurp')
 conflicts=('slurp')
@@ -13,22 +17,18 @@ source=('git+https://github.com/emersion/slurp')
 sha256sums=('SKIP')
 
 pkgver() {
-    cd slurp
-    git log -1 --format='%cd.%h' --date=short | tr -d -
+  cd "$_pkgname"
+  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-    cd slurp
-    meson \
-        --prefix=/usr \
-        --buildtype release \
-        build
-    ninja -C build
+  arch-meson $_pkgname build
+  meson compile -C build
 }
 
 package() {
-    cd slurp
-    DESTDIR="$pkgdir" ninja -C build install
-    install -D -m 0644 LICENSE "$pkgdir"/usr/share/licenses/slurp/LICENSE
-    install -D -m 0644 README.md "$pkgdir"/usr/share/doc/slurp/README.md
+    meson install -C build --destdir "$pkgdir"
+    cd $_pkgname
+    install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
+    install -D -m 0644 README.md "$pkgdir/usr/share/doc/$_pkgname/README.md"
 }