summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Wouter van Kesteren <woutershep@gmail.com> 2016-08-29 00:32:39 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2016-10-11 22:19:39 +0200
commit45cec9c49d76aac7fe8b883b08f37a0f2b39e013 (patch)
tree4f072baa75d7ca31b65f915738e2856c28472864
parent93d5e50cfdcd595a1f1753ff230bd9cbb45952c2 (diff)
downloadgames-45cec9c49d76aac7fe8b883b08f37a0f2b39e013.tar.gz
games-45cec9c49d76aac7fe8b883b08f37a0f2b39e013.tar.xz
openttd: bump to 1.6.1
Change-Id: I03b38342859db79384141aef65a59b871ffd1d1a Reviewed-on: https://galileo.mailstation.de/gerrit/7356 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Heiko Becker <heirecka@exherbo.org>
-rw-r--r--packages/games-simulation/openttd/files/openttd-1.6.0-gcc6.patch20
-rw-r--r--packages/games-simulation/openttd/openttd-1.6.1.exheres-0 (renamed from packages/games-simulation/openttd/openttd-1.6.0.exheres-0)1
2 files changed, 0 insertions, 21 deletions
diff --git a/packages/games-simulation/openttd/files/openttd-1.6.0-gcc6.patch b/packages/games-simulation/openttd/files/openttd-1.6.0-gcc6.patch
deleted file mode 100644
index e925bc2..0000000
--- a/packages/games-simulation/openttd/files/openttd-1.6.0-gcc6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: Fedora / Jonathan Wakely
-Upstream: no
-Reason: ftbs with gcc6
-
-In file included from /var/tmp/paludis/build/games-simulation-openttd-1.5.3/work/openttd-1.5.3/src/crashlog.cpp:39:0:
-safeguards.h:28:19: error: 'std::SAFEGUARD_DO_NOT_USE_THIS_METHOD' has not been declared
-safeguards.h:25:19: error: 'std::SAFEGUARD_DO_NOT_USE_THIS_METHOD' has not been declared
-safeguards.h:31:19: error: 'std::SAFEGUARD_DO_NOT_USE_THIS_METHOD' has not been declared
-
---- openttd-1.5.3/src/safeguards.h.orig 2016-02-02 16:21:10.378533175 +0000
-+++ openttd-1.5.3/src/safeguards.h 2016-02-02 16:21:15.269555568 +0000
-@@ -21,6 +21,8 @@
- #ifndef SAFEGUARDS_H
- #define SAFEGUARDS_H
-
-+#include <stdlib.h>
-+
- /* Use MallocT instead. */
- #define malloc SAFEGUARD_DO_NOT_USE_THIS_METHOD
-
diff --git a/packages/games-simulation/openttd/openttd-1.6.0.exheres-0 b/packages/games-simulation/openttd/openttd-1.6.1.exheres-0
index 57c1f07..c1eb37a 100644
--- a/packages/games-simulation/openttd/openttd-1.6.0.exheres-0
+++ b/packages/games-simulation/openttd/openttd-1.6.1.exheres-0
@@ -45,7 +45,6 @@ DEPENDENCIES="
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/compiler-detection.patch
- "${FILES}"/openttd-1.6.0-gcc6.patch
)
DEFAULT_SRC_COMPILE_PARAMS=( VERBOSE=1 )