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

[Jan Steffens]

    Date: Monday, March 21, 2022 @ 23:53:39
  Author: heftig
Revision: 440457

29-2

Modified:
  dbus-broker/trunk/PKGBUILD

----------+
 PKGBUILD |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-21 23:53:14 UTC (rev 440456)
+++ PKGBUILD	2022-03-21 23:53:39 UTC (rev 440457)
@@ -3,7 +3,7 @@
 
 pkgname=dbus-broker
 pkgver=29
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux D-Bus Message Broker"
 url="https://github.com/bus1/dbus-broker/wiki"
 arch=(x86_64)
@@ -10,6 +10,7 @@
 license=(Apache)
 depends=(systemd-libs expat audit)
 makedepends=(git meson systemd python-docutils)
+options=(debug)
 _commit=d2e888c68413cfeae6a5b87862570e70af8f85bd  # tags/v29^0
 source=("git+https://github.com/bus1/dbus-broker#commit=$_commit"
         git+https://github.com/c-util/c-{rbtree,list,dvar,utf8,shquote,ini,stdaux})
@@ -24,12 +25,15 @@
 
 pkgver() {
   cd $pkgname
-  git describe --tags | sed 's/^v//;s/-/+/g'
+  git describe --tags | sed 's/^v//;s/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd $pkgname
 
+  # Run user service in session.slice
+  git cherry-pick -n 833a92c0aa262d467faed35d8cac3896f5bc352d
+
   git submodule init
 
   local sm
@@ -54,7 +58,7 @@
 }
 
 package() {
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
 }
 
 # vim:set sw=2 et: