[arch-commits] Commit in libchamplain/trunk (PKGBUILD)

[Jan Steffens]

    Date: Saturday, April 2, 2022 @ 18:37:33
  Author: heftig
Revision: 441296

0.12.20-3: debug on

Modified:
  libchamplain/trunk/PKGBUILD

----------+
 PKGBUILD |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-02 18:35:49 UTC (rev 441295)
+++ PKGBUILD	2022-04-02 18:37:33 UTC (rev 441296)
@@ -1,10 +1,10 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 # Contributor: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: Michael Kanis <mkanis at gmx.de>
 
 pkgname=libchamplain
 pkgver=0.12.20
-pkgrel=2
+pkgrel=3
 pkgdesc="A map widget"
 url="https://wiki.gnome.org/Projects/libchamplain"
 license=(LGPL)
@@ -11,6 +11,7 @@
 arch=(x86_64)
 depends=(clutter-gtk libsoup cairo sqlite)
 makedepends=(gobject-introspection gtk-doc vala meson git)
+options=(debug)
 _commit=145e417f32e507b63c21ad4e915b808a6174099e  # tags/LIBCHAMPLAIN_0_12_20^0
 source=("git+https://gitlab.gnome.org/GNOME/libchamplain.git#commit=$_commit")
 sha256sums=('SKIP')
@@ -17,7 +18,7 @@
 
 pkgver() {
   cd $pkgname
-  git describe --tags | sed 's/^LIBCHAMPLAIN_//;s/_/./g;s/-/+/g'
+  git describe --tags | sed 's/^LIBCHAMPLAIN_//;s/_/./g;s/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
@@ -26,7 +27,7 @@
 
 build() {
   arch-meson $pkgname build -D gtk_doc=true
-  ninja -C build
+  meson compile -C build
 }
 
 check() {
@@ -34,5 +35,5 @@
 }
 
 package() {
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
 }