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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 42454 in the body.
You can then email your comments to 42454 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

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

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 #8 received at 42454 <at> debbugs.gnu.org (full text, mbox):

From: Brett Gilio <brettg <at> gnu.org>
To: Jesse Gibbons <jgibbons2357 <at> gmail.com>
Cc: 42454 <at> debbugs.gnu.org
Subject: Re: [bug#42454] [PATCH] gnu: enigma: Fix enigma.
Date: Fri, 24 Jul 2020 20:21:37 -0500

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 :).

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

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

From: Jesse Gibbons <jgibbons2357 <at> gmail.com>
To: 42454 <at> debbugs.gnu.org
Subject: re: [bug#42454] [PATCH] gnu: enigma: Fix enigma.
Date: Mon, 17 Aug 2020 15:01:39 -0600

This is a friendly bump.

https://lists.gnu.org/archive/html/guix-patches/2020-07/msg00845.html

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

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 1 (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)]

Previous Next

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