Subject: bug#42454: closed (Re: [bug#42454] [PATCH] gnu: enigma: Fix enigma.)

From: [email-masked] (GNU bug Tracking System)
Date: Wed, 19 Aug 2020 06:56:02 +0000

Your bug report

#42454: [PATCH] gnu: enigma: Fix enigma.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
42454: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=42454
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#42454] [PATCH] gnu: enigma: Fix enigma.
From: Efraim Flashner <[email-masked]>
To: Jesse Gibbons <[email-masked]>
Cc: [email-masked]
Date: Wed, 19 Aug 2020 09:54:45 +0300
List-Id: <debbugs-submit.debbugs.gnu.org>

It looks like a similar patch was pushed on July 24.
0b95f51eae50fbe627a354f50fa053a6d52b81aa

-- 
Efraim Flashner   <[email-masked]>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

Subject: [PATCH] gnu: enigma: Fix enigma.
From: Jesse Gibbons <[email-masked]>
To: Guix Patches <[email-masked]>
Date: Tue, 21 Jul 2020 00:07:22 -0600
List-Id: <debbugs-submit.debbugs.gnu.org>

* 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)))