[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#29480: [PATCH] gnu: Add xautolock.
From: |
Ludovic Courtès |
Subject: |
bug#29480: [PATCH] gnu: Add xautolock. |
Date: |
Thu, 30 Nov 2017 15:56:11 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) |
Hello Mike,
Mike Gerwitz <address@hidden> skribis:
> Building this one was a history lesson. I modeled it after xfig, which
> also uses imake.
Heheh.
> From 9de0820982f89949f943c1566c7dffe6b3bc87de Mon Sep 17 00:00:00 2001
> From: Mike Gerwitz <address@hidden>
> Date: Mon, 27 Nov 2017 21:45:11 -0500
> Subject: [PATCH] gnu: Add xautolock.
>
> * gnu/packages/xdisorg.scm (xautolock): New variable.
I took the liberty to make the changes below: the first one to make sure
‘xmkmf’ failures stop the process, and the second one to make sure the
phase returns a Boolean value.
Thank you!
Ludo’.
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index cc84884b6..2e1ed2ee9 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1358,7 +1358,7 @@ or playing a PCM encoded WAVE file.")
(let ((imake (assoc-ref inputs "imake"))
(out (assoc-ref outputs "out")))
;; Generate Makefile
- (zero? (system* "xmkmf"))
+ (invoke "xmkmf")
(substitute* "Makefile"
;; These imake variables somehow remain undefined
(("DefaultGcc2[[:graph:]]*Opt") "-O2")
@@ -1369,7 +1369,8 @@ or playing a PCM encoded WAVE file.")
;; Old BSD-style 'union wait' is unneeded (defining
;; _USE_BSD did not seem to fix it)
(substitute* "src/engine.c"
- (("union wait status") "int status = 0")))))
+ (("union wait status") "int status = 0"))
+ #t)))
(add-after 'install 'install/man
(lambda _
(zero? (system* "make" "install.man")))))))