From 1902f259bead97a580ae1d53d0d1f65f7cb90172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 14 Oct 2024 06:15:48 +0200 Subject: [PATCH] Set PATH to use Xwayland wrapper Xwayland wrapper (that preloads shmoverride) is needed for the GUI daemon to work. Set PATH for the plasma-kwin_wayland service that is responsible for starting Xwayland. Unfortunately the systemd service files do not support variable expansion in Environment= setting, so hardcode original PATH value too. QubesOS/qubes-issues#8515 --- Makefile | 2 ++ config/10-gui-daemon-shmoverride.conf | 3 +++ kde-settings-qubes.spec.in | 1 + 3 files changed, 6 insertions(+) create mode 100644 config/10-gui-daemon-shmoverride.conf diff --git a/Makefile b/Makefile index e2c416f..756c8aa 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,8 @@ install: install -D -m 0644 plasmoidsetupscripts/template.js $(DESTDIR)/usr/share/plasma/look-and-feel/org.fedoraproject.fedora.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kicker.js.qubes install -D -m 0644 plasmoidsetupscripts/template.js $(DESTDIR)/usr/share/plasma/look-and-feel/org.fedoraproject.fedora.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickerdash.js.qubes install -D -m 0644 plasmoidsetupscripts/template.js $(DESTDIR)/usr/share/plasma/look-and-feel/org.fedoraproject.fedora.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js.qubes + install -D -m 0644 config/10-gui-daemon-shmoverride.conf \ + $(DESTDIR)/usr/lib/systemd/user/plasma-kwin_wayland.service.d/10-gui-daemon-shmoverride.conf clean: rm -rf debian/changelog.* diff --git a/config/10-gui-daemon-shmoverride.conf b/config/10-gui-daemon-shmoverride.conf new file mode 100644 index 0000000..db25d00 --- /dev/null +++ b/config/10-gui-daemon-shmoverride.conf @@ -0,0 +1,3 @@ +# Adjust PATH to use Xwayland wrapper +[Service] +Environment=PATH=/usr/libexec/qubes/wrappers:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin diff --git a/kde-settings-qubes.spec.in b/kde-settings-qubes.spec.in index 616b9fb..0d85845 100644 --- a/kde-settings-qubes.spec.in +++ b/kde-settings-qubes.spec.in @@ -87,6 +87,7 @@ Qubes colorful frames for Breeze plasma theme. %{_datadir}/kde-settings/kde-profile/default/share/config/klipperrc %{_datadir}/kde-settings/kde-profile/default/share/config/nepomukserverrc %{_datadir}/kde-settings/kde-profile/default/share/kde4/services/kcm_nepomuk.desktop +/usr/lib/systemd/user/plasma-kwin_wayland.service.d/10-gui-daemon-shmoverride.conf %files -n plasma-breeze-qubes /usr/bin/qubes-generate-color-palette