[arch-commits] Commit in mako/trunk (PKGBUILD systemd-dbus-activation.patch)

[Maxim Baz]

    Date: Monday, May 3, 2021 @ 20:29:20
  Author: maximbaz
Revision: 927282

upgpkg: mako 1.5-1

Added:
  mako/trunk/systemd-dbus-activation.patch
Modified:
  mako/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   28 +++++++++++++++-------------
 systemd-dbus-activation.patch |    7 +++++++
 2 files changed, 22 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-03 20:11:44 UTC (rev 927281)
+++ PKGBUILD	2021-05-03 20:29:20 UTC (rev 927282)
@@ -1,9 +1,10 @@
 # Maintainer: Brett Cornwall <ainola at archlinux.org>
+# Maintainer: Maxim Baz <$pkgname at maximbaz dot com>
 # Contributor: Drew DeVault
 
 pkgname=mako
-pkgver=1.4.1
-pkgrel=2
+pkgver=1.5
+pkgrel=1
 license=('MIT')
 pkgdesc='Lightweight notification daemon for Wayland'
 makedepends=("meson" "scdoc" "systemd" "wayland-protocols")
@@ -13,29 +14,30 @@
 	"systemd-libs"
 	"wayland"
 )
-optdepends=(
-	"jq: Required for the menu sub-command"
-)
+optdepends=("jq: support for 'makoctl menu'")
 arch=("x86_64")
 url='https://mako-project.org'
 source=(
 	"$pkgname-$pkgver.tar.gz::https://github.com/emersion/mako/releases/download/v$pkgver/mako-$pkgver.tar.gz"
 	"$pkgname-$pkgver.tar.gz.sig::https://github.com/emersion/mako/releases/download/v$pkgver/mako-$pkgver.tar.gz.sig"
+	"systemd-dbus-activation.patch"
 )
-validpgpkeys=("34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48")  # emersion
-sha256sums=('27ab63264a74389de2119393fe64fd578a4c1d04c8409990ef7cfbb6eb9309bb'
-            'SKIP')
+validpgpkeys=("34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48") # emersion
+sha256sums=('d79998aa4c68de82155080a58ad5783b40d81f50553a0a5d633553ece4f7439d'
+            'SKIP'
+            '4579a2673dcf2114779e10ed52d771f3930c2192e8e35d3e145163d9e0b45c20')
 
+prepare() {
+	patch -Np1 -i "$srcdir/systemd-dbus-activation.patch" -d "$pkgname-$pkgver"
+}
 
 build() {
-	meson --prefix /usr \
-		--buildtype=plain \
-		-Dzsh-completions=true \
-		"$pkgname-$pkgver" build
+	arch-meson -Dzsh-completions=true -Dsd-bus-provider=libsystemd "$pkgname-$pkgver" build
 	ninja -C build
 }
 
 package() {
 	DESTDIR="$pkgdir" ninja -C build install
-	install -Dm644 "$pkgname-$pkgver/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname/"
+	install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" "$pkgname-$pkgver/LICENSE"
+	install -Dm644 -t "$pkgdir/usr/lib/systemd/user/" "$pkgname-$pkgver/contrib/systemd/mako.service"
 }

Added: systemd-dbus-activation.patch
===================================================================
--- systemd-dbus-activation.patch	                        (rev 0)
+++ systemd-dbus-activation.patch	2021-05-03 20:29:20 UTC (rev 927282)
@@ -0,0 +1,7 @@
+--- a/fr.emersion.mako.service.in
++++ b/fr.emersion.mako.service.in
+@@ -1,3 +1,4 @@
+ [D-BUS Service]
+ Name=org.freedesktop.Notifications
+ Exec=@bindir@/mako
++SystemdService=mako.service