[arch-commits] Commit in dbus-broker/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Jan Steffens]

    Date: Monday, March 21, 2022 @ 23:54:53
  Author: heftig
Revision: 440458

archrelease: copy trunk to extra-x86_64

Added:
  dbus-broker/repos/extra-x86_64/PKGBUILD
    (from rev 440457, dbus-broker/trunk/PKGBUILD)
Deleted:
  dbus-broker/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |  124 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 64 insertions(+), 60 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-21 23:53:39 UTC (rev 440457)
+++ PKGBUILD	2022-03-21 23:54:53 UTC (rev 440458)
@@ -1,60 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: David Herrmann <dh.herrmann at gmail.com>
-
-pkgname=dbus-broker
-pkgver=29
-pkgrel=1
-pkgdesc="Linux D-Bus Message Broker"
-url="https://github.com/bus1/dbus-broker/wiki"
-arch=(x86_64)
-license=(Apache)
-depends=(systemd-libs expat audit)
-makedepends=(git meson systemd python-docutils)
-_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})
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  git submodule init
-
-  local sm
-  for sm in c-{rbtree,list,dvar,utf8,shquote,ini,stdaux}; do
-    git submodule set-url subprojects/$sm "$srcdir/$sm"
-  done
-
-  git submodule update
-}
-
-build() {
-  arch-meson $pkgname build \
-    -D audit=true \
-    -D docs=true \
-    -D linux-4-17=true \
-    -D system-console-users=gdm,sddm,lightdm,lxdm
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-}
-
-# vim:set sw=2 et:

Copied: dbus-broker/repos/extra-x86_64/PKGBUILD (from rev 440457, dbus-broker/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-03-21 23:54:53 UTC (rev 440458)
@@ -0,0 +1,64 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: David Herrmann <dh.herrmann at gmail.com>
+
+pkgname=dbus-broker
+pkgver=29
+pkgrel=2
+pkgdesc="Linux D-Bus Message Broker"
+url="https://github.com/bus1/dbus-broker/wiki"
+arch=(x86_64)
+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})
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP')
+
+pkgver() {
+  cd $pkgname
+  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
+  for sm in c-{rbtree,list,dvar,utf8,shquote,ini,stdaux}; do
+    git submodule set-url subprojects/$sm "$srcdir/$sm"
+  done
+
+  git submodule update
+}
+
+build() {
+  arch-meson $pkgname build \
+    -D audit=true \
+    -D docs=true \
+    -D linux-4-17=true \
+    -D system-console-users=gdm,sddm,lightdm,lxdm
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  meson install -C build --destdir "$pkgdir"
+}
+
+# vim:set sw=2 et: