summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author B. Watson <yalhcru@gmail.com>2016-08-07 02:34:06 -0400
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2016-08-13 07:22:55 +0700
commit867b39f1ca7d78e2c5adb7674ad1fb70fa0a4c72 (patch)
tree79401bf05ccf30727c74054704f2fec4e229c2ec
parent6a35a0d3b991d6bdedbe91b4d632cd97624b3540 (diff)
downloadslackbuilds-867b39f1ca7d78e2c5adb7674ad1fb70fa0a4c72.tar.gz
slackbuilds-867b39f1ca7d78e2c5adb7674ad1fb70fa0a4c72.tar.xz
games/xu4: Update for 14.2, bump BUILD.
-rw-r--r--games/xu4/README3
-rw-r--r--games/xu4/README-SBo.txt10
-rw-r--r--games/xu4/xu4.SlackBuild6
3 files changed, 17 insertions, 2 deletions
diff --git a/games/xu4/README b/games/xu4/README
index 4da2140d63..79217a2373 100644
--- a/games/xu4/README
+++ b/games/xu4/README
@@ -8,6 +8,9 @@ are looking for a game with modern gameplay and graphics, this is not
it -- yet. New features that improve the gameplay and keep with the
spirit of the original game will be added.
+Note for users upgrading from Slackware 14.1 to 14.2: if the game won't
+start after the upgrade, see README-SBo.txt for the solution.
+
This package can be built with optional extras. See README-SBo.txt
for details.
diff --git a/games/xu4/README-SBo.txt b/games/xu4/README-SBo.txt
index 379033bc11..480d3aff27 100644
--- a/games/xu4/README-SBo.txt
+++ b/games/xu4/README-SBo.txt
@@ -1,4 +1,12 @@
-Optional stuff: Music, enhanced graphics, and PDF manuals.
+Notes and optional stuff: Music, enhanced graphics, and PDF manuals.
+
+Slackware Upgrade Note
+----------------------
+If you upgraded from 14.1 to 14.2, your old ~/.xu4/xu4rc needs to be
+edited, to disable XML validation (otherwise the game won't start).
+Edit the file manually, or use this:
+
+sed -i '/validateXml/s,1,0,' ~/.xu4/xu4rc
Music
-----
diff --git a/games/xu4/xu4.SlackBuild b/games/xu4/xu4.SlackBuild
index f58307f7d9..5650fd58be 100644
--- a/games/xu4/xu4.SlackBuild
+++ b/games/xu4/xu4.SlackBuild
@@ -8,7 +8,7 @@
PRGNAM=xu4
VERSION=${VERSION:-20130612_svn}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -69,6 +69,10 @@ sed -i -e "s,/usr/lib,$LIBDIR," src/u4file.cpp
# Stop u4 from writing border.png in the current dir (it never *reads* it!)
sed -i -e '/border\.png/s,^,//,' src/imagemgr.cpp
+# The libxml2 in Slack 14.2 is pickier than the one in 14.1, and fails to
+# validate the game's XML files. So:
+sed -i '/#define *DEFAULT_VALIDATE_XML/s,1,0,' src/settings.h
+
# The -DNPERF stops u4 from creating a debug/ in the current dir.
make -C src DEBUGCXXFLAGS="-DNPERF $SLKCFLAGS" prefix=/usr libdir=$PKGLIBDIR
make -C src install prefix=$PKG/usr libdir=$PKGLIBDIR