summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonin Décimo2022-10-31 16:09:05 +0100
committerAntonin Décimo2022-10-31 16:09:05 +0100
commita1414cb4e2cbea87f5208de350cff412f28c2d66 (patch)
treef1daba64537ff09a5e5fd11f6a1dda42a9b0f49e
parent0cb8d72fef74288e18828e594e832f80b3557c00 (diff)
downloadaur-a1414cb4e2cbea87f5208de350cff412f28c2d66.tar.gz
Export XDG_CURRENT_DESKTOP to systemd user environment
Fixes FS#72297 https://github.com/archlinux/svntogit-community/commit/16cfce02f31b3f154f4beb309ce31778c21e32d2#diff-3541d3c6a86145535876a768d6b80512873647ad10eaf0b723f0d39650608983
-rw-r--r--.SRCINFO4
-rw-r--r--50-systemd-user.conf4
-rw-r--r--PKGBUILD4
3 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3673d7ed9fbd..31e0b1edb42c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = sway-git
pkgdesc = Tiling Wayland compositor and replacement for the i3 window manager
- pkgver = r6934.251a648e
+ pkgver = r6984.e40eb338
pkgrel = 1
url = https://swaywm.org
install = sway.install
@@ -38,6 +38,6 @@ pkgbase = sway-git
source = sway::git+https://github.com/swaywm/sway.git
source = 50-systemd-user.conf
sha512sums = SKIP
- sha512sums = 57590bc0d14c87289a4a9cd67991c6a841e54244d2a6186b5da5a08e633de2e8631959fa8c77ede211b0a5f315d920f2c1350951a53d6f2e9e81859056cb3c9e
+ sha512sums = c2b7d808f4231f318e03789015624fd4cf32b81434b15406570b4e144c0defc54e216d881447e6fd9fc18d7da608cccb61c32e0e1fab2f1fe2750acf812d3137
pkgname = sway-git
diff --git a/50-systemd-user.conf b/50-systemd-user.conf
index 72e5dcd98b02..d75ccdb2adbd 100644
--- a/50-systemd-user.conf
+++ b/50-systemd-user.conf
@@ -2,6 +2,6 @@
# 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
+exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
exec hash dbus-update-activation-environment 2>/dev/null && \
- dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
+ dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
diff --git a/PKGBUILD b/PKGBUILD
index ccba6788f08b..b9c83cbb2fb6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Antonin Décimo <antonin dot decimo at gmail dot com>
pkgname=sway-git
_pkgname=sway
-pkgver=r6934.251a648e
+pkgver=r6984.e40eb338
pkgrel=1
license=("MIT")
pkgdesc="Tiling Wayland compositor and replacement for the i3 window manager"
@@ -42,7 +42,7 @@ url="https://swaywm.org"
source=("${pkgname%-*}::git+https://github.com/swaywm/sway.git"
50-systemd-user.conf)
sha512sums=('SKIP'
- '57590bc0d14c87289a4a9cd67991c6a841e54244d2a6186b5da5a08e633de2e8631959fa8c77ede211b0a5f315d920f2c1350951a53d6f2e9e81859056cb3c9e')
+ 'c2b7d808f4231f318e03789015624fd4cf32b81434b15406570b4e144c0defc54e216d881447e6fd9fc18d7da608cccb61c32e0e1fab2f1fe2750acf812d3137')
provides=("sway")
conflicts=("sway")
options=(debug)