From 7c75b21933215348f28a2c788b174901ef13e267 Mon Sep 17 00:00:00 2001 From: Elias Elwyn Date: Mon, 27 Nov 2023 12:57:41 +1100 Subject: fix(PKGBUILD): support new portals req for XDG_CURRENT_DESKTOP (#239) Integrates commits c85a455e and 2f9c63b0 from extra/sway. Copied from c85a455e: > As of version 1.17, xdg-desktop-portal requires desktops to declare > which portals should be used. For Sway, this requires a file > /usr/share/xdg-desktop-portal/sway-portals.conf (or a local user > config). > > A reasonable default is to use GTK for the file picker (as wlr doesn't > have file picker support) and wlr for screencast/screenshot support. > Fedora does this similarly. [1] > > Upstream is not interested in shipping a configuration file [2] so we > need to do it downstream. > > [1] https://src.fedoraproject.org/rpms/sway/blob/rawhide/f/sway-portals.conf > [2] https://github.com/swaywm/sway/issues/7773 https://gitlab.archlinux.org/archlinux/packaging/packages/sway/-/commit/c85a455eb653256b57b0b1661e398a48946e85b4 https://gitlab.archlinux.org/archlinux/packaging/packages/sway/-/commit/2f9c63b0539119acb63d6028c61d41c7faa1cebb --- build-scripts/aur-git/50-systemd-user.conf | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'build-scripts/aur-git/50-systemd-user.conf') diff --git a/build-scripts/aur-git/50-systemd-user.conf b/build-scripts/aur-git/50-systemd-user.conf index d75ccdb2..8781db92 100644 --- a/build-scripts/aur-git/50-systemd-user.conf +++ b/build-scripts/aur-git/50-systemd-user.conf @@ -2,6 +2,15 @@ # See FS#63021 # Adapted from xorg's 50-systemd-user.sh, which achieves a similar goal. -exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP +# Upstream refuses to set XDG_CURRENT_DESKTOP so we have to. +exec systemctl --user set-environment XDG_CURRENT_DESKTOP=sway +exec systemctl --user import-environment DISPLAY \ + SWAYSOCK \ + WAYLAND_DISPLAY \ + XDG_CURRENT_DESKTOP + exec hash dbus-update-activation-environment 2>/dev/null && \ - dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP + dbus-update-activation-environment --systemd DISPLAY \ + SWAYSOCK \ + XDG_CURRENT_DESKTOP=sway \ + WAYLAND_DISPLAY -- cgit v1.2.3