* [bug#34429] [PATCH] gnu: red-eclipse: Fix build.
@ 2019-02-11 9:32 Christopher Baines
2019-02-11 16:10 ` Ricardo Wurmus
0 siblings, 1 reply; 3+ messages in thread
From: Christopher Baines @ 2019-02-11 9:32 UTC (permalink / raw)
To: 34429
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@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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#34429] [PATCH] gnu: red-eclipse: Fix build.
2019-02-11 9:32 [bug#34429] [PATCH] gnu: red-eclipse: Fix build Christopher Baines
@ 2019-02-11 16:10 ` Ricardo Wurmus
2019-02-13 8:03 ` bug#34429: " Christopher Baines
0 siblings, 1 reply; 3+ messages in thread
From: Ricardo Wurmus @ 2019-02-11 16:10 UTC (permalink / raw)
To: Christopher Baines; +Cc: 34429
Hi,
Christopher Baines <mail@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
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#34429: [PATCH] gnu: red-eclipse: Fix build.
2019-02-11 16:10 ` Ricardo Wurmus
@ 2019-02-13 8:03 ` Christopher Baines
0 siblings, 0 replies; 3+ messages in thread
From: Christopher Baines @ 2019-02-13 8:03 UTC (permalink / raw)
To: Ricardo Wurmus; +Cc: 34429-done
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
Ricardo Wurmus <rekado@elephly.net> writes:
> Hi,
>
> Christopher Baines <mail@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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-13 8:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-11 9:32 [bug#34429] [PATCH] gnu: red-eclipse: Fix build Christopher Baines
2019-02-11 16:10 ` Ricardo Wurmus
2019-02-13 8:03 ` bug#34429: " Christopher Baines
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.