GNU bug report logs - #26222
[PATCH] gnu: freedoom: Avoid the need to propagate prboom-plus.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Kei Kebreau <kei <at> openmailbox.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#26222: closed ([PATCH] gnu: freedoom: Avoid the need to
 propagate prboom-plus.)
Date: Sat, 01 Apr 2017 23:20:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Sat, 01 Apr 2017 19:19:26 -0400
with message-id <874ly767i9.fsf <at> openmailbox.org>
and subject line Re: bug#26222: [PATCH] gnu: freedoom: Avoid the need to propagate	prboom-plus.
has caused the debbugs.gnu.org bug report #26222,
regarding [PATCH] gnu: freedoom: Avoid the need to propagate prboom-plus.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
26222: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=26222
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Kei Kebreau <kei <at> openmailbox.org>
To: guix-patches <at> gnu.org
Cc: Kei Kebreau <kei <at> openmailbox.org>
Subject: [PATCH] gnu: freedoom: Avoid the need to propagate prboom-plus.
Date: Wed, 22 Mar 2017 22:35:39 -0400

* gnu/packages/games.scm (freedoom)[arguments]: Substitute shell
variable assignment in start script for a direct engine launch.
---
 gnu/packages/games.scm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 67fcb7b49..401ba4444 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -162,14 +162,19 @@
                        (("freedoom2.png")
                         "-define png:exclude-chunks=date freedoom2.png"))
                      ;; Make sure that the install scripts know where to find
-                     ;; the appropriate WAD files.
+                     ;; the appropriate WAD files and Doom engine.
+                     ;; Do this by turning a shell variable assignment into a
+                     ;; direct engine launch and exit.
                      (substitute* "dist/freedoom"
-                       (("IWAD=freedm.wad")
-                        (string-append "IWAD=" wad-dir "/freedm.wad"))
-                       (("IWAD=freedoom1.wad")
-                        (string-append "IWAD=" wad-dir "/freedoom1.wad"))
-                       (("IWAD=freedoom2.wad")
-                        (string-append "IWAD=" wad-dir "/freedoom2.wad")))
+                       (("IWAD=")
+                        (string-append (assoc-ref inputs "prboom-plus")
+                                       "/bin/prboom-plus -iwad "))
+                       (("freedm.wad")
+                        (string-append  wad-dir "/freedm.wad \"$@\"; exit $?"))
+                       (("freedoom1.wad")
+                        (string-append  wad-dir "/freedoom1.wad \"$@\"; exit $?"))
+                       (("freedoom2.wad")
+                        (string-append wad-dir "/freedoom2.wad \"$@\"; exit $?")))
                      #t))))))
    (native-inputs
     `(("asciidoc" ,asciidoc)
-- 
2.12.0

[Message part 3 (message/rfc822, inline)]

From: Kei Kebreau <kei <at> openmailbox.org>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 26222-done <at> debbugs.gnu.org
Subject: Re: bug#26222: [PATCH] gnu: freedoom: Avoid the need to
 propagate	prboom-plus.
Date: Sat, 01 Apr 2017 19:19:26 -0400

[Message part 4 (text/plain, inline)]

Kei Kebreau <kei <at> openmailbox.org> writes:

> Marius Bakke <mbakke <at> fastmail.com> writes:
>
>> Kei Kebreau <kei <at> openmailbox.org> writes:
>>
>> From reading the "dist/freedoom" shell script, it looks like it tries
>> prboom-plus automatically if it exists in PATH. Does this not work? It
>> also tries a bunch of other engines, so I don't think we should hard
>> code one.
>>
>
> In that case, we could instead leave the package as is and have users
> install prboom-plus (or future engines when they are packaged)
> manually. Freedoom's package description already mentions that it needs
> a compatible engine to run. If you think that's enough for a casual user
> to notice, I'm fine with dropping the patch.
>

I've decided against this patch, as we may have other Doom engines
available in the future. Thank you for your time, Marius.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.