From 50b112c9d6f22d8755a044ea820fc1cbae722918 Mon Sep 17 00:00:00 2001 From: purian23 Date: Wed, 3 Dec 2025 11:48:56 -0500 Subject: [PATCH] Revert "Add DMS dbus notification service file" This reverts commit 33e655becdc228f2e47ca6b534872d73ba8b7001. --- .github/workflows/release.yml | 4 ---- Makefile | 20 ++++--------------- .../org.freedesktop.Notifications.service | 4 ---- assets/systemd/dms.service | 1 - distro/debian/dms-git/debian/rules | 1 - distro/debian/dms/debian/rules | 1 - distro/fedora/dms.spec | 6 +++--- distro/opensuse/dms-git.spec | 2 -- distro/opensuse/dms.spec | 2 -- distro/ubuntu/dms-git/debian/rules | 4 ---- distro/ubuntu/dms/debian/rules | 4 ---- 11 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 assets/dbus/org.freedesktop.Notifications.service diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2792fafd..2632536b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -599,9 +599,6 @@ jobs: install -Dm644 assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service - # Install DBus service activation file - install -Dm644 assets/dbus/org.freedesktop.Notifications.service %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.Notifications.service - install -Dm644 assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop install -Dm644 assets/danklogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg @@ -631,7 +628,6 @@ jobs: %doc README.md CONTRIBUTING.md %{_datadir}/quickshell/dms/ %{_userunitdir}/dms.service - %{_datadir}/dbus-1/services/org.freedesktop.Notifications.service %{_datadir}/applications/dms-open.desktop %{_datadir}/icons/hicolor/scalable/apps/danklogo.svg diff --git a/Makefile b/Makefile index aceb3d05..d58763b9 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ SHELL_INSTALL_DIR=$(DATA_DIR)/quickshell/dms ASSETS_DIR=assets APPLICATIONS_DIR=$(DATA_DIR)/applications -.PHONY: all build clean install install-bin install-shell install-completions install-systemd install-dbus install-icon install-desktop uninstall uninstall-bin uninstall-shell uninstall-completions uninstall-systemd uninstall-dbus uninstall-icon uninstall-desktop help +.PHONY: all build clean install install-bin install-shell install-completions install-systemd install-icon install-desktop uninstall uninstall-bin uninstall-shell uninstall-completions uninstall-systemd uninstall-icon uninstall-desktop help all: build @@ -65,11 +65,6 @@ install-systemd: @if [ -n "$(SUDO_USER)" ]; then chown $(SUDO_USER):$(SUDO_USER) $(SYSTEMD_USER_DIR)/dms.service; fi @echo "Systemd service installed to $(SYSTEMD_USER_DIR)/dms.service" -install-dbus: - @echo "Installing DBus service activation file..." - @install -D -m 644 $(ASSETS_DIR)/dbus/org.freedesktop.Notifications.service $(DATA_DIR)/dbus-1/services/org.freedesktop.Notifications.service - @echo "DBus service installed" - install-icon: @echo "Installing icon..." @install -D -m 644 $(ASSETS_DIR)/danklogo.svg $(ICON_DIR)/danklogo.svg @@ -82,11 +77,11 @@ install-desktop: @update-desktop-database -q $(APPLICATIONS_DIR) 2>/dev/null || true @echo "Desktop entry installed" -install: build install-bin install-shell install-completions install-systemd install-dbus install-icon install-desktop +install: build install-bin install-shell install-completions install-systemd install-icon install-desktop @echo "" @echo "Installation complete!" @echo "" - @echo "=== Cheers, the DMS Team! ===" + @echo "=== The DMS Team! ===" # Uninstallation targets uninstall-bin: @@ -112,11 +107,6 @@ uninstall-systemd: @echo "Systemd service removed" @echo "Note: Stop/disable service manually if running: systemctl --user stop dms" -uninstall-dbus: - @echo "Removing DBus service activation file..." - @rm -f $(DATA_DIR)/dbus-1/services/org.freedesktop.Notifications.service - @echo "DBus service removed" - uninstall-icon: @echo "Removing icon..." @rm -f $(ICON_DIR)/danklogo.svg @@ -129,7 +119,7 @@ uninstall-desktop: @update-desktop-database -q $(APPLICATIONS_DIR) 2>/dev/null || true @echo "Desktop entry removed" -uninstall: uninstall-systemd uninstall-dbus uninstall-desktop uninstall-icon uninstall-completions uninstall-shell uninstall-bin +uninstall: uninstall-systemd uninstall-desktop uninstall-icon uninstall-completions uninstall-shell uninstall-bin @echo "" @echo "Uninstallation complete!" @@ -148,7 +138,6 @@ help: @echo " install-shell - Install only shell files" @echo " install-completions - Install only shell completions" @echo " install-systemd - Install only systemd service" - @echo " install-dbus - Install only DBus service activation file" @echo " install-icon - Install only icon" @echo " install-desktop - Install only desktop entry" @echo "" @@ -158,7 +147,6 @@ help: @echo " uninstall-shell - Remove only shell files" @echo " uninstall-completions - Remove only shell completions" @echo " uninstall-systemd - Remove only systemd service" - @echo " uninstall-dbus - Remove only DBus service activation file" @echo " uninstall-icon - Remove only icon" @echo " uninstall-desktop - Remove only desktop entry" @echo "" diff --git a/assets/dbus/org.freedesktop.Notifications.service b/assets/dbus/org.freedesktop.Notifications.service deleted file mode 100644 index 78cb12d7..00000000 --- a/assets/dbus/org.freedesktop.Notifications.service +++ /dev/null @@ -1,4 +0,0 @@ -[D-BUS Service] -Name=org.freedesktop.Notifications -Exec=/usr/bin/dms run --session -SystemdService=dms.service diff --git a/assets/systemd/dms.service b/assets/systemd/dms.service index e6096ce3..f1577276 100644 --- a/assets/systemd/dms.service +++ b/assets/systemd/dms.service @@ -6,7 +6,6 @@ Requisite=graphical-session.target [Service] Type=simple -BusName=org.freedesktop.Notifications ExecStart=/usr/bin/dms run --session ExecReload=/usr/bin/pkill -USR1 -x dms Restart=always diff --git a/distro/debian/dms-git/debian/rules b/distro/debian/dms-git/debian/rules index 45d8421b..de00f6f7 100755 --- a/distro/debian/dms-git/debian/rules +++ b/distro/debian/dms-git/debian/rules @@ -59,7 +59,6 @@ override_dh_auto_install: if [ -d quickshell ]; then \ cp -r quickshell/* debian/dms-git/usr/share/quickshell/dms/; \ install -Dm644 assets/systemd/dms.service debian/dms-git/usr/lib/systemd/user/dms.service; \ - install -Dm644 assets/dbus/org.freedesktop.Notifications.service debian/dms-git/usr/share/dbus-1/services/org.freedesktop.Notifications.service; \ install -Dm644 assets/dms-open.desktop debian/dms-git/usr/share/applications/dms-open.desktop; \ install -Dm644 assets/danklogo.svg debian/dms-git/usr/share/icons/hicolor/scalable/apps/danklogo.svg; \ else \ diff --git a/distro/debian/dms/debian/rules b/distro/debian/dms/debian/rules index 9f1d800f..e3a82862 100755 --- a/distro/debian/dms/debian/rules +++ b/distro/debian/dms/debian/rules @@ -56,7 +56,6 @@ override_dh_auto_install: if [ -d DankMaterialShell-$(UPSTREAM_VERSION) ]; then \ cp -r DankMaterialShell-$(UPSTREAM_VERSION)/quickshell/* debian/dms/usr/share/quickshell/dms/; \ install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/systemd/dms.service debian/dms/usr/lib/systemd/user/dms.service; \ - install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/dbus/org.freedesktop.Notifications.service debian/dms/usr/share/dbus-1/services/org.freedesktop.Notifications.service; \ install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/dms-open.desktop debian/dms/usr/share/applications/dms-open.desktop; \ install -Dm644 DankMaterialShell-$(UPSTREAM_VERSION)/assets/danklogo.svg debian/dms/usr/share/icons/hicolor/scalable/apps/danklogo.svg; \ else \ diff --git a/distro/fedora/dms.spec b/distro/fedora/dms.spec index c61c3c13..977d08c0 100644 --- a/distro/fedora/dms.spec +++ b/distro/fedora/dms.spec @@ -132,16 +132,17 @@ core/bin/${DMS_BINARY} completion fish > %{buildroot}%{_datadir}/fish/vendor_com # Install dgop binary install -Dm755 %{_builddir}/dgop %{buildroot}%{_bindir}/dgop -# Install systemd & dbus user service +# Install systemd user service install -Dm644 assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service -install -Dm644 assets/dbus/org.freedesktop.Notifications.service %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.Notifications.service install -Dm644 assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop install -Dm644 assets/danklogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg +# Install shell files to shared data location install -dm755 %{buildroot}%{_datadir}/quickshell/dms cp -r quickshell/* %{buildroot}%{_datadir}/quickshell/dms/ +# Remove build files rm -rf %{buildroot}%{_datadir}/quickshell/dms/.git* rm -f %{buildroot}%{_datadir}/quickshell/dms/.gitignore rm -rf %{buildroot}%{_datadir}/quickshell/dms/.github @@ -162,7 +163,6 @@ fi %doc quickshell/README.md %{_datadir}/quickshell/dms/ %{_userunitdir}/dms.service -%{_datadir}/dbus-1/services/org.freedesktop.Notifications.service %{_datadir}/applications/dms-open.desktop %{_datadir}/icons/hicolor/scalable/apps/danklogo.svg diff --git a/distro/opensuse/dms-git.spec b/distro/opensuse/dms-git.spec index 6f64c983..ddf43a08 100644 --- a/distro/opensuse/dms-git.spec +++ b/distro/opensuse/dms-git.spec @@ -90,7 +90,6 @@ install -d %{buildroot}%{_datadir}/fish/vendor_completions.d ./dms completion fish > %{buildroot}%{_datadir}/fish/vendor_completions.d/dms.fish || : install -Dm644 assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service -install -Dm644 assets/dbus/org.freedesktop.Notifications.service %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.Notifications.service install -Dm644 assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop install -Dm644 assets/danklogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg @@ -131,7 +130,6 @@ fi %dir %{_datadir}/quickshell %{_datadir}/quickshell/dms/ %{_userunitdir}/dms.service -%{_datadir}/dbus-1/services/org.freedesktop.Notifications.service %{_datadir}/applications/dms-open.desktop %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/scalable diff --git a/distro/opensuse/dms.spec b/distro/opensuse/dms.spec index 5bc817c5..fed79972 100644 --- a/distro/opensuse/dms.spec +++ b/distro/opensuse/dms.spec @@ -64,7 +64,6 @@ install -d %{buildroot}%{_datadir}/fish/vendor_completions.d ./dms completion fish > %{buildroot}%{_datadir}/fish/vendor_completions.d/dms.fish || : install -Dm644 assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service -install -Dm644 assets/dbus/org.freedesktop.Notifications.service %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.Notifications.service install -Dm644 assets/dms-open.desktop %{buildroot}%{_datadir}/applications/dms-open.desktop install -Dm644 assets/danklogo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/danklogo.svg @@ -101,7 +100,6 @@ fi %dir %{_datadir}/quickshell %{_datadir}/quickshell/dms/ %{_userunitdir}/dms.service -%{_datadir}/dbus-1/services/org.freedesktop.Notifications.service %{_datadir}/applications/dms-open.desktop %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/scalable diff --git a/distro/ubuntu/dms-git/debian/rules b/distro/ubuntu/dms-git/debian/rules index 25f56713..2171d5c4 100755 --- a/distro/ubuntu/dms-git/debian/rules +++ b/distro/ubuntu/dms-git/debian/rules @@ -56,10 +56,6 @@ override_dh_auto_install: install -Dm644 dms-git-repo/assets/systemd/dms.service \ debian/dms-git/usr/lib/systemd/user/dms.service - # Install DBus service activation file - install -Dm644 dms-git-repo/assets/dbus/org.freedesktop.Notifications.service \ - debian/dms-git/usr/share/dbus-1/services/org.freedesktop.Notifications.service - # Install desktop file and icon install -Dm644 dms-git-repo/assets/dms-open.desktop \ debian/dms-git/usr/share/applications/dms-open.desktop diff --git a/distro/ubuntu/dms/debian/rules b/distro/ubuntu/dms/debian/rules index 5c088898..b3ddc510 100755 --- a/distro/ubuntu/dms/debian/rules +++ b/distro/ubuntu/dms/debian/rules @@ -48,10 +48,6 @@ override_dh_auto_install: install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/systemd/dms.service \ debian/dms/usr/lib/systemd/user/dms.service - # Install DBus service activation file - install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/dbus/org.freedesktop.Notifications.service \ - debian/dms/usr/share/dbus-1/services/org.freedesktop.Notifications.service - # Install desktop file and icon install -Dm644 DankMaterialShell-$(BASE_VERSION)/assets/dms-open.desktop \ debian/dms/usr/share/applications/dms-open.desktop