summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author B. Watson <yalhcru@gmail.com>2012-09-21 06:38:45 +0200
committer Robby Workman <rworkman@slackbuilds.org>2012-09-22 11:39:46 -0500
commit8a92061525b5e777372fb88b8cb0ae2636759de4 (patch)
tree15e8403780c9f5daa2eb1fae3d6ace3f7e91040c
parent994e72589bfe86fda005430e9373494495f4c82a (diff)
downloadslackbuilds-8a92061525b5e777372fb88b8cb0ae2636759de4.tar.gz
slackbuilds-8a92061525b5e777372fb88b8cb0ae2636759de4.tar.xz
games/chocolate-doom: Updated for version 1.7.0.
Build fix for the new binutils Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--games/chocolate-doom/chocolate-doom.SlackBuild7
-rw-r--r--games/chocolate-doom/chocolate-doom.info6
-rw-r--r--games/chocolate-doom/disable_windres.diff12
3 files changed, 21 insertions, 4 deletions
diff --git a/games/chocolate-doom/chocolate-doom.SlackBuild b/games/chocolate-doom/chocolate-doom.SlackBuild
index 682e350e16..3d2aad4792 100644
--- a/games/chocolate-doom/chocolate-doom.SlackBuild
+++ b/games/chocolate-doom/chocolate-doom.SlackBuild
@@ -5,7 +5,7 @@
# Written by B. Watson (yalhcru@gmail.com)
PRGNAM=chocolate-doom
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.7.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -51,6 +51,11 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Grr. Newer binutils includes a windres command, which doesn't seem to work
+# like the actual windows one (configure lacks switches to disable windres)
+patch -p1 < $CWD/disable_windres.diff
+autoreconf -if
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/games/chocolate-doom/chocolate-doom.info b/games/chocolate-doom/chocolate-doom.info
index ab6d53c9c1..e0b809c37f 100644
--- a/games/chocolate-doom/chocolate-doom.info
+++ b/games/chocolate-doom/chocolate-doom.info
@@ -1,8 +1,8 @@
PRGNAM="chocolate-doom"
-VERSION="1.6.0"
+VERSION="1.7.0"
HOMEPAGE="http://www.chocolate-doom.org/"
-DOWNLOAD="http://downloads.sourceforge.net/project/chocolate-doom/chocolate-doom/1.6.0/chocolate-doom-1.6.0.tar.gz"
-MD5SUM="b210e115dda6ea88bfb6c4fe11ade101"
+DOWNLOAD="http://downloads.sourceforge.net/project/chocolate-doom/chocolate-doom/1.7.0/chocolate-doom-1.7.0.tar.gz"
+MD5SUM="dbd4cef1c6810dd00089f1be5a21ffda"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/games/chocolate-doom/disable_windres.diff b/games/chocolate-doom/disable_windres.diff
new file mode 100644
index 0000000000..08c155af28
--- /dev/null
+++ b/games/chocolate-doom/disable_windres.diff
@@ -0,0 +1,12 @@
+diff -Naur chocolate-doom-1.6.0/configure.in chocolate-doom-1.6.0.patched/configure.in
+--- chocolate-doom-1.6.0/configure.in 2011-05-17 19:01:50.000000000 -0400
++++ chocolate-doom-1.6.0.patched/configure.in 2012-09-20 01:32:26.000000000 -0400
+@@ -103,7 +103,7 @@
+ esac
+
+ AM_CONDITIONAL(WINDOWS_CE, $WINDOWS_CE)
+-AM_CONDITIONAL(HAVE_WINDRES, test "$WINDRES" != "")
++AM_CONDITIONAL(HAVE_WINDRES, false)
+ AM_CONDITIONAL(HAVE_PYTHON, $HAVE_PYTHON)
+
+ dnl Automake v1.8.0 is required, please upgrade!