summaryrefslogtreecommitdiff
path: root/games/wesnoth/wesnoth.SlackBuild
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackware-id.org>2013-06-03 12:39:06 -0500
committerRobby Workman <rworkman@slackbuilds.org>2013-06-04 00:11:32 -0500
commitf17ecd0783d08d658be2afb38a35ae228d7423ac (patch)
tree09180ee0b8b498873b7291f8f30f8635fb20d92a /games/wesnoth/wesnoth.SlackBuild
parent671f3b1661020901c29212ffe2884bce60e24428 (diff)
downloadslackbuilds-f17ecd0783d08d658be2afb38a35ae228d7423ac.tar.gz
games/wesnoth: Fix segfault using upstream patch
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'games/wesnoth/wesnoth.SlackBuild')
-rw-r--r--games/wesnoth/wesnoth.SlackBuild11
1 files changed, 10 insertions, 1 deletions
diff --git a/games/wesnoth/wesnoth.SlackBuild b/games/wesnoth/wesnoth.SlackBuild
index e216827b35..f5acbe9dba 100644
--- a/games/wesnoth/wesnoth.SlackBuild
+++ b/games/wesnoth/wesnoth.SlackBuild
@@ -27,7 +27,7 @@
PRGNAM=wesnoth
VERSION=${VERSION:-1.10.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -88,6 +88,15 @@ find . \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
+# Fix build problem on future GCC 4.8.0
+sed -i 's/-Werror//' CMakeLists.txt
+
+# Fix segfault
+# Upstream bug report and patch
+# https://gna.org/bugs/index.php?20742
+# https://github.com/wesnoth/wesnoth-old/commit/bbd7f6.patch
+patch -p1 < $CWD/fix-segfault.patch
+
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \