diff options
| author | Ismo Toijala | 2023-10-29 11:28:34 +0200 |
|---|---|---|
| committer | Ismo Toijala | 2023-10-29 11:28:34 +0200 |
| commit | c9727390d0032389d425ce4122f5869bd3c8e22e (patch) | |
| tree | 5211e8a4201edc2afeb5c5df8ed3c354f12608f0 | |
| parent | 388d5202cbfffa806fac40841aeb3310ba7f020d (diff) | |
| download | aur-c9727390d0032389d425ce4122f5869bd3c8e22e.tar.gz | |
Support New portals req for XDG_CURRENT_DESKTOP
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.
Fixes #72297
Fixes #79883
[1] https://src.fedoraproject.org/rpms/sway/blob/rawhide/f/sway-portals.conf
[2] https://github.com/swaywm/sway/issues/7773
See https://gitlab.archlinux.org/archlinux/packaging/packages/sway/-/commit/c85a455eb653256b57b0b1661e398a48946e85b4
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | sway-portals.conf | 4 |
3 files changed, 15 insertions, 2 deletions
@@ -1,7 +1,7 @@ pkgbase = sway-hidecursor-leftbar pkgdesc = Tiling Wayland compositor and replacement for the i3 window manager pkgver = 1.8.1 - pkgrel = 1 + pkgrel = 2 url = https://swaywm.org/ install = sway.install arch = x86_64 @@ -35,6 +35,8 @@ pkgbase = sway-hidecursor-leftbar optdepends = swaylock: Screen locker optdepends = waybar: Highly customizable bar optdepends = xorg-xwayland: X11 support + optdepends = xdg-desktop-portal-gtk: Default xdg-desktop-portal for file picking + optdepends = xdg-desktop-portal-wlr: xdg-desktop-portal backend conflicts = sway backup = etc/sway/config backup = etc/sway/config.d/50-systemd-user.conf @@ -42,6 +44,7 @@ pkgbase = sway-hidecursor-leftbar source = https://github.com/swaywm/sway/releases/download/1.8.1/sway-1.8.1.tar.gz.sig source = 50-systemd-user.conf source = sys_nice_user_xkb_configs.patch + source = sway-portals.conf source = hidecursor.patch source = leftbar.patch validpgpkeys = 34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48 @@ -50,6 +53,7 @@ pkgbase = sway-hidecursor-leftbar sha512sums = SKIP sha512sums = c2b7d808f4231f318e03789015624fd4cf32b81434b15406570b4e144c0defc54e216d881447e6fd9fc18d7da608cccb61c32e0e1fab2f1fe2750acf812d3137 sha512sums = 156719e93d0213d1b54ce6e3a9b2dcc9246da5689dd2d3281546f9c042cbc69072f99b087e112fe777dcd786d2b9d1be1e1c9200feddffb5e2d16f8dfb27515d + sha512sums = 091a205bca875b6a78150b5b14ffaca996b7c7c3d6f68910e5891e5409ca070d27b3307e8c4916c1562a998d5bcb94406e961bf376d86e64c8ddf5afe5b41f76 sha512sums = f6068630b09d8dde28244cdaffb94038894b42d0f936ce1fe51aa85003e6a6724bee0d96ad842ff1649d3e4f37eeca68fcd9b415f137df98cb72a7fa18cbe790 sha512sums = 044a0d4b5c77c0b3de9a16a9cd4ee18ab3bfffccc4c874dc498765e02cb9c758e5febd8b3649d43a85f229c9ab78bf2ab0e4e925872f47c34702e19c20e60cd2 @@ -6,7 +6,7 @@ _pkgbase=sway pkgname=sway-hidecursor-leftbar pkgver=1.8.1 -pkgrel=1 +pkgrel=2 pkgdesc='Tiling Wayland compositor and replacement for the i3 window manager' arch=(x86_64) url='https://swaywm.org/' @@ -43,11 +43,14 @@ optdepends=( 'swaylock: Screen locker' 'waybar: Highly customizable bar' 'xorg-xwayland: X11 support' + 'xdg-desktop-portal-gtk: Default xdg-desktop-portal for file picking' + 'xdg-desktop-portal-wlr: xdg-desktop-portal backend' ) source=("https://github.com/swaywm/sway/releases/download/$pkgver/sway-$pkgver.tar.gz" "https://github.com/swaywm/sway/releases/download/$pkgver/sway-$pkgver.tar.gz.sig" "50-systemd-user.conf" "sys_nice_user_xkb_configs.patch" + "sway-portals.conf" "hidecursor.patch" "leftbar.patch") install=sway.install @@ -55,6 +58,7 @@ sha512sums=('1504312a199608532e22336c5031e8f4749f5102ab321d13d97a1f93d49c8ec435e 'SKIP' 'c2b7d808f4231f318e03789015624fd4cf32b81434b15406570b4e144c0defc54e216d881447e6fd9fc18d7da608cccb61c32e0e1fab2f1fe2750acf812d3137' '156719e93d0213d1b54ce6e3a9b2dcc9246da5689dd2d3281546f9c042cbc69072f99b087e112fe777dcd786d2b9d1be1e1c9200feddffb5e2d16f8dfb27515d' + '091a205bca875b6a78150b5b14ffaca996b7c7c3d6f68910e5891e5409ca070d27b3307e8c4916c1562a998d5bcb94406e961bf376d86e64c8ddf5afe5b41f76' 'f6068630b09d8dde28244cdaffb94038894b42d0f936ce1fe51aa85003e6a6724bee0d96ad842ff1649d3e4f37eeca68fcd9b415f137df98cb72a7fa18cbe790' '044a0d4b5c77c0b3de9a16a9cd4ee18ab3bfffccc4c874dc498765e02cb9c758e5febd8b3649d43a85f229c9ab78bf2ab0e4e925872f47c34702e19c20e60cd2') validpgpkeys=('34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48' # Simon Ser @@ -94,6 +98,7 @@ package() { DESTDIR="$pkgdir" ninja -C build install install -Dm644 "$_pkgbase-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$_pkgbase/LICENSE" install -Dm644 50-systemd-user.conf -t "$pkgdir/etc/sway/config.d/" + install -Dm644 sway-portals.conf "$pkgdir/usr/share/xdg-desktop-portal/sway-portals.conf" for util in autoname-workspaces.py inactive-windows-transparency.py grimshot; do install -Dm755 "$_pkgbase-$pkgver/contrib/$util" -t \ diff --git a/sway-portals.conf b/sway-portals.conf new file mode 100644 index 000000000000..edb5c5dbeb6a --- /dev/null +++ b/sway-portals.conf @@ -0,0 +1,4 @@ +[preferred] +default=gtk +org.freedesktop.impl.portal.Screencast=wlr +org.freedesktop.impl.portal.Screenshot=wlr |