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

[Florian Pritz]

    Date: Thursday, May 31, 2018 @ 12:15:44
  Author: bluewind
Revision: 334809

archrelease: copy trunk to community-x86_64

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

------------------+
 PKGBUILD         |   65 +++++++++++++++++++++++++++++------------------------
 union-wait.patch |   26 +++++++++++++++++++++
 2 files changed, 62 insertions(+), 29 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-31 12:15:41 UTC (rev 334808)
+++ PKGBUILD	2018-05-31 12:15:44 UTC (rev 334809)
@@ -1,29 +0,0 @@
-# $Id$
-# 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=4
-pkgdesc="An automatic X screen-locker/screen-saver"
-arch=(i686 x86_64)
-url="http://ibiblio.org/pub/Linux/X11/screensavers/"
-license=('GPL2')
-depends=('libxss')
-makedepends=('imake')
-source=("http://ibiblio.org/pub/Linux/X11/screensavers/$pkgname-$pkgver.tgz")
-md5sums=('9526347a202694ad235d731d9d3de91f')
-
-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-x86_64/PKGBUILD (from rev 334808, xautolock/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-05-31 12:15:44 UTC (rev 334809)
@@ -0,0 +1,36 @@
+# $Id$
+# 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=5
+pkgdesc="An automatic X screen-locker/screen-saver"
+arch=(x86_64)
+url="http://ibiblio.org/pub/Linux/X11/screensavers/"
+license=('GPL2')
+depends=('libxss')
+makedepends=('imake')
+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
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install.man
+}

Copied: xautolock/repos/community-x86_64/union-wait.patch (from rev 334808, xautolock/trunk/union-wait.patch)
===================================================================
--- union-wait.patch	                        (rev 0)
+++ union-wait.patch	2018-05-31 12:15:44 UTC (rev 334809)
@@ -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