diff --git a/qubes-vm-gui/APKBUILD b/qubes-vm-gui/APKBUILD index 6c3d969..76ad3ae 100644 --- a/qubes-vm-gui/APKBUILD +++ b/qubes-vm-gui/APKBUILD @@ -7,7 +7,7 @@ subpackages=" qubes-vm-pipewire $pkgname-openrc" pkgver=4.2.8 -pkgrel=1 +pkgrel=2 _gittag="v$pkgver" pkgdesc="The Qubes GUI Agent for AppVMs" arch="x86_64" @@ -52,6 +52,7 @@ source=" qubes-gui-agent.openrc qubes-sessions.sh qubes-gui-agent.pam + qubes-sessions_do-not-use-systemd.patch " builddir="$srcdir"/qubes-gui-agent-linux-${_gittag/v} _qubes_backend_vmm=xen @@ -123,4 +124,5 @@ f0bbb936e14689d0cbced2f564b8911f9287c0217616f02f3bd0c3060e516d080ad538219f089f58 68d01e594296e18d54d8eaa17863451c3ac121e4fcacf98b64db14166bdcf38aa66f1c3659c5014c0a9cc25b5368df66f8c642b8e7af59da8d2a5ad97da9a194 qubes-gui-agent.openrc bd707f7956f58c2bb24ccb9adad1381c069e70820fcb1b01b09dc88570d9df00e0dc92a9ac3b242f828314568d5487257566a6fc61e75e62e010b7e4871f9ea0 qubes-sessions.sh b512d691f2a6b11fc329bf91dd05ca9c589bbd444308b27d3c87c75262dedf6afc68a9739229249a4bd3d0c43cb1f871eecbb93c4fe559e0f38bdabbffd06ad7 qubes-gui-agent.pam +5d44bed65772e0300cfdb5960327ccff923159f1c0c6b980a3b37758a7330f5d8befa3c053990f6e5e7d2e71bf0eca047040439446a8b91bb1c2672e9e1497a0 qubes-sessions_do-not-use-systemd.patch " diff --git a/qubes-vm-gui/qubes-sessions_do-not-use-systemd.patch b/qubes-vm-gui/qubes-sessions_do-not-use-systemd.patch new file mode 100644 index 0000000..1dedcc4 --- /dev/null +++ b/qubes-vm-gui/qubes-sessions_do-not-use-systemd.patch @@ -0,0 +1,21 @@ +diff --git a/appvm-scripts/usrbin/qubes-session.orig b/appvm-scripts/usrbin/qubes-session +index cacac4b..e5bedc2 100755 +--- a/appvm-scripts/usrbin/qubes-session.orig ++++ b/appvm-scripts/usrbin/qubes-session +@@ -27,16 +27,6 @@ + + loginctl activate "$XDG_SESSION_ID" + +-# Now import the environment from the systemd user session. +-# This is necessary to enable users to configure their +-# Qubes environment using the standard environment.d +-# facility. Documentation for the facility is at: +-# https://www.freedesktop.org/software/systemd/man/environment.d.html +-set -a # export all variables +-env=$(systemctl --user show-environment) && eval "$env" || exit +-set +a +- +- + if qsvc guivm-gui-agent; then + if [ -e "$HOME/.xinitrc" ]; then + . "$HOME/.xinitrc"