From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eKQH5-0003hB-Ed for guix-patches@gnu.org; Thu, 30 Nov 2017 09:57:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eKQGs-0003bK-9m for guix-patches@gnu.org; Thu, 30 Nov 2017 09:57:15 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:58055) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eKQGs-0003bD-5q for guix-patches@gnu.org; Thu, 30 Nov 2017 09:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eKQGr-0004DU-VO for guix-patches@gnu.org; Thu, 30 Nov 2017 09:57:01 -0500 Subject: bug#29480: [PATCH] gnu: Add xautolock. Resent-To: guix-patches@gnu.org Resent-Message-ID: From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <87zi7786b0.fsf@gnu.org> Date: Thu, 30 Nov 2017 15:56:11 +0100 In-Reply-To: <87zi7786b0.fsf@gnu.org> (Mike Gerwitz's message of "Mon, 27 Nov 2017 21:50:59 -0500") Message-ID: <87y3mn3jec.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Mike Gerwitz Cc: 29480-done@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello Mike, Mike Gerwitz 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 > 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 =E2=80=98xmkmf=E2=80=99 failures stop the process, and the second one to ma= ke sure the phase returns a Boolean value. Thank you! Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline 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"))))))) --=-=-=--