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

Previous Next

Full log

Message #11 received at 42454 <at> debbugs.gnu.org (full text, mbox):

From: Jesse Gibbons <jgibbons2357 <at> gmail.com>
To: Brett Gilio <brettg <at> gnu.org>
Cc: 42454 <at> debbugs.gnu.org
Subject: Re: [bug#42454] [PATCH] gnu: enigma: Fix enigma.
Date: Mon, 27 Jul 2020 22:04:20 -0600

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

Attached. I removed some debug code I had left in.

On 7/24/20 7:21 PM, Brett Gilio wrote:
> Jesse Gibbons <jgibbons2357 <at> gmail.com> writes:
>
>> * 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)))
> Hey Jesse,
>
> Just like the last patch this one is mangled :).

[v2-0001-gnu-enigma-Fix-enigma.patch (text/x-patch, attachment)]

Previous Next

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