[arch-commits] Commit in xautolock/trunk (PKGBUILD union-wait.patch)

[Florian Pritz]

    Date: Thursday, May 31, 2018 @ 12:15:41
  Author: bluewind
Revision: 334808

upgpkg: xautolock 2.2-5

BUILDINFO rebuild

Added:
  xautolock/trunk/union-wait.patch
Modified:
  xautolock/trunk/PKGBUILD

------------------+
 PKGBUILD         |   13 ++++++++++---
 union-wait.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-31 12:12:38 UTC (rev 334807)
+++ PKGBUILD	2018-05-31 12:15:41 UTC (rev 334808)
@@ -5,7 +5,7 @@
 
 pkgname=xautolock
 pkgver=2.2
-pkgrel=4
+pkgrel=5
 pkgdesc="An automatic X screen-locker/screen-saver"
 arch=(x86_64)
 url="http://ibiblio.org/pub/Linux/X11/screensavers/"
@@ -12,9 +12,16 @@
 license=('GPL2')
 depends=('libxss')
 makedepends=('imake')
-source=("http://ibiblio.org/pub/Linux/X11/screensavers/$pkgname-$pkgver.tgz")
-md5sums=('9526347a202694ad235d731d9d3de91f')
+source=("http://ibiblio.org/pub/Linux/X11/screensavers/$pkgname-$pkgver.tgz"
+        union-wait.patch)
+md5sums=('9526347a202694ad235d731d9d3de91f'
+         'd313c2e392be59c2cbbb4226caf98bd4')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 -i "$srcdir/union-wait.patch"
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   xmkmf

Added: union-wait.patch
===================================================================
--- union-wait.patch	                        (rev 0)
+++ union-wait.patch	2018-05-31 12:15:41 UTC (rev 334808)
@@ -0,0 +1,26 @@
+diff -ru xautolock-2.2-orig/src/engine.c xautolock-2.2/src/engine.c
+--- xautolock-2.2-orig/src/engine.c	2007-12-28 18:15:26.000000000 +0100
++++ xautolock-2.2/src/engine.c	2018-05-31 14:13:55.438216644 +0200
+@@ -210,22 +210,14 @@
+ #else /* VMS */
+   if (lockerPid)
+   {
+-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4)
+-    union wait  status;      /* childs process status */
+-#else /* !UTEKV && !SYSV && !SVR4 */
+     int         status = 0;  /* childs process status */
+-#endif /* !UTEKV && !SYSV && !SVR4 */
+ 
+     if (unlockNow && !disabled)
+     {
+       (void) kill (lockerPid, SIGTERM);
+     }
+ 
+-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4)
+-    if (wait3 (&status, WNOHANG, 0))
+-#else /* !UTEKV && !SYSV && !SVR4 */
+     if (waitpid (-1, &status, WNOHANG)) 
+-#endif /* !UTEKV && !SYSV && !SVR4 */
+     {
+      /*
+       *  If the locker exited normally, we disable any pending kill