GNU bug report logs - #34429
[PATCH] gnu: red-eclipse: Fix build.

Previous Next

Package: guix-patches;

Reported by: Christopher Baines <mail <at> cbaines.net>

Date: Mon, 11 Feb 2019 09:33:01 UTC

Severity: normal

Tags: patch

Done: Christopher Baines <mail <at> cbaines.net>

Bug is archived. No further changes may be made.

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

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

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#34429; Package guix-patches. (Mon, 11 Feb 2019 09:33:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to Christopher Baines <mail <at> cbaines.net>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Mon, 11 Feb 2019 09:33:01 GMT) Full text and rfc822 format available.

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

From: Christopher Baines <mail <at> cbaines.net>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: red-eclipse: Fix build.
Date: Mon, 11 Feb 2019 09:32:31 +0000
Add a patch from the upstream repository [1] that resolves some errors that
prevent the package from building [2].

1: https://github.com/red-eclipse/base/commit/b16b4963c1ad81bb9ef784bc49
2: error: ‘____gammal_r_finite’ was not declared in this scope

* gnu/packages/games.scm (red-eclipse)[source] Add patch.
* gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch: New file
* gnu/local.mk (dist_patch_DATA): Add new patch.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/games.scm                        |  4 +-
 .../red-eclipse-remove-gamma-name-hack.patch  | 52 +++++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 37083ca916..ca46ae7419 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1193,6 +1193,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/rct-add-missing-headers.patch		\
   %D%/packages/patches/readline-link-ncurses.patch		\
   %D%/packages/patches/readline-6.2-CVE-2014-2524.patch		\
+  %D%/packages/patches/red-eclipse-remove-gamma-name-hack.patch	\
   %D%/packages/patches/reposurgeon-add-missing-docbook-files.patch	\
   %D%/packages/patches/reptyr-fix-gcc-7.patch			\
   %D%/packages/patches/ripperx-missing-file.patch		\
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 5d7c89a880..de53ac798d 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2843,7 +2843,9 @@ http://lavachat.symlynx.com/unix/")
                 (file-name (string-append name "-" version ".tar.gz"))
                 (sha256
                  (base32
-                  "1vs9k6f5fgsiy1n72imlqm8khjwm8cryc08zwd4gr7yxlxv45bs0"))))
+                  "1vs9k6f5fgsiy1n72imlqm8khjwm8cryc08zwd4gr7yxlxv45bs0"))
+                (patches
+                 (search-patches "red-eclipse-remove-gamma-name-hack.patch"))))
       (build-system gnu-build-system)
       (arguments
        `(#:tests? #f            ; no check target
diff --git a/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch b/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch
new file mode 100644
index 0000000000..573920cb99
--- /dev/null
+++ b/gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch
@@ -0,0 +1,52 @@
+From b16b4963c1ad81bb9ef784bc4913a4c8ab5f1bb4 Mon Sep 17 00:00:00 2001
+From: Lee Salzman <lsalzman <at> gmail.com>
+Date: Tue, 12 Sep 2017 14:45:10 -0400
+Subject: [PATCH] remove gamma name hack
+
+---
+ src/engine/main.cpp | 6 +++---
+ src/shared/cube.h   | 8 --------
+ 2 files changed, 3 insertions(+), 11 deletions(-)
+
+diff --git a/src/engine/main.cpp b/src/engine/main.cpp
+index 1032004d..77c9233a 100644
+--- a/src/engine/main.cpp
++++ b/src/engine/main.cpp
+@@ -278,10 +278,10 @@ static void setgamma(int val)
+ }
+ 
+ static int curgamma = 100;
+-VARF(IDF_PERSIST, gamma, 30, 100, 300,
++VARFN(IDF_PERSIST, gamma, reqgamma, 30, 100, 300,
+ {
+-    if(initing || gamma == curgamma) return;
+-    curgamma = gamma;
++    if(initing || reqgamma == curgamma) return;
++    curgamma = reqgamma;
+     setgamma(curgamma);
+ });
+ 
+diff --git a/src/shared/cube.h b/src/shared/cube.h
+index 3864c492..7ff5e267 100644
+--- a/src/shared/cube.h
++++ b/src/shared/cube.h
+@@ -3,19 +3,11 @@
+ 
+ #define _FILE_OFFSET_BITS 64
+ 
+-#ifdef __GNUC__
+-#define gamma __gamma
+-#endif
+-
+ #ifdef WIN32
+ #define _USE_MATH_DEFINES
+ #endif
+ #include <math.h>
+ 
+-#ifdef __GNUC__
+-#undef gamma
+-#endif
+-
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
-- 
2.20.1





Information forwarded to guix-patches <at> gnu.org:
bug#34429; Package guix-patches. (Tue, 12 Feb 2019 07:58:01 GMT) Full text and rfc822 format available.

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

From: Ricardo Wurmus <rekado <at> elephly.net>
To: Christopher Baines <mail <at> cbaines.net>
Cc: 34429 <at> debbugs.gnu.org
Subject: Re: [bug#34429] [PATCH] gnu: red-eclipse: Fix build.
Date: Mon, 11 Feb 2019 17:10:14 +0100
Hi,

Christopher Baines <mail <at> cbaines.net> writes:

> Add a patch from the upstream repository [1] that resolves some errors that
> prevent the package from building [2].
>
> 1: https://github.com/red-eclipse/base/commit/b16b4963c1ad81bb9ef784bc49
> 2: error: ‘____gammal_r_finite’ was not declared in this scope
>
> * gnu/packages/games.scm (red-eclipse)[source] Add patch.
> * gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch: New file
> * gnu/local.mk (dist_patch_DATA): Add new patch.

LGTM!  Thanks!

-- 
Ricardo





Reply sent to Christopher Baines <mail <at> cbaines.net>:
You have taken responsibility. (Wed, 13 Feb 2019 08:05:01 GMT) Full text and rfc822 format available.

Notification sent to Christopher Baines <mail <at> cbaines.net>:
bug acknowledged by developer. (Wed, 13 Feb 2019 08:05:02 GMT) Full text and rfc822 format available.

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

From: Christopher Baines <mail <at> cbaines.net>
To: Ricardo Wurmus <rekado <at> elephly.net>
Cc: 34429-done <at> debbugs.gnu.org
Subject: Re: [bug#34429] [PATCH] gnu: red-eclipse: Fix build.
Date: Wed, 13 Feb 2019 08:03:57 +0000
[Message part 1 (text/plain, inline)]
Ricardo Wurmus <rekado <at> elephly.net> writes:

> Hi,
>
> Christopher Baines <mail <at> cbaines.net> writes:
>
>> Add a patch from the upstream repository [1] that resolves some errors that
>> prevent the package from building [2].
>>
>> 1: https://github.com/red-eclipse/base/commit/b16b4963c1ad81bb9ef784bc49
>> 2: error: ‘____gammal_r_finite’ was not declared in this scope
>>
>> * gnu/packages/games.scm (red-eclipse)[source] Add patch.
>> * gnu/packages/patches/red-eclipse-remove-gamma-name-hack.patch: New file
>> * gnu/local.mk (dist_patch_DATA): Add new patch.
>
> LGTM!  Thanks!

Great, I've pushed this as e7e259a50335269cddd004482a655f59d5c7a237

Thanks,

Chris
[signature.asc (application/pgp-signature, inline)]

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Wed, 13 Mar 2019 11:24:05 GMT) Full text and rfc822 format available.

This bug report was last modified 5 years and 17 days ago.

Previous Next


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