diff options
| author | B. Watson <yalhcru@gmail.com> | 2012-09-21 06:41:11 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2012-09-22 11:39:46 -0500 |
| commit | 4bd9ab40eaf44d5cc160d98d9b74c57dcaf358df (patch) | |
| tree | d881b5a10c492e3c7eaec7b8f9f669c2d9a4e981 | |
| parent | 8a92061525b5e777372fb88b8cb0ae2636759de4 (diff) | |
| download | slackbuilds-4bd9ab40eaf44d5cc160d98d9b74c57dcaf358df.tar.gz | |
games/odamex: Fix for gcc-4.7.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
| -rw-r--r-- | games/odamex/gcc47.diff | 11 | ||||
| -rw-r--r-- | games/odamex/odamex.SlackBuild | 4 |
2 files changed, 14 insertions, 1 deletions
diff --git a/games/odamex/gcc47.diff b/games/odamex/gcc47.diff new file mode 100644 index 0000000000..880f5426b5 --- /dev/null +++ b/games/odamex/gcc47.diff @@ -0,0 +1,11 @@ +diff -Naur odamex-src-0.5.6/odalpapi/net_io.cpp odamex-src-0.5.6.patched/odalpapi/net_io.cpp +--- odamex-src-0.5.6/odalpapi/net_io.cpp 2011-11-04 23:59:42.000000000 -0400 ++++ odamex-src-0.5.6.patched/odalpapi/net_io.cpp 2012-09-20 02:19:30.000000000 -0400 +@@ -27,6 +27,7 @@ + #include <iostream>
+ #include <sstream>
+ #include <cstdio>
++#include <unistd.h>
+ #include <cstdlib>
+ #include <cstring>
+ #include <cstdarg>
diff --git a/games/odamex/odamex.SlackBuild b/games/odamex/odamex.SlackBuild index 9cdd6a5514..49c0d420f3 100644 --- a/games/odamex/odamex.SlackBuild +++ b/games/odamex/odamex.SlackBuild @@ -6,7 +6,7 @@ PRGNAM=odamex VERSION=${VERSION:-0.5.6} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -53,6 +53,8 @@ find . \ sed -i "s/-g -Wall -O2/$SLKCFLAGS/" Makefile +patch -p1 < $CWD/gcc47.diff + # N.B. we want the game to look in /usr/share/games/doom for wad files, # to match the already-existing zdoom and prboom slackbuilds. Makefile # adds the /doom part to RESDIR itself. The patch adds this dir to the |