Control: tags 833971 + pending

Dear maintainer,

I've prepared an NMU for xautolock (versioned as 1:2.2-5.1)
I'll look for an sponsor and upload it.

I've tested the nmu on different desktop systems, I haven't observed any
issue in the last 2 days.

Regards.

-- 
1AE0 322E B8F7 4717 BDEA BF1D 44BB 1BA7 9F6C 6333

keybase: https://keybase.io/gfa
diff -Nru xautolock-2.2/debian/changelog xautolock-2.2/debian/changelog
--- xautolock-2.2/debian/changelog	2016-03-16 06:17:05.000000000 +0800
+++ xautolock-2.2/debian/changelog	2016-09-15 14:54:09.000000000 +0800
@@ -1,3 +1,12 @@
+xautolock (1:2.2-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * This update allows one to build against glibc >= 2.24.
+  Thanks Aurelien Jarno <aure...@debian.org> for the patch
+  (Closes: #833971).
+
+ -- gustavo panizzo <g...@zumbi.com.ar>  Thu, 15 Sep 2016 14:54:09 +0800
+
 xautolock (1:2.2-5) unstable; urgency=low
 
   * Non-maintainer upolad
diff -Nru xautolock-2.2/debian/patches/14-do-not-use-union-wait-type.patch xautolock-2.2/debian/patches/14-do-not-use-union-wait-type.patch
--- xautolock-2.2/debian/patches/14-do-not-use-union-wait-type.patch	1970-01-01 08:00:00.000000000 +0800
+++ xautolock-2.2/debian/patches/14-do-not-use-union-wait-type.patch	2016-09-15 14:54:09.000000000 +0800
@@ -0,0 +1,24 @@
+Description: Allows to build against glibc >=2.24
+Author: Aurelien Jarno <aure...@debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833971
+
+--- xautolock-2.2.orig/src/engine.c
++++ xautolock-2.2/src/engine.c
+@@ -240,7 +240,7 @@ evaluateTriggers (Display* d)
+ #else /* VMS */
+   if (lockerPid)
+   {
+-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4)
++#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4) && !defined (__GLIBC__)
+     union wait  status;      /* childs process status */
+ #else /* !UTEKV && !SYSV && !SVR4 */
+     int         status = 0;  /* childs process status */
+@@ -251,7 +251,7 @@ evaluateTriggers (Display* d)
+       (void) kill (lockerPid, SIGTERM);
+     }
+ 
+-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4)
++#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4) && !defined (__GLIBC__)
+     if (wait3 (&status, WNOHANG, 0))
+ #else /* !UTEKV && !SYSV && !SVR4 */
+     if (waitpid (-1, &status, WNOHANG)) 
diff -Nru xautolock-2.2/debian/patches/series xautolock-2.2/debian/patches/series
--- xautolock-2.2/debian/patches/series	2016-03-16 06:16:38.000000000 +0800
+++ xautolock-2.2/debian/patches/series	2016-09-15 14:54:09.000000000 +0800
@@ -2,3 +2,4 @@
 11-fix-no-dpms.patch
 12-fix-manpage.patch
 13-fix-hppa-build.patch
+14-do-not-use-union-wait-type.patch

Reply via email to