diff options
-rw-r--r-- | games/bstone/bstone.SlackBuild | 15 | ||||
-rw-r--r-- | games/bstone/bstone.info | 6 | ||||
-rw-r--r-- | games/bstone/bstone.png | bin | 1630 -> 5644 bytes | |||
-rw-r--r-- | games/bstone/datadir.diff | 8 |
4 files changed, 14 insertions, 15 deletions
diff --git a/games/bstone/bstone.SlackBuild b/games/bstone/bstone.SlackBuild index d64d16cdf4..572626244f 100644 --- a/games/bstone/bstone.SlackBuild +++ b/games/bstone/bstone.SlackBuild @@ -6,10 +6,12 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20170807 bkw: update for v1.1.8, use upstream's icon instead of mine. + # 20170621 bkw: fix build on -current PRGNAM=bstone -VERSION=${VERSION:-1.1.7} +VERSION=${VERSION:-1.1.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -55,9 +57,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# fix a missing include, needed for gcc7 -sed -i '1i#include <memory>' bstone_memory_binary_reader.cpp - # look in /usr/share/games/bstone for game data files, not the # directory the executable lives in. the --data_dir option can # still override this. @@ -74,7 +73,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DMAN_INSTALL_DIR=/usr/man \ - -DCMAKE_BUILD_TYPE=Release .. + -DCMAKE_BUILD_TYPE=Release ../src make mkdir -p $PKG/usr/games $PKG/usr/share/games/$PRGNAM @@ -85,15 +84,15 @@ cd build install -oroot -groot -m0644 *.BS1 $PKG/usr/share/games/$PRGNAM cd .. -# man page and .desktop written for this build. icon made from screenshot -# of the game's title screen. +# man page and .desktop written for this build. icon converted from upstream's +# src/sys/win32/bstone_icon.ico. mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps $PKG/usr/man/man6 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png gzip -9c < $CWD/$PRGNAM.6 > $PKG/usr/man/man6/$PRGNAM.6.gz mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.md *.doc bstone_todo.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE README.md *.doc src/bstone_todo.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/games/bstone/bstone.info b/games/bstone/bstone.info index b8a6423077..ca0dd3fd5f 100644 --- a/games/bstone/bstone.info +++ b/games/bstone/bstone.info @@ -1,9 +1,9 @@ PRGNAM="bstone" -VERSION="1.1.7" +VERSION="1.1.8" HOMEPAGE="http://bibendovsky.github.io/bstone/" -DOWNLOAD="https://github.com/bibendovsky/bstone/archive/v1.1.7.tar.gz \ +DOWNLOAD="https://github.com/bibendovsky/bstone/archive/v1.1.8/bstone-1.1.8.tar.gz \ https://archive.org/download/BlakeStoneAliensOfGold/1bs30.zip" -MD5SUM="92aba776c04fe44c66d446f3417efaa3 \ +MD5SUM="d52a903d7a516b97ec4ca156d0a73758 \ a63c88fc5b399ffb5ed42dc215321f36" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/games/bstone/bstone.png b/games/bstone/bstone.png Binary files differindex dec5246ff2..0428e43b1b 100644 --- a/games/bstone/bstone.png +++ b/games/bstone/bstone.png diff --git a/games/bstone/datadir.diff b/games/bstone/datadir.diff index b3dec92c0f..2825740952 100644 --- a/games/bstone/datadir.diff +++ b/games/bstone/datadir.diff @@ -1,7 +1,7 @@ -diff -Naur bstone-1.1.7.orig/3d_main.cpp bstone-1.1.7/3d_main.cpp ---- bstone-1.1.7.orig/3d_main.cpp 2016-04-09 08:21:25.000000000 -0400 -+++ bstone-1.1.7/3d_main.cpp 2016-08-13 21:47:13.965436399 -0400 -@@ -9138,20 +9138,7 @@ +diff -Naur bstone-1.1.8/src/3d_main.cpp bstone-1.1.8.patched/src/3d_main.cpp +--- bstone-1.1.8/src/3d_main.cpp 2017-08-06 06:52:35.000000000 -0400 ++++ bstone-1.1.8.patched/src/3d_main.cpp 2017-08-07 12:33:38.268538355 -0400 +@@ -9658,20 +9658,7 @@ const std::string& get_default_data_dir() { |