* [bug#42454] [PATCH] gnu: enigma: Fix enigma.
@ 2020-07-21 6:07 Jesse Gibbons
2020-07-25 1:21 ` Brett Gilio
2020-08-17 21:01 ` Jesse Gibbons
0 siblings, 2 replies; 5+ messages in thread
From: Jesse Gibbons @ 2020-07-21 6:07 UTC (permalink / raw)
To: 42454
* 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)))
^ permalink raw reply related [flat|nested] 5+ messages in thread* [bug#42454] [PATCH] gnu: enigma: Fix enigma.
2020-07-21 6:07 [bug#42454] [PATCH] gnu: enigma: Fix enigma Jesse Gibbons
@ 2020-07-25 1:21 ` Brett Gilio
2020-07-28 4:04 ` Jesse Gibbons
2020-08-17 21:01 ` Jesse Gibbons
1 sibling, 1 reply; 5+ messages in thread
From: Brett Gilio @ 2020-07-25 1:21 UTC (permalink / raw)
To: Jesse Gibbons; +Cc: 42454
Jesse Gibbons <jgibbons2357@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 :).
^ permalink raw reply [flat|nested] 5+ messages in thread* [bug#42454] [PATCH] gnu: enigma: Fix enigma.
2020-07-25 1:21 ` Brett Gilio
@ 2020-07-28 4:04 ` Jesse Gibbons
0 siblings, 0 replies; 5+ messages in thread
From: Jesse Gibbons @ 2020-07-28 4:04 UTC (permalink / raw)
To: Brett Gilio; +Cc: 42454
[-- Attachment #1: Type: text/plain, Size: 1154 bytes --]
Attached. I removed some debug code I had left in.
On 7/24/20 7:21 PM, Brett Gilio wrote:
> Jesse Gibbons <jgibbons2357@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 :).
[-- Attachment #2: v2-0001-gnu-enigma-Fix-enigma.patch --]
[-- Type: text/x-patch, Size: 1246 bytes --]
From a2ed7bff6ff65518910edac44f7e498418042bfb Mon Sep 17 00:00:00 2001
From: Jesse Gibbons <jgibbons2357+guix@gmail.com>
Date: Fri, 3 Jul 2020 18:35:57 -0600
Subject: [PATCH v2 1/1] gnu: enigma: Fix enigma.
* gnu/packages/games.scm: enigma(phases): Add 'fix-proxy.
---
gnu/packages/games.scm | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2efbb3964e..057f7f2d45 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5872,7 +5872,16 @@ 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"))
+ #t))
+ )))
(inputs
`(("xerces-c" ,xerces-c)
("sdl-union" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf)))
--
2.27.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#42454] [PATCH] gnu: enigma: Fix enigma.
2020-07-21 6:07 [bug#42454] [PATCH] gnu: enigma: Fix enigma Jesse Gibbons
2020-07-25 1:21 ` Brett Gilio
@ 2020-08-17 21:01 ` Jesse Gibbons
2020-08-19 6:54 ` bug#42454: " Efraim Flashner
1 sibling, 1 reply; 5+ messages in thread
From: Jesse Gibbons @ 2020-08-17 21:01 UTC (permalink / raw)
To: 42454
This is a friendly bump.
https://lists.gnu.org/archive/html/guix-patches/2020-07/msg00845.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-08-19 6:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-21 6:07 [bug#42454] [PATCH] gnu: enigma: Fix enigma Jesse Gibbons
2020-07-25 1:21 ` Brett Gilio
2020-07-28 4:04 ` Jesse Gibbons
2020-08-17 21:01 ` Jesse Gibbons
2020-08-19 6:54 ` bug#42454: " Efraim Flashner
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).