summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author David Spencer <idlemoor@slackbuilds.org>2016-04-01 14:01:08 +0100
committer Robby Workman <rworkman@slackbuilds.org>2016-04-03 02:30:24 -0500
commitf53a4f0e2988a8ce55f704413a4a61470febc6ce (patch)
tree46d28088b7688859423fab9bbf4b66bb898c8617
parentecfd1319369716ea81fbb5d6248cd8d820509bb1 (diff)
downloadslackbuilds-f53a4f0e2988a8ce55f704413a4a61470febc6ce.tar.gz
slackbuilds-f53a4f0e2988a8ce55f704413a4a61470febc6ce.tar.xz
games/openspades: Patched to fix build failure.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
-rw-r--r--games/openspades/86de4031c6c647b4d74196181f6754486ad1c340.patch49
-rw-r--r--games/openspades/openspades.SlackBuild3
2 files changed, 52 insertions, 0 deletions
diff --git a/games/openspades/86de4031c6c647b4d74196181f6754486ad1c340.patch b/games/openspades/86de4031c6c647b4d74196181f6754486ad1c340.patch
new file mode 100644
index 0000000000..41e456fd51
--- /dev/null
+++ b/games/openspades/86de4031c6c647b4d74196181f6754486ad1c340.patch
@@ -0,0 +1,49 @@
+From 0ac59fdbae2c6e496b28b4fc01b52a02622e8146 Mon Sep 17 00:00:00 2001
+From: Samuel Walladge <samuel@swalladge.id.au>
+Date: Mon, 7 Mar 2016 09:37:15 +1030
+Subject: [PATCH] fixed isnan not declared
+
+---
+ Sources/Client/Client_Input.cpp | 1 +
+ Sources/Client/Corpse.cpp | 2 ++
+ Sources/Draw/SWMapRenderer.cpp | 2 ++
+ 3 files changed, 5 insertions(+)
+
+diff --git a/Sources/Client/Client_Input.cpp b/Sources/Client/Client_Input.cpp
+index d30861b..917719e 100644
+--- a/Sources/Client/Client_Input.cpp
++++ b/Sources/Client/Client_Input.cpp
+@@ -38,6 +38,7 @@
+
+ #include "NetClient.h"
+
++using namespace std;
+
+ SPADES_SETTING(cg_mouseSensitivity, "1");
+ SPADES_SETTING(cg_zoomedMouseSensScale, "0.6");
+diff --git a/Sources/Client/Corpse.cpp b/Sources/Client/Corpse.cpp
+index 1376926..b3eb455 100644
+--- a/Sources/Client/Corpse.cpp
++++ b/Sources/Client/Corpse.cpp
+@@ -27,6 +27,8 @@
+ #include "../Core/Debug.h"
+ #include "../Core/Settings.h"
+
++using namespace std;
++
+ SPADES_SETTING(r_corpseLineCollision, "1");
+
+ namespace spades {
+diff --git a/Sources/Draw/SWMapRenderer.cpp b/Sources/Draw/SWMapRenderer.cpp
+index c2e310b..0e47b7b 100644
+--- a/Sources/Draw/SWMapRenderer.cpp
++++ b/Sources/Draw/SWMapRenderer.cpp
+@@ -31,6 +31,8 @@
+ #include "SWUtils.h"
+ #include <cstdint>
+
++using namespace std;
++
+ SPADES_SETTING(r_swUndersampling, "0");
+
+ namespace spades {
diff --git a/games/openspades/openspades.SlackBuild b/games/openspades/openspades.SlackBuild
index 8a983674f5..49b5002829 100644
--- a/games/openspades/openspades.SlackBuild
+++ b/games/openspades/openspades.SlackBuild
@@ -69,6 +69,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# https://github.com/yvt/openspades/pull/388
+patch -p1 < $CWD/86de4031c6c647b4d74196181f6754486ad1c340.patch
+
# copy develompent packs
mkdir -p build/Resources
cp $CWD/DevPaks27.zip build/Resources