From 3b41729a1ca507745fcdb136d2345cffcb7ca1a9 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Tue, 16 May 2017 15:34:03 +0200
Subject: [PATCH] Work around bug that caused xautolock to stop working

---
 .../xautolock-2.2-do-not-restart.patch        | 48 +++++++++++++++++++
 satellites/xautolock.sat                      |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 satellites/extrafiles/xautolock/xautolock-2.2-do-not-restart.patch

diff --git a/satellites/extrafiles/xautolock/xautolock-2.2-do-not-restart.patch b/satellites/extrafiles/xautolock/xautolock-2.2-do-not-restart.patch
new file mode 100644
index 0000000..a736d4a
--- /dev/null
+++ b/satellites/extrafiles/xautolock/xautolock-2.2-do-not-restart.patch
@@ -0,0 +1,48 @@
+# Rationale:
+# After xautolock -restart is called, it simply stops working.
+# I'm not exactly sure why that happens, but I'm not up for researching that.
+# This problem comes into play when xdg-screensaver uses the -restart option
+#  simply because there is no other way to reset the lock timer.
+# Since a few well-known (video player) applications continuously keep calling
+#  xdg-screensaver reset to avoid the lockscreen being triggered, this problem
+#  can be observed after running those applications.
+# The expected behavior is resetting the lock timer, so instead of wasting
+#  resources actually restarting the entire application, why not simply
+#  actually reset the lock timer?
+
++++ src/message.c
+@@ -100,12 +100,7 @@
+ static void
+ restartByMessage (Display* d, Window root)
+ {
+-  if (!secure)
+-  {
+-    XDeleteProperty (d, root, semaphore);
+-    XFlush (d);
+-    execv (argArray[0], argArray);
+-  }
++  if (!secure) resetTriggers();
+ }
+ 
+ /*
++++ src/options.c
+@@ -595,7 +595,7 @@
+   error0 (" -toggle             : toggle a running xautolock.\n");
+   error0 (" -locknow            : tell a running xautolock to lock.\n");
+   error0 (" -unlocknow          : tell a running xautolock to unlock.\n");
+-  error0 (" -restart            : tell a running xautolock to restart.\n");
++  error0 (" -restart            : tell a running xautolock to reset the lock timer.\n");
+   error0 (" -exit               : kill a running xautolock.\n");
+   error0 (" -secure             : ignore enable, disable, toggle, locknow\n");
+   error0 ("                       unlocknow, and restart messages.\n");
++++ xautolock.man
+@@ -270,8 +270,7 @@
+ .TP
+ \fB\-restart\fR
+ Causes an already running xautolock process (if there is one and 
+-it does not have \fB\-secure\fR switched on) to restart. In any
+-case, the current invocation of xautolock exits.
++it does not have \fB\-secure\fR switched on) to reset the lock timer.
+ 
+ .SH RESOURCES
+ .TP 16
diff --git a/satellites/xautolock.sat b/satellites/xautolock.sat
index 202ba17..9811075 100644
--- a/satellites/xautolock.sat
+++ b/satellites/xautolock.sat
@@ -6,10 +6,12 @@ version=2.2
 misc_debian_download 5.1 \
                      'd3d2fefe3345fa380f4e3331b9f13ba3' \
                      '9526347a202694ad235d731d9d3de91f'
+extrafile "$name-$orig_version-do-not-restart.patch"
 header_end
 
 cd "$name-$version"
 misc_debian_patch
+patch -p0 -i "../$name-$orig_version-do-not-restart.patch"
 
 xmkmf
 make install \