From c62306c5f48b79665a2f735a67a5755f7cf29db2 Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <idscott@system76.com>
Date: Mon, 16 Jun 2025 18:54:46 -0700
Subject: [PATCH] WIP Use DBus socket activation

---
 Makefile                                                   | 5 ++++-
 .../org.freedesktop.impl.portal.desktop.cosmic.service.in} | 2 +-
 data/org.freedesktop.impl.portal.desktop.cosmic.service.in | 7 +++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 rename data/{org.freedesktop.impl.portal.desktop.cosmic.service => dbus-1/org.freedesktop.impl.portal.desktop.cosmic.service.in} (60%)
 create mode 100644 data/org.freedesktop.impl.portal.desktop.cosmic.service.in

diff --git a/Makefile b/Makefile
index 37173fb..0449acc 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,10 @@ $(BIN): Cargo.toml Cargo.lock src/main.rs vendor-check
 
 install:
 	install -Dm0755 $(CARGO_TARGET_DIR)/$(TARGET)/$(BIN) $(DESTDIR)$(libexecdir)/$(BIN)
-	install -Dm0644 data/$(DBUS_NAME).service $(DESTDIR)$(datadir)/dbus-1/services/$(DBUS_NAME).service
+	sed "s|LIBEXECDIR|$(libexecdir)|" data/dbus-1/$(DBUS_NAME).service.in > data/dbus-1/$(DBUS_NAME).service
+	install -Dm0644 data/dbus-1/$(DBUS_NAME).service $(DESTDIR)$(datadir)/dbus-1/services/$(DBUS_NAME).service
+	sed "s|LIBEXECDIR|$(libexecdir)|" data/$(DBUS_NAME).service.in > data/$(DBUS_NAME).service
+	install -Dm0644 data/$(DBUS_NAME).service $(DESTDIR)$(libdir)/systemd/user/$(DBUS_NAME).service
 	install -Dm0644 data/cosmic.portal $(DESTDIR)$(datadir)/xdg-desktop-portal/portals/cosmic.portal
 	install -Dm0644 data/cosmic-portals.conf $(DESTDIR)$(datadir)/xdg-desktop-portal/cosmic-portals.conf
 	find 'data'/'icons' -type f -exec echo {} \; \
diff --git a/data/org.freedesktop.impl.portal.desktop.cosmic.service b/data/dbus-1/org.freedesktop.impl.portal.desktop.cosmic.service.in
similarity index 60%
rename from data/org.freedesktop.impl.portal.desktop.cosmic.service
rename to data/dbus-1/org.freedesktop.impl.portal.desktop.cosmic.service.in
index a8ee79d..8413deb 100644
--- a/data/org.freedesktop.impl.portal.desktop.cosmic.service
+++ b/data/dbus-1/org.freedesktop.impl.portal.desktop.cosmic.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.impl.portal.desktop.cosmic
-Exec=/bin/false
+Exec=LIBEXECDIR/xdg-desktop-portal-cosmic
diff --git a/data/org.freedesktop.impl.portal.desktop.cosmic.service.in b/data/org.freedesktop.impl.portal.desktop.cosmic.service.in
new file mode 100644
index 0000000..5a83ac5
--- /dev/null
+++ b/data/org.freedesktop.impl.portal.desktop.cosmic.service.in
@@ -0,0 +1,7 @@
+[Unit]
+Description=Portal service (COSMIC implementation)
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.impl.portal.desktop.cosmic
+ExecStart=LIBEXECDIR/xdg-desktop-portal-cosmic