[arch-commits] Commit in sway/trunk (50-systemd-user.conf PKGBUILD)

[Brett Cornwall]

    Date: Monday, October 18, 2021 @ 00:27:22
  Author: ainola
Revision: 1030788

Export XDG_CURRENT_DESKTOP to systemd user environment

Fixes FS#72297

Modified:
  sway/trunk/50-systemd-user.conf
  sway/trunk/PKGBUILD

----------------------+
 50-systemd-user.conf |    4 ++--
 PKGBUILD             |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Modified: 50-systemd-user.conf
===================================================================
--- 50-systemd-user.conf	2021-10-17 23:09:55 UTC (rev 1030787)
+++ 50-systemd-user.conf	2021-10-18 00:27:22 UTC (rev 1030788)
@@ -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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-17 23:09:55 UTC (rev 1030787)
+++ PKGBUILD	2021-10-18 00:27:22 UTC (rev 1030788)
@@ -4,7 +4,7 @@
 
 pkgname=sway
 pkgver=1.6.1
-epoch=1
+epoch=2
 pkgrel=1
 pkgdesc='Tiling Wayland compositor and replacement for the i3 window manager'
 arch=(x86_64)
@@ -41,7 +41,7 @@
         "50-systemd-user.conf")
 sha512sums=('7f37fea99970db42c5485277df06d69bef5225fa03d25be179893b14d73c1d681f0355a1bc74091b4173bbccc88994a63ad0f9322e070811ba963648cf68cdeb'
             'SKIP'
-            '57590bc0d14c87289a4a9cd67991c6a841e54244d2a6186b5da5a08e633de2e8631959fa8c77ede211b0a5f315d920f2c1350951a53d6f2e9e81859056cb3c9e')
+            'c2b7d808f4231f318e03789015624fd4cf32b81434b15406570b4e144c0defc54e216d881447e6fd9fc18d7da608cccb61c32e0e1fab2f1fe2750acf812d3137')
 validpgpkeys=('34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48'  # Simon Ser
               '9DDA3B9FA5D58DD5392C78E652CB6609B22DA89A') # Drew DeVault