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

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

[Jesse Gibbons]

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

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

[Brett Gilio]

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

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

[Jesse Gibbons]

[-- 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

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

[Jesse Gibbons]

This is a friendly bump.

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

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

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

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


-- 
Efraim Flashner   <efraim@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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]