From 9ea897dbe3ccf801650a19d85263630057f5a488 Mon Sep 17 00:00:00 2001
From: B. Watson
Date: Wed, 21 Jun 2017 12:08:28 -0400
Subject: games/trackballs: Fix build for -current.

Signed-off-by: B. Watson <yalhcru@gmail.com>
---
 games/trackballs/patches/abs.diff      | 22 ++++++++++++++++++++++
 games/trackballs/trackballs.SlackBuild |  5 ++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 games/trackballs/patches/abs.diff

diff --git a/games/trackballs/patches/abs.diff b/games/trackballs/patches/abs.diff
new file mode 100644
index 0000000000..597971906d
--- /dev/null
+++ b/games/trackballs/patches/abs.diff
@@ -0,0 +1,22 @@
+diff -Naur trackballs-1.1.4/src/glHelp.cc trackballs-1.1.4.patched/src/glHelp.cc
+--- trackballs-1.1.4/src/glHelp.cc	2007-04-07 09:15:09.000000000 -0400
++++ trackballs-1.1.4.patched/src/glHelp.cc	2017-06-21 11:58:32.035646783 -0400
+@@ -129,7 +129,6 @@
+   // why is this removed? should it not be done???
+   glDeleteTextures(1,&texture);  
+ }
+-inline Real abs(Real v) {return v>0.0?v:-v;}
+ double mousePointerPhase=0.0;
+ 
+ void tickMouse(Real td) {
+diff -Naur trackballs-1.1.4/src/menuMode.cc trackballs-1.1.4.patched/src/menuMode.cc
+--- trackballs-1.1.4/src/menuMode.cc	2007-04-07 09:16:26.000000000 -0400
++++ trackballs-1.1.4.patched/src/menuMode.cc	2017-06-21 11:58:36.201646790 -0400
+@@ -163,7 +163,6 @@
+   case MENU_EDITOR: GameMode::activate(EditMode::editMode); break;
+   }
+ }
+-inline Real abs(Real v) {return v>0.0?v:-v;}
+ 
+ void MenuMode::idle(Real td) {
+   int w,h,i,x,y;
diff --git a/games/trackballs/trackballs.SlackBuild b/games/trackballs/trackballs.SlackBuild
index 8ef5025219..810a670593 100644
--- a/games/trackballs/trackballs.SlackBuild
+++ b/games/trackballs/trackballs.SlackBuild
@@ -6,6 +6,8 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20170621 bkw: fix build on -current
+
 PRGNAM=trackballs
 VERSION=${VERSION:-1.1.4}
 BUILD=${BUILD:-3}
@@ -57,7 +59,8 @@ find -L . \
  -exec chmod 644 {} \;
 
 # Apply two patches from redhat: one to fix building and running with guile-2.0.x,
-# another to fix "Esc" behaviour
+# another to fix "Esc" behaviour. Also abs.diff, which fixes the build for
+# gcc 7 from -current.
 for i in $CWD/patches/* ; do patch -p1 < $i ; done
 
 # Make icons honor DESTDIR (thanks to Johannes for this fix)
-- 
cgit v1.2.3