GNU bug report logs - #42454
[PATCH] gnu: enigma: Fix enigma.

Previous Next

Package: guix-patches;

Reported by: Jesse Gibbons <jgibbons2357 <at> gmail.com>

Date: Tue, 21 Jul 2020 06:08:01 UTC

Severity: normal

Tags: patch

Done: Efraim Flashner <efraim <at> flashner.co.il>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Efraim Flashner <efraim <at> flashner.co.il>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#42454: closed ([PATCH] gnu: enigma: Fix enigma.)
Date: Wed, 19 Aug 2020 06:56:01 +0000
[Message part 1 (text/plain, inline)]
Your message dated Wed, 19 Aug 2020 09:54:45 +0300
with message-id <20200819065445.GC10528 <at> E5400>
and subject line Re: [bug#42454] [PATCH] gnu: enigma: Fix enigma.
has caused the debbugs.gnu.org bug report #42454,
regarding [PATCH] gnu: enigma: Fix enigma.
to be marked as done.

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


-- 
42454: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=42454
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: Jesse Gibbons <jgibbons2357 <at> gmail.com>
To: Guix Patches <guix-patches <at> gnu.org>
Subject: [PATCH] gnu: enigma: Fix enigma.
Date: Tue, 21 Jul 2020 00:07:22 -0600
* gnu/packages/games.scm: enigma(phases): Add 'fix-proxy.
---
gnu/packages/games.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2efbb3964e..14d47dcbe6 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5872,7 +5872,17 @@ The Flag. You can even design your own maps!")
(substitute* "src/main.cc"
(("#include <SDL_(image|ttf|mixer).h>" line header)
(string-append "#include \"SDL/SDL_" header ".h\"")))
- #t)))))
+ #t))
+ (add-after 'find-sdl 'fix-proxy
+ (lambda _
+ ;; Build fails when making src/lev/Proxy.cc because
+ ;; the wrong operator overload is used.
+ (substitute* "src/lev/Proxy.cc"
+ (("ifs != NULL")
+ "!ifs"))
+ (display "...")
+ #t))
+ )))
(inputs
`(("xerces-c" ,xerces-c)
("sdl-union" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf)))


[Message part 3 (message/rfc822, inline)]
From: Efraim Flashner <efraim <at> flashner.co.il>
To: Jesse Gibbons <jgibbons2357 <at> gmail.com>
Cc: 42454-done <at> debbugs.gnu.org
Subject: Re: [bug#42454] [PATCH] gnu: enigma: Fix enigma.
Date: Wed, 19 Aug 2020 09:54:45 +0300
[Message part 4 (text/plain, inline)]
It looks like a similar patch was pushed on July 24.
0b95f51eae50fbe627a354f50fa053a6d52b81aa


-- 
Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[signature.asc (application/pgp-signature, inline)]

This bug report was last modified 4 years and 278 days ago.

Previous Next


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