jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xautlock: fix build

Browse source
This commit is contained in:
Jürgen Buchmüller 2017-01-25 15:00:54 +01:00
parent 11f9a43bdc
commit 2dff594dd5
3 changed files with 16 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
srcpkgs/xautolock/patches/fix-wait_status.patch Normal file
View file

@ -0,0 +1,14 @@
--- src/engine.c 2007-12-28 18:15:26.000000000 +0100
+++ src/engine.c 2017-01-25 14:48:00.087399865 +0100
@@ -210,11 +210,7 @@
#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)
{

33
srcpkgs/xautolock/patches/processwait.patch
View file

@ -1,33 +0,0 @@
--- src/engine.c.orig 2014-08-28 12:50:56.086307943 +0000
+++ src/engine.c 2014-08-28 12:50:59.496333650 +0000
@@ -209,24 +209,24 @@ 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 */
+#else /* (!UTEKV && !SYSV && !SVR4) && __GLIBC__ */
int status = 0; /* childs process status */
-#endif /* !UTEKV && !SYSV && !SVR4 */
+#endif /* (!UTEKV && !SYSV && !SVR4) && __GLIBC__ */
if (unlockNow && !disabled)
{
(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 */
+#else /* (!UTEKV && !SYSV && !SVR4) && __GLIBC__ */
if (waitpid (-1, &status, WNOHANG))
-#endif /* !UTEKV && !SYSV && !SVR4 */
+#endif /* (!UTEKV && !SYSV && !SVR4) && __GLIBC__ */
{
/*
* If the locker exited normally, we disable any pending kill
* trigger. Otherwise, we assume that it either has crashed or

4
srcpkgs/xautolock/template
View file

@ -1,7 +1,7 @@
# Template file for 'xautolock'
pkgname=xautolock
version=2.2
revision=3
revision=4
hostmakedepends="imake xorg-cf-files"
makedepends="libXScrnSaver-devel xproto"
short_desc="Autolock utility for X"
@ -12,7 +12,7 @@ distfiles="${homepage}/${pkgname}-${version}.tgz"
checksum=11f0275175634e6db756e96f5713ec91b8b1c41f8663df54e8a5d27dc71c4da2
do_build() {
xmkmf
CC=cc xmkmf
make CC=$CC CDEBUGFLAGS="-D_DEFAULT_SOURCE ${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
}
do_install() {