[arch-commits] Commit in xautolock/repos (3 files)

[Felix Yan]

    Date: Tuesday, July 7, 2020 @ 17:12:23
  Author: felixonmars
Revision: 659608

archrelease: copy trunk to community-staging-x86_64

Added:
  xautolock/repos/community-staging-x86_64/
  xautolock/repos/community-staging-x86_64/PKGBUILD
    (from rev 659607, xautolock/trunk/PKGBUILD)
  xautolock/repos/community-staging-x86_64/union-wait.patch
    (from rev 659607, xautolock/trunk/union-wait.patch)

------------------+
 PKGBUILD         |   35 +++++++++++++++++++++++++++++++++++
 union-wait.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

Copied: xautolock/repos/community-staging-x86_64/PKGBUILD (from rev 659607, xautolock/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-07-07 17:12:23 UTC (rev 659608)
@@ -0,0 +1,35 @@
+# Maintainer: Florian Pritz <f-p at gmx.at>
+# Contributor: dorphell <dorphell at archlinux.org>
+# Committer: Judd Vinet <jvinet at zeroflux.org>
+
+pkgname=xautolock
+pkgver=2.2
+pkgrel=6
+pkgdesc="An automatic X screen-locker/screen-saver"
+arch=(x86_64)
+url="https://ibiblio.org/pub/Linux/X11/screensavers/"
+license=('GPL2')
+depends=('libxss')
+makedepends=('imake')
+source=("https://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
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install.man
+}

Copied: xautolock/repos/community-staging-x86_64/union-wait.patch (from rev 659607, xautolock/trunk/union-wait.patch)
===================================================================
--- community-staging-x86_64/union-wait.patch	                        (rev 0)
+++ community-staging-x86_64/union-wait.patch	2020-07-07 17:12:23 UTC (rev 659608)
@@ -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