Teemu Ikonen <tpiko...@gmail.com> wrote:
> The patch /usr/share/doc/xss-lock/xdg-screensaver.patch to
> xdg-screensaver does not work, as the support for resetting
> xss-lock with kill -HUP has been removed from xss-lock in
> debian/patches/0002-exit-on-SIGHUP-fixes-6.patch
Attached is a patch to xss-lock package which removes the
non-working xdg-screensaver patch and fixes the man page sections
about signals and xdg-screensaver support.
Best,
Teemu
From 10042faf459dadd4de51e8ec007372b8b9eb44bc Mon Sep 17 00:00:00 2001
From: Teemu Ikonen <tpiko...@gmail.com>
Date: Tue, 27 Nov 2018 10:13:33 +0200
Subject: [PATCH] Fix info about SIGHUP and xdg-screensaver in man page.
Remove section on SIGHUP from man page, since support for resetting via
signals has been removed from xss-lock.
Remove obsolete xdg-screensaver.patch and point to a location of a
working version in man page.
---
doc/xdg-screensaver.patch | 20 --------------------
doc/xss-lock.1.rst.in | 28 +++-------------------------
2 files changed, 3 insertions(+), 45 deletions(-)
delete mode 100644 doc/xdg-screensaver.patch
diff --git a/doc/xdg-screensaver.patch b/doc/xdg-screensaver.patch
deleted file mode 100644
index 2ff0c70..0000000
--- a/doc/xdg-screensaver.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -u old/xdg-screensaver new/xdg-screensaver
---- old/xdg-screensaver 2013-05-21 15:08:51.152812849 +0200
-+++ new/xdg-screensaver 2013-05-21 15:13:16.843096616 +0200
-@@ -825,13 +825,13 @@
- {
- case "$1" in
- suspend)
-- xset s off > /dev/null
-+ screensaver_suspend_loop eval killall -HUP xss-lock '||' xset s reset > /dev/null 2>&1
- result=$?
- ;;
-
- resume)
-- xset s default > /dev/null
-- result=$?
-+ # Automatic resume when $screensaver_file disappears
-+ result=0
- ;;
-
- activate)
diff --git a/doc/xss-lock.1.rst.in b/doc/xss-lock.1.rst.in
index e1b0840..69814a0 100644
--- a/doc/xss-lock.1.rst.in
+++ b/doc/xss-lock.1.rst.in
@@ -86,20 +86,6 @@ Options
Signals
=======
-SIGHUP
- Upon receiving this signal, **xss-lock** resets the screen saver, but only
- if the screen is not currently locked (unlike ``xset s reset``).
-
- This can be used in MPlayer's configuration as a workaround for MPlayer's
- failure to restart the screen saver timer when playback is paused::
-
- heartbeat-cmd="killall -HUP xss-lock"
- stop-xscreensaver=false
-
- .. note::
- This is ineffective with mplayer2 (and mpv), because its heart keeps
- beating while playback is paused.
-
SIGINT/SIGTERM
Upon receiving this signal, **xss-lock** exits after killing any running
notifier or locker.
@@ -107,17 +93,9 @@ SIGINT/SIGTERM
Notes
=====
-- Some applications rely on the **xdg-screensaver** script from xdg-utils,
- which uses ``xset s off`` and ``xset s default`` to suspend and resume the
- screen saver, respectively. The latter resets the timeout and cycle to the
- server defaults (``xset s on`` uses a hardcoded default instead), so this
- only works if you are happy with (or can control) the server settings.
-
- To fix the resume action in this script (or a copy in *~/bin* preceding the
- original in **$PATH**), either replace ``on`` by your preferred timeout and
- cycle, or avoid hardcoded time values by patching the script to run a suspend
- loop as it does for other screen savers, using
- *@CMAKE_INSTALL_PREFIX@/share/doc/xss-lock/xdg-screensaver.patch*.
+- Some applications rely on the **xdg-screensaver** script from xdg-utils
+ to control the screen saver. A patch to support xss-lock in xdg-screensaver
+ can be found here: https://bugs.freedesktop.org/show_bug.cgi?id=108865
Examples
========
--
2.11.0
