Bug#1019244: xdg-utils: xdg-screensaver cannot lock screen with xss-lock

[Edgar Yllescas]

Package: xdg-utils
Version: 1.1.3-4.1
Severity: important
Tags: patch


this is an old bug with xdg-utils, the patch was originally on the bugzilla
and migrated but apparently the issue got "lost" and has not been addressed
on the upstream https://gitlab.freedesktop.org/xdg/xdg-utils/-/issues/139
i commented the issue to try and get attention to it, but in the meantime it
would be great to have this patch merged in debian.


-- Package-specific info:
Desktop environment: XDG_CURRENT_DESKTOP=awesome wm

-- System Information:
Debian Release: bookworm/sid
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.18.0-3-amd64 (SMP w/8 CPU threads; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)
LSM: AppArmor: enabled

xdg-utils depends on no packages.

Versions of packages xdg-utils recommends:
ii  libfile-mimeinfo-perl  0.33-1
ii  libnet-dbus-perl       1.2.0-1+b2
ii  libx11-protocol-perl   0.56-8
ii  x11-utils              7.7+5
ii  x11-xserver-utils      7.7+9

xdg-utils suggests no packages.

-- no debconf information
-------------- next part --------------
--- xdg-screensaver.orig	2018-05-20 01:18:48.000000000 +0300
+++ xdg-screensaver	2018-11-26 12:32:17.142582293 +0200
@@ -619,6 +619,14 @@
       xautolock_screensaver "$1"
       ;;
 
+    xss-lock_screensaver)
+      if [ "$1" = "lock" ]; then
+        screensaver_xserver "activate"
+      else
+        screensaver_xserver "$1"
+      fi
+      ;;
+
     xfce)
       [ -n "$DISPLAY" ] && screensaver_xserver "$1"
       ;;
@@ -1394,6 +1402,8 @@
 dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.mate.ScreenSaver > /dev/null 2>&1 && DE="mate_screensaver"
 # Consider "xautolock" a separate DE
 xautolock -enable > /dev/null 2>&1 && DE="xautolock_screensaver"
+# Consider "xss-lock" a separate DE
+xss-lock --version > /dev/null 2>&1 && ps x -o cmd | grep -q '^xss-lock' && DE="xss-lock_screensaver"
 
 if [ "$action" = "resume" ] ; then
     do_resume