[redeclipse] 01/01: Add patch to address build failure with glibc 2.26

[Martin Werner]

This is an automated email from the git hooks/post-receive script.

arand-guest pushed a commit to branch master
in repository redeclipse.

commit 02a5c7d4ed202f9c5c0c27f67c542bc27f844349
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Wed Jan 31 19:26:00 2018 +0100

    Add patch to address build failure with glibc 2.26
    
    Previously 'gamma' from math.h was masked in order to make it available
    to be defined by cubescript, and this masking was presumably dependent
    on implementation-specifics in glibc which had changed.
    
    With this fix cubescript uses a different associated global name
    'reqgamma' and thus does not need the masking.
---
 debian/changelog                            |  6 ++++
 debian/patches/remove-gamma-name-hack.patch | 52 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 59 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 03d77c0..9b3a716 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+redeclipse (1.5.8-2) UNRELEASED; urgency=medium
+
+  * Add patch to address build failure with glibc 2.26 (Closes: #626161)
+
+ -- Martin Erik Werner <martinerikwerner at gmail.com>  Thu, 01 Feb 2018 20:59:14 +0100
+
 redeclipse (1.5.8-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/remove-gamma-name-hack.patch b/debian/patches/remove-gamma-name-hack.patch
new file mode 100644
index 0000000..634b9ca
--- /dev/null
+++ b/debian/patches/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(-)
+
+Index: redeclipse/src/engine/main.cpp
+===================================================================
+--- redeclipse.orig/src/engine/main.cpp
++++ redeclipse/src/engine/main.cpp
+@@ -277,10 +277,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);
+ });
+ 
+Index: redeclipse/src/shared/cube.h
+===================================================================
+--- redeclipse.orig/src/shared/cube.h
++++ redeclipse/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>
diff --git a/debian/patches/series b/debian/patches/series
index 64b9328..39cdc24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 windowed-by-default.patch
 use-system-sqlite.patch
+remove-gamma-name-hack.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git