Use arch-meson and fix warnings in namcap

2 files changed, 8 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 75f3256a56e4..e995910c8458 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kmscon-patched-git
 	pkgdesc = Terminal emulator based on Kernel Mode Setting (KMS) (forked and patched version)
-	pkgver = 9.0.0.r0.g3292791
-	pkgrel = 1
+	pkgver = 9.0.0.r3.g1bf602f
+	pkgrel = 2
 	url = https://github.com/Aetf/kmscon
 	arch = x86_64
 	arch = armv7h
diff --git a/PKGBUILD b/PKGBUILD
index e28857d2086a..1d9d7f55dcee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: David Herrmann <dh.herrmann@googlemail.com>
 pkgname=kmscon-patched-git
 _gitname=kmscon
-pkgver=9.0.0.r0.g3292791
-pkgrel=1
+pkgver=9.0.0.r3.g1bf602f
+pkgrel=2
 pkgdesc='Terminal emulator based on Kernel Mode Setting (KMS) (forked and patched version)'
 arch=('x86_64' 'armv7h')
 url='https://github.com/Aetf/kmscon'
@@ -22,23 +22,14 @@ pkgver() {
   git describe --long | sed -r "s/^$_gitname-//;s/^v//;s/([^-]*-g)/r\\1/;s/-/./g"
 }
 
-prepare() {
-  cd $srcdir/$_gitname
-
-  meson builddir/ -Dprefix=/usr -Dlibexecdir=lib
-}
-
 build() {
-  cd $srcdir/$_gitname
-
+  arch-meson "$srcdir/$_gitname" builddir/ -Dtests=false
   meson compile -C builddir/
 }
 
 package() {
-  cd $srcdir/$_gitname
+  meson install -C builddir/ --destdir "$pkgdir"
 
-  meson install -C builddir/ --destdir "$pkgdir/"
-
-  mkdir -p "$pkgdir/usr/share/licenses/$pkgname"
-  cp COPYING "$pkgdir/usr/share/licenses/$pkgname/"
+  cd $srcdir/$_gitname
+  install -m 644 -D -t "$pkgdir/usr/share/licenses/$pkgname" COPYING
 }