summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-07-07 22:51:04 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-07-07 22:51:04 +0700
commit6f296ea0088be53c540975970e4a4399e3d8198b (patch)
tree87886a9248f210dda1cc3afafd880ae3ac01ec63 /games
parent04c44e2ad46de365c834a1bf4be3798b96ca0cf9 (diff)
downloadslackbuilds-6f296ea0088be53c540975970e4a4399e3d8198b.tar.gz
games/Scorched3D: Fix build on -current.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'games')
-rw-r--r--games/Scorched3D/Scorched3D.SlackBuild2
-rw-r--r--games/Scorched3D/gcc.patch11
2 files changed, 13 insertions, 0 deletions
diff --git a/games/Scorched3D/Scorched3D.SlackBuild b/games/Scorched3D/Scorched3D.SlackBuild
index d8370b3006..f69b108793 100644
--- a/games/Scorched3D/Scorched3D.SlackBuild
+++ b/games/Scorched3D/Scorched3D.SlackBuild
@@ -71,6 +71,8 @@ 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 {} \;
+patch -p1 < $CWD/gcc.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/games/Scorched3D/gcc.patch b/games/Scorched3D/gcc.patch
new file mode 100644
index 0000000000..d97aeeb894
--- /dev/null
+++ b/games/Scorched3D/gcc.patch
@@ -0,0 +1,11 @@
+--- scorched/src/common/weapons/AccessoryStore.cpp.orig 2017-07-07 22:27:57.777261322 +0700
++++ scorched/src/common/weapons/AccessoryStore.cpp 2017-07-07 22:39:34.368313611 +0700
+@@ -156,7 +156,7 @@
+ Accessory *parent, XMLNode *currentNode)
+ {
+ XMLNode *typeNode = 0;
+- if (!currentNode->getNamedParameter("type", typeNode)) return false;
++ if (!currentNode->getNamedParameter("type", typeNode)) return 0;
+
+ AccessoryPart *accessoryPart =
+ AccessoryMetaRegistration::getNewAccessory(typeNode->getContent(), this);