summaryrefslogtreecommitdiffstats
path: root/games
diff options
context:
space:
mode:
Diffstat (limited to 'games')
-rw-r--r--games/0ad-data/0ad-data.SlackBuild2
-rw-r--r--games/0ad-data/0ad-data.info6
-rw-r--r--games/0ad/0ad.SlackBuild6
-rw-r--r--games/0ad/0ad.info4
-rw-r--r--games/0ad/rust-1.50.0.patch40
-rw-r--r--games/Scorched3D/Scorched3D.SlackBuild43
-rw-r--r--games/Scorched3D/Scorched3D.info2
-rw-r--r--games/Scorched3D/patches/scorched3d-fix-hang-on-fast-machines.patch53
-rw-r--r--games/Scorched3D/patches/scorched3d-freetype-buildfix.patch36
-rw-r--r--games/Scorched3D/patches/scorched3d-help.patch12
-rw-r--r--games/Scorched3D/patches/scorched3d-returntype.patch (renamed from games/Scorched3D/gcc.patch)4
-rw-r--r--games/Scorched3D/patches/scorched3d-wx3.0.patch170
-rw-r--r--games/adl/adl.SlackBuild10
-rw-r--r--games/adl/adl.info4
-rw-r--r--games/advancemame/README6
-rw-r--r--games/advancemame/advancemame.SlackBuild16
-rw-r--r--games/advancemame/compilefix.diff24
-rw-r--r--games/advancescan/advancescan.SlackBuild16
-rw-r--r--games/ags/ags.SlackBuild2
-rw-r--r--games/ags/ags.info6
-rw-r--r--games/aklabeth/aklabeth.SlackBuild10
-rw-r--r--games/aklabeth/aklabeth.info4
-rw-r--r--games/alephone/README6
-rw-r--r--games/alephone/alephone.SlackBuild6
-rw-r--r--games/alephone/alephone.info6
-rw-r--r--games/an/README4
-rw-r--r--games/an/an.SlackBuild10
-rw-r--r--games/an/an.info2
-rw-r--r--games/an/slack-desc4
-rw-r--r--games/asteroidsinfinity/asteroidsinfinity.SlackBuild10
-rw-r--r--games/atanks/atanks.SlackBuild7
-rw-r--r--games/atanks/atanks.info6
-rw-r--r--games/atari++/atari++.SlackBuild6
-rw-r--r--games/atari++/atari++.info6
-rw-r--r--games/atari800/atari800.SlackBuild3
-rw-r--r--games/atari800_roms/atari800_roms.SlackBuild3
-rw-r--r--games/atari800_roms/atari800_roms.info4
-rw-r--r--games/bastet/bastet.SlackBuild15
-rw-r--r--games/bastet/bastet.info2
-rw-r--r--games/bloodcm/README4
-rw-r--r--games/bloodcm/bloodcm.SlackBuild3
-rw-r--r--games/bloodcm/bloodcm.info2
-rw-r--r--games/brickout/README2
-rw-r--r--games/brickout/brickout.SlackBuild10
-rw-r--r--games/bstone/README11
-rw-r--r--games/bstone/blake_stone_source_code_license.txt53
-rw-r--r--games/bstone/bstone.SlackBuild35
-rw-r--r--games/bstone/bstone.desktop5
-rw-r--r--games/bstone/bstone.info8
-rw-r--r--games/bstone/datadir.diff19
-rw-r--r--games/bstone/slack-desc4
-rw-r--r--games/burgerspace/README3
-rw-r--r--games/burgerspace/burgerspace.SlackBuild12
-rw-r--r--games/burgerspace/burgerspace.info6
-rw-r--r--games/ceferino/ceferino.SlackBuild12
-rw-r--r--games/ceferino/ceferino.info4
-rw-r--r--games/chexquest3/chexquest3.SlackBuild30
-rw-r--r--games/chocolate-doom/chocolate-doom.SlackBuild16
-rw-r--r--games/chocolate-doom/chocolate-doom.info2
-rw-r--r--games/chocolate_duke3D/README2
-rw-r--r--games/chocolate_duke3D/chocolate_duke3D.SlackBuild14
-rw-r--r--games/circuslinux/README2
-rw-r--r--games/circuslinux/circuslinux.SlackBuild10
-rw-r--r--games/clonekeen/clonekeen.SlackBuild12
-rw-r--r--games/clonekeen/clonekeen.info4
-rw-r--r--games/colem/colem.SlackBuild8
-rw-r--r--games/colem/colem.info8
-rw-r--r--games/cosmic_assault/cosmic_assault.SlackBuild10
-rw-r--r--games/cosmosmash/cosmosmash.SlackBuild12
-rw-r--r--games/cosmosmash/cosmosmash.info6
-rw-r--r--games/darkplaces/darkplaces.SlackBuild3
-rw-r--r--games/darkplaces/gcc11.patch89
-rw-r--r--games/defendguin/README2
-rw-r--r--games/defendguin/defendguin.SlackBuild10
-rw-r--r--games/doom_shareware_data/README7
-rw-r--r--games/doom_shareware_data/doom_shareware_data.SlackBuild18
-rw-r--r--games/doom_shareware_data/doom_shareware_data.info4
-rw-r--r--games/doomretro/doomretro.SlackBuild24
-rw-r--r--games/doomretro/doomretro.info6
-rw-r--r--games/doomretro/doomretro.sh51
-rw-r--r--games/dunelegacy/README21
-rw-r--r--games/dunelegacy/dunelegacy.SlackBuild10
-rw-r--r--games/dunelegacy/dunelegacy.info2
-rw-r--r--games/dunelegacy/slack-desc4
-rw-r--r--games/dungeon/dungeon.SlackBuild10
-rw-r--r--games/enigma/enigma.SlackBuild3
-rw-r--r--games/eureka/README2
-rw-r--r--games/eureka/eureka.SlackBuild3
-rw-r--r--games/eureka/eureka.info2
-rw-r--r--games/extremetuxracer/extremetuxracer.SlackBuild24
-rw-r--r--games/extremetuxracer/extremetuxracer.info6
-rw-r--r--games/fizmo/fizmo.SlackBuild10
-rw-r--r--games/fizmo/fizmo.info2
-rw-r--r--games/flare-game/flare-game.SlackBuild2
-rw-r--r--games/flare-game/flare-game.info6
-rw-r--r--games/flare/flare.SlackBuild2
-rw-r--r--games/flare/flare.info8
-rw-r--r--games/fortune-dune/fortune-dune.SlackBuild21
-rw-r--r--games/fortune-farscape/fortune-farscape.SlackBuild3
-rw-r--r--games/fortune-futurama/fortune-futurama.SlackBuild3
-rw-r--r--games/fortune-game_of_thrones/fortune-game_of_thrones.SlackBuild5
-rw-r--r--games/fortune-game_of_thrones/fortune-game_of_thrones.info8
-rw-r--r--games/fortune-noobfarm/fortune-noobfarm.SlackBuild3
-rw-r--r--games/fortune-slackware/fortune-slackware.SlackBuild3
-rw-r--r--games/fortune-slackware/fortune-slackware.info2
-rw-r--r--games/fortune-starwars/fortune-starwars.SlackBuild3
-rw-r--r--games/fortune_doctor_who/fortune_doctor_who.SlackBuild3
-rw-r--r--games/fortune_doctor_who/fortune_doctor_who.info14
-rw-r--r--games/fortune_firefly/README32
-rw-r--r--games/fortune_firefly/fortune_firefly.SlackBuild3
-rw-r--r--games/fortune_firefly/slack-desc2
-rw-r--r--games/freeblocks/freeblocks.SlackBuild26
-rw-r--r--games/freedoom/freedoom.SlackBuild3
-rw-r--r--games/frotz/README17
-rw-r--r--games/frotz/doinst.sh6
-rw-r--r--games/frotz/frotz.SlackBuild64
-rw-r--r--games/frotz/frotz.info6
-rw-r--r--games/frotz/sfrotz.memcorrupt.diff19
-rw-r--r--games/frotz/slack-desc6
-rw-r--r--games/frotz/xfrotz.desktop16
-rw-r--r--games/frozen-bubble/frozen-bubble-mksrctarball.sh16
-rw-r--r--games/frozen-bubble/frozen-bubble.SlackBuild28
-rw-r--r--games/frozen-bubble/frozen-bubble.info6
-rw-r--r--games/glbsp/README16
-rw-r--r--games/glbsp/doinst.sh5
-rw-r--r--games/glbsp/glbsp.SlackBuild43
-rw-r--r--games/glbsp/glbsp.info4
-rw-r--r--games/glbsp/icons/glbspx_128x128x32.pngbin0 -> 13370 bytes
-rw-r--r--games/glbsp/icons/glbspx_16x16x32.pngbin0 -> 756 bytes
-rw-r--r--games/glbsp/icons/glbspx_32x32x32.pngbin0 -> 2053 bytes
-rw-r--r--games/glbsp/icons/glbspx_48x48x32.pngbin0 -> 3288 bytes
-rw-r--r--games/glbsp/nodeview.desktop8
-rw-r--r--games/glbsp/slack-desc6
-rw-r--r--games/gnugo/gnugo.SlackBuild2
-rw-r--r--games/gottet/README4
-rw-r--r--games/gottet/gottet.SlackBuild43
-rw-r--r--games/gottet/gottet.info6
-rw-r--r--games/gottet/slack-desc6
-rw-r--r--games/gtklife/README2
-rw-r--r--games/gtklife/doinst.sh6
-rw-r--r--games/gtklife/gtklife.SlackBuild32
-rw-r--r--games/gtklife/gtklife.desktop2
-rw-r--r--games/gzdoom-legacy/README2
-rw-r--r--games/gzdoom-legacy/README_versions.txt3
-rw-r--r--games/gzdoom-legacy/compilefix.1.8.09.diff143
-rw-r--r--games/gzdoom-legacy/compilefix.1.9.1.diff12
-rw-r--r--games/gzdoom-legacy/compilefix.2.4.0.diff23
-rw-r--r--games/gzdoom-legacy/gzdoom-legacy.SlackBuild9
-rw-r--r--games/gzdoom-legacy/slack-desc2
-rw-r--r--games/gzdoom/compilefix.4.5.0.diff12
-rw-r--r--games/gzdoom/fix_zipdir.diff11
-rw-r--r--games/gzdoom/gzdoom.SlackBuild15
-rw-r--r--games/gzdoom/gzdoom.info6
-rw-r--r--games/gzdoom/gzdoom.pngbin1618 -> 0 bytes
-rw-r--r--games/hedgewars/fpc-3.2.0.patch20
-rw-r--r--games/hedgewars/hedgewars.SlackBuild7
-rw-r--r--games/hedgewars/include.qpainterpath.diff21
-rw-r--r--games/lgogdownloader/lgogdownloader.SlackBuild2
-rw-r--r--games/lgogdownloader/lgogdownloader.info6
-rw-r--r--games/marathon-data/marathon-data.SlackBuild11
-rw-r--r--games/marathon-data/marathon-data.info6
-rw-r--r--games/marathon-infinity-data/marathon-infinity-data.SlackBuild11
-rw-r--r--games/marathon-infinity-data/marathon-infinity-data.info6
-rw-r--r--games/marathon2-data/marathon2-data.SlackBuild11
-rw-r--r--games/marathon2-data/marathon2-data.info6
-rw-r--r--games/minetest/gcc11.patch21
-rw-r--r--games/minetest/minetest.SlackBuild4
-rw-r--r--games/minetest/minetest.info6
-rw-r--r--games/notpacman/notpacman.SlackBuild3
-rw-r--r--games/notpacman/notpacman.info2
-rw-r--r--games/nottetris2/nottetris2.SlackBuild3
-rw-r--r--games/nottetris2/nottetris2.info2
-rw-r--r--games/pingus/patches/missing-header.patch (renamed from games/pingus/missing-header.patch)0
-rw-r--r--games/pingus/patches/pingus-0.7.6-gcc470-udl.patch22
-rw-r--r--games/pingus/patches/pingus-boost-1.69.patch380
-rw-r--r--games/pingus/patches/scons-python3.patch19
-rw-r--r--games/pingus/pingus.SlackBuild32
-rw-r--r--games/typhoon_2001/README4
-rw-r--r--games/typhoon_2001/doinst.sh6
-rw-r--r--games/typhoon_2001/slack-desc2
-rw-r--r--games/typhoon_2001/typhoon_2001.SlackBuild39
-rw-r--r--games/typhoon_2001/typhoon_2001.desktop4
-rw-r--r--games/warzone2100/warzone2100.SlackBuild2
-rw-r--r--games/warzone2100/warzone2100.info8
-rw-r--r--games/widelands/doinst.sh6
-rw-r--r--games/widelands/widelands-1.0-boost-1.77.patch16
-rw-r--r--games/widelands/widelands.SlackBuild45
-rw-r--r--games/widelands/widelands.desktop10
-rw-r--r--games/widelands/widelands.info8
-rw-r--r--games/xspacewarp/README8
-rw-r--r--games/xspacewarp/XSpacewarp267
-rw-r--r--games/xspacewarp/doinst.sh6
-rw-r--r--games/xspacewarp/slack-desc2
-rw-r--r--games/xspacewarp/winclose.diff78
-rw-r--r--games/xspacewarp/xspacewarp.SlackBuild72
-rw-r--r--games/xspacewarp/xspacewarp.desktop3
-rw-r--r--games/xspacewarp/xspacewarp.man12
-rw-r--r--games/xu4/README8
-rw-r--r--games/xu4/disable_alt_x.diff24
-rw-r--r--games/xu4/doinst.sh6
-rw-r--r--games/xu4/icons/128.pngbin0 -> 11436 bytes
-rw-r--r--games/xu4/icons/16.pngbin0 -> 1513 bytes
-rw-r--r--games/xu4/icons/32.pngbin0 -> 2649 bytes
-rw-r--r--games/xu4/icons/48.pngbin0 -> 4643 bytes
-rw-r--r--games/xu4/icons/64.pngbin0 -> 6928 bytes
-rw-r--r--games/xu4/slack-desc6
-rw-r--r--games/xu4/u4.6 (renamed from games/xu4/u4.1)2
-rw-r--r--games/xu4/u4.desktop2
-rw-r--r--games/xu4/xu4.SlackBuild48
-rw-r--r--games/xu4/xu4.info2
-rw-r--r--games/yae/README2
-rw-r--r--games/yae/doinst.sh6
-rw-r--r--games/yae/icons/128.pngbin0 -> 14134 bytes
-rw-r--r--games/yae/icons/16.pngbin0 -> 1161 bytes
-rw-r--r--games/yae/icons/32.pngbin0 -> 1914 bytes
-rw-r--r--games/yae/icons/48.pngbin0 -> 3306 bytes
-rw-r--r--games/yae/icons/64.pngbin0 -> 4852 bytes
-rw-r--r--games/yae/patches/allow_x_window_close.diff33
-rw-r--r--games/yae/yae.171
-rw-r--r--games/yae/yae.SlackBuild36
-rw-r--r--games/yae/yae.desktop4
-rw-r--r--games/yae/yae.pngbin17291 -> 0 bytes
-rw-r--r--games/yae/yae.pod27
-rw-r--r--games/yahtzee/doinst.sh9
-rw-r--r--games/yahtzee/icons/128.png (renamed from games/yahtzee/yahtzee.png)bin18285 -> 18285 bytes
-rw-r--r--games/yahtzee/icons/16.pngbin0 -> 701 bytes
-rw-r--r--games/yahtzee/icons/32.pngbin0 -> 1914 bytes
-rw-r--r--games/yahtzee/icons/48.pngbin0 -> 3682 bytes
-rw-r--r--games/yahtzee/icons/64.pngbin0 -> 5725 bytes
-rw-r--r--games/yahtzee/yahtzee.SlackBuild25
-rw-r--r--games/yahtzee/yahtzee.desktop2
-rw-r--r--games/yahtzee/yahtzee.info4
-rw-r--r--games/yar/yar.SlackBuild25
-rw-r--r--games/yar/yar.info4
-rw-r--r--games/z26/z26.SlackBuild10
-rw-r--r--games/z26v3/z26v3.SlackBuild3
-rw-r--r--games/z26v3/z26v3.info4
-rw-r--r--games/zdbsp/zdbsp.62
-rw-r--r--games/zdbsp/zdbsp.SlackBuild13
-rw-r--r--games/zdbsp/zdbsp.info4
-rw-r--r--games/zdoom/README17
-rw-r--r--games/zdoom/doinst.sh5
-rw-r--r--games/zdoom/icons/128.pngbin0 -> 25576 bytes
-rw-r--r--games/zdoom/icons/16.pngbin0 -> 764 bytes
-rw-r--r--games/zdoom/icons/32.pngbin0 -> 2278 bytes
-rw-r--r--games/zdoom/icons/48.pngbin0 -> 4817 bytes
-rw-r--r--games/zdoom/icons/64.pngbin0 -> 7415 bytes
-rw-r--r--games/zdoom/zdoom.SlackBuild34
-rw-r--r--games/zdoom/zdoom.desktop2
-rw-r--r--games/zdoom/zdoom.pngbin1738 -> 0 bytes
-rw-r--r--games/zennode/README16
-rw-r--r--games/zennode/slack-desc14
-rw-r--r--games/zennode/zennode-tools.688
-rw-r--r--games/zennode/zennode-tools.rst74
-rw-r--r--games/zennode/zennode.64
-rw-r--r--games/zennode/zennode.SlackBuild38
-rw-r--r--games/zennode/zennode.info4
-rw-r--r--games/zoom/README18
-rw-r--r--games/zoom/doinst.sh5
-rw-r--r--games/zoom/icons/128.png (renamed from games/zoom/zoom.png)bin20793 -> 20793 bytes
-rw-r--r--games/zoom/icons/16.pngbin0 -> 744 bytes
-rw-r--r--games/zoom/icons/256.pngbin0 -> 67911 bytes
-rw-r--r--games/zoom/icons/32.pngbin0 -> 1946 bytes
-rw-r--r--games/zoom/icons/48.pngbin0 -> 4980 bytes
-rw-r--r--games/zoom/icons/64.pngbin0 -> 7558 bytes
-rw-r--r--games/zoom/no_inline.diff120
-rw-r--r--games/zoom/patches/acinclude.patch9
-rw-r--r--games/zoom/patches/avoid-v6-set-colours-crash.patch18
-rw-r--r--games/zoom/patches/config_xft.diff (renamed from games/zoom/config_xft.diff)0
-rw-r--r--games/zoom/patches/enable-antialiasing.patch15
-rw-r--r--games/zoom/patches/remove_rice.diff (renamed from games/zoom/remove_rice.diff)0
-rw-r--r--games/zoom/patches/restore-return.patch33
-rw-r--r--games/zoom/patches/series8
-rw-r--r--games/zoom/patches/static-inline.patch45
-rw-r--r--games/zoom/patches/zoomrc_in_etc.diff12
-rw-r--r--games/zoom/slack-desc8
-rw-r--r--games/zoom/zoom.172
-rw-r--r--games/zoom/zoom.SlackBuild80
-rw-r--r--games/zoom/zoom.desktop2
-rw-r--r--games/zoom/zoom.info4
-rw-r--r--games/zork/README11
-rw-r--r--games/zork/desktop/zork1.desktop2
-rw-r--r--games/zork/desktop/zork2.desktop2
-rw-r--r--games/zork/desktop/zork3.desktop2
-rw-r--r--games/zork/desktop/ztuu.desktop2
-rw-r--r--games/zork/icons/32.pngbin0 -> 2776 bytes
-rw-r--r--games/zork/icons/48.pngbin0 -> 5547 bytes
-rw-r--r--games/zork/icons/64.pngbin0 -> 1028 bytes
-rw-r--r--games/zork/mkicons.sh26
-rw-r--r--games/zork/zork.SlackBuild65
-rw-r--r--games/zork/zork.info2
-rw-r--r--games/zork/zork.pngbin423 -> 0 bytes
-rw-r--r--games/zork/zorkwrapper.sh (renamed from games/zork/zork.sh)0
-rw-r--r--games/zork/zorkwrapper.sh.6103
-rw-r--r--games/zork/zorkwrapper.sh.rst84
-rw-r--r--games/ztools/README6
-rw-r--r--games/ztools/ztools.SlackBuild25
-rw-r--r--games/ztools/ztools.info8
298 files changed, 3000 insertions, 1641 deletions
diff --git a/games/0ad-data/0ad-data.SlackBuild b/games/0ad-data/0ad-data.SlackBuild
index 3deeab2311..c1f57312e3 100644
--- a/games/0ad-data/0ad-data.SlackBuild
+++ b/games/0ad-data/0ad-data.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=0ad-data
DATANAM=0ad
-VERSION=${VERSION:-0.0.24b}
+VERSION=${VERSION:-0.0.25}
RELEASE=${RELEASE:-alpha}
ARCH=noarch
BUILD=${BUILD:-1}
diff --git a/games/0ad-data/0ad-data.info b/games/0ad-data/0ad-data.info
index a3103e41c1..614962f3a1 100644
--- a/games/0ad-data/0ad-data.info
+++ b/games/0ad-data/0ad-data.info
@@ -1,8 +1,8 @@
PRGNAM="0ad-data"
-VERSION="0.0.24b"
+VERSION="0.0.25"
HOMEPAGE="https://play0ad.com/"
-DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.24b-alpha-unix-data.tar.xz"
-MD5SUM="69db2a228f1802a2e8f360bed4d21036"
+DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.25-alpha-unix-data.tar.xz"
+MD5SUM="475bcfd1c61b0a4a459e351a3cf5b489"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/games/0ad/0ad.SlackBuild b/games/0ad/0ad.SlackBuild
index 4b4544340e..7ebbab8d82 100644
--- a/games/0ad/0ad.SlackBuild
+++ b/games/0ad/0ad.SlackBuild
@@ -27,9 +27,9 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=0ad
-VERSION=${VERSION:-0.0.24b}
+VERSION=${VERSION:-0.0.25}
RELEASE=${RELEASE:-alpha}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -103,8 +103,6 @@ sed -i '/ps\/Profiler2/a #include <stack>' source/ps/Profiler2GPU.cpp || exit 1
# have a root check, let's disable it.
patch -p1 < $CWD/disable-root-check.patch
-echo "patch -p1 < $CWD/rust-1.50.0.patch" >> libraries/source/spidermonkey/patch.sh
-
build/workspaces/update-workspaces.sh \
--without-pch \
--bindir=/usr/games \
diff --git a/games/0ad/0ad.info b/games/0ad/0ad.info
index ec46e6bed0..29ba3a3751 100644
--- a/games/0ad/0ad.info
+++ b/games/0ad/0ad.info
@@ -1,8 +1,8 @@
PRGNAM="0ad"
VERSION="0.0.24b"
HOMEPAGE="https://play0ad.com/"
-DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.24b-alpha-unix-build.tar.xz"
-MD5SUM="c9d34029fe95d515a5284508cc1d646c"
+DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.25-alpha-unix-build.tar.xz"
+MD5SUM="bb12aeb3276bdce614bd47a268058f31"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="0ad-data enet fmt gloox miniupnpc"
diff --git a/games/0ad/rust-1.50.0.patch b/games/0ad/rust-1.50.0.patch
deleted file mode 100644
index 1652884065..0000000000
--- a/games/0ad/rust-1.50.0.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur mozjs-78.6.0.orig/.cargo/config.in mozjs-78.6.0/.cargo/config.in
---- mozjs-78.6.0.orig/.cargo/config.in 2020-11-28 17:33:01.000000000 +0100
-+++ mozjs-78.6.0/.cargo/config.in 2021-02-26 08:45:50.995837000 +0100
-@@ -3,9 +3,9 @@
- # Please do not edit.
-
- [source."https://github.com/shravanrn/nix/"]
--branch = "r0.13.1"
- git = "https://github.com/shravanrn/nix/"
- replace-with = "vendored-sources"
-+rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-
- [source."https://github.com/mozilla/rkv"]
- git = "https://github.com/mozilla/rkv"
-diff -Naur mozjs-78.6.0.orig/Cargo.lock mozjs-78.6.0/Cargo.lock
---- mozjs-78.6.0.orig/Cargo.lock 2020-11-28 17:33:01.000000000 +0100
-+++ mozjs-78.6.0/Cargo.lock 2021-02-26 08:47:06.265837000 +0100
-@@ -3200,7 +3200,7 @@
- [[package]]
- name = "nix"
- version = "0.13.1"
--source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-+source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
- dependencies = [
- "bitflags",
- "cc",
-diff -Naur mozjs-78.6.0.orig/Cargo.toml mozjs-78.6.0/Cargo.toml
---- mozjs-78.6.0.orig/Cargo.toml 2020-11-28 17:34:26.000000000 +0100
-+++ mozjs-78.6.0/Cargo.toml 2021-02-26 08:48:06.663837000 +0100
-@@ -60,8 +60,8 @@
- [patch.crates-io]
- packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
- rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
--nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
--spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
-+nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
-+spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu4" }
- # failure's backtrace feature might break our builds, see bug 1608157.
- failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
- failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
diff --git a/games/Scorched3D/Scorched3D.SlackBuild b/games/Scorched3D/Scorched3D.SlackBuild
index a36bc8cd95..b714c53e65 100644
--- a/games/Scorched3D/Scorched3D.SlackBuild
+++ b/games/Scorched3D/Scorched3D.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for Scorched3D
-# Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2021 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -11,22 +11,22 @@
# 1. Redistributions of this script must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=Scorched3D
VERSION=${VERSION:-44}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -50,8 +50,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -81,7 +81,20 @@ 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 {} \;
-patch -p1 < $CWD/gcc.patch
+# Apply patches from Fedora
+
+# Fix race condition on fast machines
+patch -p1 -i $CWD/patches/scorched3d-fix-hang-on-fast-machines.patch
+
+# Use xdg-open instead of firefox to open help
+patch -p1 -i $CWD/patches/scorched3d-help.patch
+
+# Fix compatibility with wxGTK3
+patch -p1 -i $CWD/patches/scorched3d-wx3.0.patch
+
+# Fix build issues
+patch -p0 -i $CWD/patches/scorched3d-returntype.patch
+patch -p1 -i $CWD/patches/scorched3d-freetype-buildfix.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/games/Scorched3D/Scorched3D.info b/games/Scorched3D/Scorched3D.info
index 578d13e264..e0962b8dbd 100644
--- a/games/Scorched3D/Scorched3D.info
+++ b/games/Scorched3D/Scorched3D.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/scorched3d/Scorched3D-44-src.tar.gz"
MD5SUM="c395d54a7a43cf91166d2cc0f7dec83e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="freealut wxPython"
+REQUIRES="freealut wxGTK3"
MAINTAINER="Heinz Wiesinger"
EMAIL="pprkut@slackbuilds.org"
diff --git a/games/Scorched3D/patches/scorched3d-fix-hang-on-fast-machines.patch b/games/Scorched3D/patches/scorched3d-fix-hang-on-fast-machines.patch
new file mode 100644
index 0000000000..4773081b6f
--- /dev/null
+++ b/games/Scorched3D/patches/scorched3d-fix-hang-on-fast-machines.patch
@@ -0,0 +1,53 @@
+diff -up scorched/src/common/coms/ComsLoadLevelMessage.cpp~ scorched/src/common/coms/ComsLoadLevelMessage.cpp
+--- scorched/src/common/coms/ComsLoadLevelMessage.cpp~ 2014-08-01 18:47:31.000000000 +0200
++++ scorched/src/common/coms/ComsLoadLevelMessage.cpp 2020-08-13 21:33:59.895250469 +0200
+@@ -108,6 +108,49 @@ bool ComsLoadLevelMessage::loadState(Sco
+
+ bool ComsLoadLevelMessage::loadTanks(ScorchedContext &context)
+ {
++ /*
++ * There is a timing bug which shows on really fast machines
++ * where the client starts talking to the server before the
++ * server initial setup is done.
++ * In sofar as I have managed to debug this, the following
++ * happens on slower machines, aka the GOOD case:
++ *
++ * Server TankAddSimAction::invokeAction() new Tank "(Bot) Fred"
++ * Server TankAddSimAction::invokeAction() new Tank "(Bot) Ted"
++ * Server TankAddSimAction::invokeAction() new Tank "Player 1"
++ * Server TankAddSimAction::invokeAction() new Tank "Spectator"
++ * Client TankAddSimAction::invokeAction() new Tank "(Bot) Fred"
++ * Client TankAddSimAction::invokeAction() new Tank "(Bot) Ted"
++ * Client TankAddSimAction::invokeAction() new Tank "Player 1"
++ * Client TankAddSimAction::invokeAction() new Tank "Spectator"
++ *
++ * Note the server internally creates all tanks before the
++ * client does and thus before the client starts sending
++ * messages related to these tanks to the server.
++ *
++ * On a fast enough system (i7-10610U) the following order
++ * has been observed instead:
++ *
++ * Server TankAddSimAction::invokeAction() new Tank "(Bot) Fred"
++ * Server TankAddSimAction::invokeAction() new Tank "(Bot) Ted"
++ * Client TankAddSimAction::invokeAction() new Tank "(Bot) Fred"
++ * Client TankAddSimAction::invokeAction() new Tank "(Bot) Ted"
++ * Client TankAddSimAction::invokeAction() new Tank "Player 1"
++ * Client TankAddSimAction::invokeAction() new Tank "Spectator"
++ * Server TankAddSimAction::invokeAction() new Tank "Player 1"
++ * Server TankAddSimAction::invokeAction() new Tank "Spectator"
++ *
++ * Note the server creates the "Player 1" and "Spectator"
++ * tanks after the client, this causes the server to ignore
++ * some initial messages from the client related to these
++ * tanks, after which things get stuck, breaking non-networked
++ * games on fast machines.
++ *
++ * The sleep below is an ugly but effective workaround for this
++ * issue.
++ */
++ SDL_Delay(100);
++
+ NetBufferReader reader(tanksBuffer_);
+
+ // Add any new tanks
diff --git a/games/Scorched3D/patches/scorched3d-freetype-buildfix.patch b/games/Scorched3D/patches/scorched3d-freetype-buildfix.patch
new file mode 100644
index 0000000000..f18fa8c1f6
--- /dev/null
+++ b/games/Scorched3D/patches/scorched3d-freetype-buildfix.patch
@@ -0,0 +1,36 @@
+diff -up scorched/src/launcher/wxdialogs/TrueTypeFont.h~ scorched/src/launcher/wxdialogs/TrueTypeFont.h
+--- scorched/src/launcher/wxdialogs/TrueTypeFont.h~ 2014-08-01 18:47:32.000000000 +0200
++++ scorched/src/launcher/wxdialogs/TrueTypeFont.h 2014-08-29 14:04:55.726042013 +0200
+@@ -25,10 +25,10 @@
+ #include <wx/image.h>
+ #include <ft2build.h>
+ #include <string>
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/fttrigon.h>
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
++#include FT_TRIGONOMETRY_H
+
+ class TrueTypeFont
+ {
+diff -up scorched/src/client/GLEXT/GLFont2dFreeType.h~ scorched/src/client/GLEXT/GLFont2dFreeType.h
+--- scorched/src/client/GLEXT/GLFont2dFreeType.h~ 2014-08-01 18:47:31.000000000 +0200
++++ scorched/src/client/GLEXT/GLFont2dFreeType.h 2014-08-29 14:08:10.327083878 +0200
+@@ -23,10 +23,10 @@
+
+ #include <GLEXT/GLFont2dStorage.h>
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/fttrigon.h>
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
++#include FT_TRIGONOMETRY_H
+ #include <string>
+
+ class GLFont2dFreeType
diff --git a/games/Scorched3D/patches/scorched3d-help.patch b/games/Scorched3D/patches/scorched3d-help.patch
new file mode 100644
index 0000000000..4da81a9a53
--- /dev/null
+++ b/games/Scorched3D/patches/scorched3d-help.patch
@@ -0,0 +1,12 @@
+diff -up scorched/src/common/common/DefinesScorched.cpp.orig scorched/src/common/common/DefinesScorched.cpp
+--- scorched/src/common/common/DefinesScorched.cpp.orig 2009-02-15 15:11:18.000000000 +0100
++++ scorched/src/common/common/DefinesScorched.cpp 2009-02-16 14:28:53.000000000 +0100
+@@ -58,7 +58,7 @@ void S3D::showURL(const std::string &url
+ std::string buffer = S3D::formatStringBuffer("open %s", url.c_str());
+ system(buffer.c_str());
+ #else
+- std::string buffer = S3D::formatStringBuffer("firefox %s", url.c_str());
++ std::string buffer = S3D::formatStringBuffer("xdg-open %s", url.c_str());
+ system(buffer.c_str());
+ #endif // __DARWIN__
+ #endif // _WIN32
diff --git a/games/Scorched3D/gcc.patch b/games/Scorched3D/patches/scorched3d-returntype.patch
index 622c28a2fa..cd6f1145bf 100644
--- a/games/Scorched3D/gcc.patch
+++ b/games/Scorched3D/patches/scorched3d-returntype.patch
@@ -1,5 +1,5 @@
---- scorched/src/common/weapons/AccessoryStore.cpp.orig 2017-07-07 22:27:57.777261322 +0700
-+++ scorched/src/common/weapons/AccessoryStore.cpp 2017-07-07 22:39:34.368313611 +0700
+--- src/common/weapons/AccessoryStore.cpp.orig 2016-02-13 22:16:08.997822186 -0600
++++ src/common/weapons/AccessoryStore.cpp 2016-02-13 22:16:47.949819533 -0600
@@ -156,7 +156,7 @@
Accessory *parent, XMLNode *currentNode)
{
diff --git a/games/Scorched3D/patches/scorched3d-wx3.0.patch b/games/Scorched3D/patches/scorched3d-wx3.0.patch
new file mode 100644
index 0000000000..7ba7a13eeb
--- /dev/null
+++ b/games/Scorched3D/patches/scorched3d-wx3.0.patch
@@ -0,0 +1,170 @@
+From: Markus Koschany <apo@debian.org>
+Date: Fri, 15 Jul 2016 18:01:36 +0200
+Subject: wx3.0 compat
+
+Make Scorched3D compatible with wxWidgets 3.0
+
+Thanks to Olly Betts for the patch.
+---
+ src/launcher/wxdialogs/Display.cpp | 10 +++++-----
+ src/launcher/wxdialogs/DisplayDialog.cpp | 10 +++++-----
+ src/launcher/wxdialogs/SettingsDialog.cpp | 14 +++++++-------
+ 3 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/launcher/wxdialogs/Display.cpp b/src/launcher/wxdialogs/Display.cpp
+index e0a423a..22169e0 100644
+--- a/src/launcher/wxdialogs/Display.cpp
++++ b/src/launcher/wxdialogs/Display.cpp
+@@ -26,7 +26,7 @@ static void createMainControls(wxWindow *parent, wxSizer *sizer)
+ // Display settings
+ wxStaticBox *displayBox = new wxStaticBox(parent, -1, wxT("&Display"));
+ wxStaticBoxSizer *displaySizer = new wxStaticBoxSizer(displayBox, wxVERTICAL);
+- wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(2, 3, 5, 5);
++ wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(0, 3, 5, 5);
+ wxStaticText *resText = new wxStaticText(parent, -1, wxT("&Resolution :"));
+ IDC_DISPLAY_CTRL =
+ new wxComboBox(parent, -1,
+@@ -88,7 +88,7 @@ static void createMainControls(wxWindow *parent, wxSizer *sizer)
+ // Sound settings
+ wxStaticBox *soundBox = new wxStaticBox(parent, -1, wxT("&Sound"));
+ wxStaticBoxSizer *soundSizerMain = new wxStaticBoxSizer(soundBox, wxVERTICAL);
+- wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2);
++ wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(0, 4, 2, 0);
+ wxStaticText *volumeText = new wxStaticText(parent, -1, wxT("Sound Volume :"));
+ wxStaticText *musicVolumeText = new wxStaticText(parent, -1, wxT("Music Volume :"));
+ wxStaticText *ambientVolumeText = new wxStaticText(parent, -1, wxT("Ambient Volume :"));
+@@ -137,7 +137,7 @@ static void createMainControls(wxWindow *parent, wxSizer *sizer)
+ wxT("Game Detail Options"));
+ wxStaticBoxSizer *speedSizer = new wxStaticBoxSizer(speedBox, wxHORIZONTAL);
+
+- wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2);
++ wxGridSizer *loadSizer = new wxFlexGridSizer(0, 2, 2, 0);
+ IDC_LOADULTRA_CTRL = new wxButton(parent, ID_LOADULTRA, wxT("&Ultra Detail"), wxDefaultPosition, wxSize(120,-1));
+ IDC_LOADDEFAULTS_CTRL = new wxButton(parent, ID_LOADDEFAULTS, wxT("&Normal Detail"), wxDefaultPosition, wxSize(120,-1));
+ IDC_LOADMEDIUM_CTRL = new wxButton(parent, ID_LOADMEDIUM, wxT("Faster Detail"), wxDefaultPosition, wxSize(120,-1));
+@@ -256,7 +256,7 @@ static void createSpeedControls(wxWindow *parent, wxSizer *sizer)
+ wxStaticBox *waterDetailBox = new wxStaticBox(parent, -1,
+ wxT("Graphics Detail"));
+ wxStaticBoxSizer *waterDetailSizer = new wxStaticBoxSizer(waterDetailBox, wxHORIZONTAL);
+- wxGridSizer *waterDetailSizer2 = new wxGridSizer(3, 1, 10, 10);
++ wxGridSizer *waterDetailSizer2 = new wxGridSizer(0, 1, 10, 10);
+
+ IDC_NOWATERREF_CTRL =
+ new wxCheckBox(parent, -1, wxT("Don't draw water reflections - Large Framerate Improvement"));
+@@ -471,7 +471,7 @@ static void createKeysControls(wxWindow *parent, wxSizer *topsizer)
+ {
+ wxScrolledWindow *scrolledWindow = new wxScrolledWindow(parent, -1,
+ wxDefaultPosition, wxSize(480, 250));
+- wxSizer *sizer = new wxFlexGridSizer(5, 1);
++ wxSizer *sizer = new wxFlexGridSizer(0, 5, 1, 0);
+
+ keyboardKeyList.clear();
+ if (!Keyboard::instance()->loadKeyFile())
+diff --git a/src/launcher/wxdialogs/DisplayDialog.cpp b/src/launcher/wxdialogs/DisplayDialog.cpp
+index c34c9dc..0cdc620 100644
+--- a/src/launcher/wxdialogs/DisplayDialog.cpp
++++ b/src/launcher/wxdialogs/DisplayDialog.cpp
+@@ -449,15 +449,15 @@ void DisplayFrame::refreshScreen()
+ IDC_SLIDER1_CTRL->SetValue(OptionsDisplay::instance()->getBrightness());
+ IDC_SLIDER1_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getBrightnessEntry().getDescription(), wxConvUTF8));
+ IDC_VOLUME_CTRL->SetRange(0, 128);
+- IDC_VOLUME_CTRL->SetTickFreq(4, 0);
++ IDC_VOLUME_CTRL->SetTickFreq(4);
+ IDC_VOLUME_CTRL->SetValue(OptionsDisplay::instance()->getSoundVolume());
+ IDC_VOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getSoundVolumeEntry().getDescription(), wxConvUTF8));
+ IDC_MUSICVOLUME_CTRL->SetRange(0, 128);
+- IDC_MUSICVOLUME_CTRL->SetTickFreq(4, 0);
++ IDC_MUSICVOLUME_CTRL->SetTickFreq(4);
+ IDC_MUSICVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getMusicVolume());
+ IDC_MUSICVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getMusicVolumeEntry().getDescription(), wxConvUTF8));
+ IDC_AMBIENTVOLUME_CTRL->SetRange(0, 128);
+- IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4, 0);
++ IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4);
+ IDC_AMBIENTVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getAmbientSoundVolume());
+ IDC_AMBIENTVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getAmbientSoundVolumeEntry().getDescription(), wxConvUTF8));
+ IDC_USERNAME_CTRL->SetValue(wxString(OptionsDisplay::instance()->getOnlineUserName(), wxConvUTF8));
+@@ -736,7 +736,7 @@ void DisplayFrame::onExportMod(wxCommandEvent &event)
+ #if wxCHECK_VERSION(2, 8, 0)
+ wxFD_SAVE);
+ #else
+- wxSAVE);
++ wxFD_SAVE);
+ #endif
+ if (file.empty()) return;
+ ModFiles files;
+@@ -764,7 +764,7 @@ void DisplayFrame::onImportMod(wxCommandEvent &event)
+ #if wxCHECK_VERSION(2, 8, 0)
+ wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+ #else
+- wxOPEN | wxFILE_MUST_EXIST);
++ wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+ #endif
+ if (file.empty()) return;
+ ModFiles files;
+diff --git a/src/launcher/wxdialogs/SettingsDialog.cpp b/src/launcher/wxdialogs/SettingsDialog.cpp
+index b312085..03ba629 100644
+--- a/src/launcher/wxdialogs/SettingsDialog.cpp
++++ b/src/launcher/wxdialogs/SettingsDialog.cpp
+@@ -105,7 +105,7 @@ void SettingsFrame::createMainPanel(bool server)
+ mainPanel_ = new wxPanel(book_, -1);
+ book_->AddPage(mainPanel_, wxT("Main"));
+ wxSizer *mainPanelSizer = new wxBoxSizer(wxVERTICAL);
+- wxSizer *sizer = new wxFlexGridSizer(2, 2);
++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ mainPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+
+ setters_.push_back(
+@@ -166,7 +166,7 @@ void SettingsFrame::createMoneyPanel()
+ {
+ moneyPanel_ = new wxPanel(book_, -1);
+ wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
+- wxSizer *sizer = new wxFlexGridSizer(2, 2);
++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+
+ setters_.push_back(
+@@ -215,7 +215,7 @@ void SettingsFrame::createScorePanel()
+ {
+ scorePanel_ = new wxPanel(book_, -1);
+ wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
+- wxSizer *sizer = new wxFlexGridSizer(2, 2);
++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+
+ setters_.push_back(
+@@ -249,7 +249,7 @@ void SettingsFrame::createWeaponsPanel()
+ {
+ weaponsPanel_ = new wxPanel(book_, -1);
+ wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
+- wxSizer *sizer = new wxFlexGridSizer(2, 2);
++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+
+ setters_.push_back(
+@@ -286,7 +286,7 @@ void SettingsFrame::createEnvPanel()
+ {
+ envPanel_ = new wxPanel(book_, -1);
+ wxSizer *envPanelSizer = new wxBoxSizer(wxVERTICAL);
+- wxSizer *sizer = new wxFlexGridSizer(2, 2);
++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
+ envPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+
+ setters_.push_back(
+@@ -337,7 +337,7 @@ void SettingsFrame::createLandPanel()
+ wxScrolledWindow *scrolledWindow = new wxScrolledWindow(landPanel_, -1,
+ wxDefaultPosition, wxSize(225, 200));
+
+- wxSizer *sizer = new wxFlexGridSizer(3, 3);
++ wxSizer *sizer = new wxFlexGridSizer(0, 3, 3, 0);
+ int i = 0;
+ std::list<LandscapeDefinitionsEntry> &defns =
+ landscapeDefinitions.getAllLandscapes();
+@@ -438,7 +438,7 @@ void SettingsFrame::createPlayersPanel()
+ wxT("Players are persistent for game"));
+ playersPanelSizer->Add(IDC_SERVER_RESIDUAL_CTRL, 0, wxALIGN_CENTER | wxTOP, 10);
+
+- wxSizer *sizer = new wxGridSizer(3, 3);
++ wxSizer *sizer = new wxGridSizer(0, 3, 3, 0);
+ playersPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
+
+ for (int i=0; i<24; i++)
diff --git a/games/adl/adl.SlackBuild b/games/adl/adl.SlackBuild
index 3127426777..72f54fe701 100644
--- a/games/adl/adl.SlackBuild
+++ b/games/adl/adl.SlackBuild
@@ -42,9 +42,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -80,11 +77,8 @@ YEAR=93
tar xvf $CWD/$PRGNAM.tar.Z
cd $PRGNAM
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# Patch does this:
# - fix various compile errors (mostly relating to lack of ANSI prototypes).
diff --git a/games/adl/adl.info b/games/adl/adl.info
index 24b6d03ac2..5ddcb5f2cc 100644
--- a/games/adl/adl.info
+++ b/games/adl/adl.info
@@ -1,7 +1,7 @@
PRGNAM="adl"
VERSION="20110628"
HOMEPAGE="http://adl.sourceforge.net/"
-DOWNLOAD="http://www.ifarchive.org/if-archive/programming/adl/adl.tar.Z \
+DOWNLOAD="https://www.ifarchive.org/if-archive/programming/adl/adl.tar.Z \
https://sourceforge.net/projects/adl/files/adl/adl%20binary%201.0/adl_linux32_1_0.tar.gz \
https://slackware.uk/~urchlay/src/adl-20110628.tar.gz \
https://slackware.uk/~urchlay/src/adl03-samples.tar.gz"
@@ -9,7 +9,7 @@ MD5SUM="b01115cc2625441caf818e60527b4095 \
c487cd233972bd5de694d303806ac653 \
57b75b90bd09a5051270732a61c6e288 \
6edfe44f23a99078ca797c75273fbb0e"
-DOWNLOAD_x86_64="http://www.ifarchive.org/if-archive/programming/adl/adl.tar.Z \
+DOWNLOAD_x86_64="https://www.ifarchive.org/if-archive/programming/adl/adl.tar.Z \
https://slackware.uk/~urchlay/src/adl_linux64_1_0.tar.gz \
https://slackware.uk/~urchlay/src/adl-20110628.tar.gz \
https://slackware.uk/~urchlay/src/adl03-samples.tar.gz"
diff --git a/games/advancemame/README b/games/advancemame/README
index 483467c542..b0b04523a1 100644
--- a/games/advancemame/README
+++ b/games/advancemame/README
@@ -4,7 +4,5 @@ Advancemame is a derivative of the well known "mame" emulator.
It works easily on linux, with joystick support, fullscreen
support, and more "out of the box."
-Optional dependency: SDL2. By default, advancemame is built with
-SDL-1.2. If SDL-2.0 is installed, advancemame will autodetect it and use
-it instead. If you have SDL2 installed, but want to build advancemame
-with SDL-1.2, set SDL2=no in the script's environment.
+By default, advancemame is built with SDL2. If you want to build
+advancemame with SDL-1.2, set SDL2=no in the script's environment.
diff --git a/games/advancemame/advancemame.SlackBuild b/games/advancemame/advancemame.SlackBuild
index 725bf9a5d4..aa9c18385a 100644
--- a/games/advancemame/advancemame.SlackBuild
+++ b/games/advancemame/advancemame.SlackBuild
@@ -8,6 +8,7 @@
# had no license, modified version released under the WTFPL. See
# http://www.wtfpl.net/txt/copying/ for details.
+# 20211004 bkw: BUILD=2, fix for -current
# 20180910 bkw: Update for v3.9
# 20180702 bkw: Update for v3.8
# 20180206 bkw: Update for v3.7
@@ -28,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=advancemame
VERSION=${VERSION:-3.9}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -40,9 +41,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -75,11 +73,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# 20180702 bkw: This file got left out of the 3.8 release tarball. It
# xzips down to 8.5K, so just include it here (taken from upstream git).
@@ -99,6 +94,9 @@ PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
# but the link fails. advancemame already builds about 8-10x as fast as
# mame without it, so not worth worrying about this.
+# 20211004 bkw: upstream commit f8688cae needed for -current.
+patch -p1 < $CWD/compilefix.diff
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/games/advancemame/compilefix.diff b/games/advancemame/compilefix.diff
new file mode 100644
index 0000000000..ddf815a4b7
--- /dev/null
+++ b/games/advancemame/compilefix.diff
@@ -0,0 +1,24 @@
+diff --git a/src/drivers/cavepgm.c b/src/drivers/cavepgm.c
+index 38d3dae8..df6e97ab 100644
+--- a/src/drivers/cavepgm.c
++++ b/src/drivers/cavepgm.c
+@@ -287,7 +287,7 @@ Notes:
+ #include "timer.h"
+
+
+-UINT16 *pgm_mainram, *pgm_bg_videoram, *pgm_tx_videoram, *pgm_videoregs, *pgm_rowscrollram;
++extern UINT16 *pgm_mainram, *pgm_bg_videoram, *pgm_tx_videoram, *pgm_videoregs, *pgm_rowscrollram;
+ static UINT8 *z80_mainram;
+ static UINT32 *arm7_shareram;
+ static UINT32 arm7_latch;
+@@ -852,8 +852,8 @@ static void expand_32x32x5bpp(void)
+ /* This function expands the sprite colour data (in the A Roms) from 3 pixels
+ in each word to a byte per pixel making it easier to use */
+
+-UINT8 *pgm_sprite_a_region;
+-size_t pgm_sprite_a_region_allocate;
++extern UINT8 *pgm_sprite_a_region;
++extern size_t pgm_sprite_a_region_allocate;
+
+ static void expand_colourdata(void)
+ {
diff --git a/games/advancescan/advancescan.SlackBuild b/games/advancescan/advancescan.SlackBuild
index 08a9fe385a..6e7691c0cb 100644
--- a/games/advancescan/advancescan.SlackBuild
+++ b/games/advancescan/advancescan.SlackBuild
@@ -8,6 +8,8 @@
# had no license, modified version released under the WTFPL. See
# http://www.wtfpl.net/txt/copying/ for details.
+# 20211004 bkw: BUILD=2, -std=c++11 for -current
+
# 20170211 bkw:
# - Take over maintenance
# - Update for v1.18
@@ -20,7 +22,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=advancescan
VERSION=${VERSION:-1.18}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -32,9 +34,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -67,14 +66,11 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=c++11" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/games/ags/ags.SlackBuild b/games/ags/ags.SlackBuild
index 7260ee137f..906225e37a 100644
--- a/games/ags/ags.SlackBuild
+++ b/games/ags/ags.SlackBuild
@@ -26,7 +26,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=ags
-VERSION=${VERSION:-3.5.1.8}
+VERSION=${VERSION:-3.5.1.10}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/games/ags/ags.info b/games/ags/ags.info
index 230d8d03c0..d6c33d2c5e 100644
--- a/games/ags/ags.info
+++ b/games/ags/ags.info
@@ -1,8 +1,8 @@
PRGNAM="ags"
-VERSION="3.5.1.8"
+VERSION="3.5.1.10"
HOMEPAGE="https://github.com/adventuregamestudio/ags"
-DOWNLOAD="https://github.com/adventuregamestudio/ags/archive/v.3.5.1.8/ags-v.3.5.1.8.tar.gz"
-MD5SUM="7db32cf95bbf9c2c2e16c9951e3e48da"
+DOWNLOAD="https://github.com/adventuregamestudio/ags/archive/v.3.5.1.10/ags-v.3.5.1.10.tar.gz"
+MD5SUM="3980ccb147ae5c0ecfdb0dc58b2ffd67"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="dumb"
diff --git a/games/aklabeth/aklabeth.SlackBuild b/games/aklabeth/aklabeth.SlackBuild
index 256571c969..7bd84baa32 100644
--- a/games/aklabeth/aklabeth.SlackBuild
+++ b/games/aklabeth/aklabeth.SlackBuild
@@ -22,9 +22,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -57,11 +54,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
patch -p1 < $CWD/compilefix.diff
diff --git a/games/aklabeth/aklabeth.info b/games/aklabeth/aklabeth.info
index 5a7dbc1a30..7dfddc7da8 100644
--- a/games/aklabeth/aklabeth.info
+++ b/games/aklabeth/aklabeth.info
@@ -1,7 +1,7 @@
PRGNAM="aklabeth"
VERSION="1.0"
-HOMEPAGE="http://reconstruction.voyd.net/index.php?event=project&typeKeyword=remakes"
-DOWNLOAD="http://reconstruction.voyd.net/zips/aklabeth-1.0.tar.gz"
+HOMEPAGE="https://reconstruction.voyd.net/index.php?event=project&typeKeyword=remakes"
+DOWNLOAD="https://reconstruction.voyd.net/zips/aklabeth-1.0.tar.gz"
MD5SUM="56cccf9f4ec261f476648a59b78ff166"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/games/alephone/README b/games/alephone/README
index bdaff1849c..2afc0c2c53 100644
--- a/games/alephone/README
+++ b/games/alephone/README
@@ -14,9 +14,3 @@ the Marathon series is required to play. Install one or more of
marathon-data, marathon2-data, and/or marathon-infinite-data.
See the READMEs for the game data packages for more information.
-
-Although ffmpeg is listed as a dependency, it's possible to build
-without it by setting FFMPEG=no in the script's environment (which will
-disable in-game movie playback/recording). This option is provided as a
-desperation measure only, since ffmpeg's API is a moving target. Please
-contact the maintainer if you have ffmpeg-related build issues.
diff --git a/games/alephone/alephone.SlackBuild b/games/alephone/alephone.SlackBuild
index 05f3e55657..f5ee5c4bc6 100644
--- a/games/alephone/alephone.SlackBuild
+++ b/games/alephone/alephone.SlackBuild
@@ -6,6 +6,7 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211010 bkw: update for 20210408
# 20201026 bkw: update for 20201026
# 20191209 bkw: update for 20190331
# 20150915 bkw:
@@ -16,7 +17,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=alephone
-VERSION=${VERSION:-20201026}
+VERSION=${VERSION:-20210408}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -29,9 +30,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/alephone/alephone.info b/games/alephone/alephone.info
index dd8120c140..a6aa093373 100644
--- a/games/alephone/alephone.info
+++ b/games/alephone/alephone.info
@@ -1,8 +1,8 @@
PRGNAM="alephone"
-VERSION="20201026"
+VERSION="20210408"
HOMEPAGE="https://alephone.lhowon.org/"
-DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20201026/AlephOne-20201026.tar.bz2"
-MD5SUM="5636de266ecd67b88ac9c7d2661e1e78"
+DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20210408/AlephOne-20210408.tar.bz2"
+MD5SUM="f65d4923a931984ec354a4b5373e1303"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="lua zziplib"
diff --git a/games/an/README b/games/an/README
index 888b087077..bcdb674dfc 100644
--- a/games/an/README
+++ b/games/an/README
@@ -1,8 +1,8 @@
an (Anagram Generator)
-Generates anagrams for a phrase supplied by the user, the words used in
+Generates anagrams for a phrase supplied by the user. The words used in
the anagram are taken from a specified dictionary which should contain
-one word per line (default:/usr/share/dict/words).
+one word per line (default: /usr/share/dict/words).
On Slackware, /usr/share/dict/words comes from bsd-games, in y/ on the
install media.
diff --git a/games/an/an.SlackBuild b/games/an/an.SlackBuild
index 294d5a8024..b92e940f78 100644
--- a/games/an/an.SlackBuild
+++ b/games/an/an.SlackBuild
@@ -27,9 +27,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -69,11 +66,8 @@ rm -rf ${PRGNAM}-${SRCVER}
tar xvf $CWD/${PRGNAM}_$TARVER.orig.tar.xz
cd ${PRGNAM}-$SRCVER
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
make MANDIR=/usr/man/man6 CC="gcc $SLKCFLAGS"
make install DESTDIR=$PKG MANDIR=$PKG/usr/man/man6
diff --git a/games/an/an.info b/games/an/an.info
index 5999bf7981..6e2876b909 100644
--- a/games/an/an.info
+++ b/games/an/an.info
@@ -1,7 +1,7 @@
PRGNAM="an"
VERSION="1.2"
HOMEPAGE="https://packages.debian.org/sid/an"
-DOWNLOAD="http://http.debian.net/debian/pool/main/a/an/an_1.2.orig.tar.xz"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/a/an/an_1.2.orig.tar.xz"
MD5SUM="1f3465bfe2cc4458f75a7a42037b475c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/games/an/slack-desc b/games/an/slack-desc
index 21565fb755..30a9bb048e 100644
--- a/games/an/slack-desc
+++ b/games/an/slack-desc
@@ -8,9 +8,9 @@
|-----handy-ruler------------------------------------------------------|
an: an (Anagram Generator)
an:
-an: Generates anagrams for a phrase supplied by the user, the words used
+an: Generates anagrams for a phrase supplied by the user. The words used
an: in the anagram are taken from a specified dictionary which should
-an: contain one word per line (default:/usr/share/dict/words).
+an: contain one word per line (default: /usr/share/dict/words).
an:
an:
an:
diff --git a/games/asteroidsinfinity/asteroidsinfinity.SlackBuild b/games/asteroidsinfinity/asteroidsinfinity.SlackBuild
index 1e1478f9ac..075aba90ff 100644
--- a/games/asteroidsinfinity/asteroidsinfinity.SlackBuild
+++ b/games/asteroidsinfinity/asteroidsinfinity.SlackBuild
@@ -16,9 +16,6 @@ PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -39,11 +36,8 @@ rm -rf $SRCNAM
unzip $CWD/$SRCNAM$VERSION.zip
cd $SRCNAM
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
mkdir -p \
$PKG/usr/share/games/$PRGNAM \
diff --git a/games/atanks/atanks.SlackBuild b/games/atanks/atanks.SlackBuild
index d127fb81d8..0c06b01d08 100644
--- a/games/atanks/atanks.SlackBuild
+++ b/games/atanks/atanks.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for atanks
-# Copyright 2015-2016 Eugene M., <damagedone at gmx dot com>
+# Copyright 2015-2021 Eugene M., <damagedone at gmx dot com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=atanks
-VERSION=${VERSION:-6.5}
+VERSION=${VERSION:-6.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -93,5 +93,8 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
+install -Dm644 atanks.desktop $PKG/usr/share/applications/atanks.desktop
+install -Dm644 atanks.png $PKG/usr/share/pixmaps/atanks.png
+
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/games/atanks/atanks.info b/games/atanks/atanks.info
index e5c44b8fad..80f47f6d4c 100644
--- a/games/atanks/atanks.info
+++ b/games/atanks/atanks.info
@@ -1,8 +1,8 @@
PRGNAM="atanks"
-VERSION="6.5"
+VERSION="6.6"
HOMEPAGE="http://atanks.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/atanks/atanks/atanks-6.5/atanks-6.5.tar.gz"
-MD5SUM="3182d080ea71c3837af57f3651b55025"
+DOWNLOAD="http://downloads.sourceforge.net/project/atanks/atanks/atanks-6.6/atanks-6.6.tar.gz"
+MD5SUM="f53bbb0017d1ed79045085f6a36c85a8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="allegro4"
diff --git a/games/atari++/atari++.SlackBuild b/games/atari++/atari++.SlackBuild
index 6b1a5a9097..5d07ec5530 100644
--- a/games/atari++/atari++.SlackBuild
+++ b/games/atari++/atari++.SlackBuild
@@ -6,6 +6,7 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211007 bkw: update for 1.84
# 20210323 bkw: BUILD=2
# - add option to patch out "Do you really want to quit?" because it's *annoying*
# - move binary to /usr/games
@@ -14,7 +15,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=atari++
-VERSION=${VERSION:-1.83}
+VERSION=${VERSION:-1.84}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -27,9 +28,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/atari++/atari++.info b/games/atari++/atari++.info
index ad9361d789..aa55b189c1 100644
--- a/games/atari++/atari++.info
+++ b/games/atari++/atari++.info
@@ -1,8 +1,8 @@
PRGNAM="atari++"
-VERSION="1.83"
+VERSION="1.84"
HOMEPAGE="http://www.xl-project.com/"
-DOWNLOAD="http://www.xl-project.com/download/atari++_1.83.tar.gz"
-MD5SUM="bc357e90d9a2d42471c58d77bccc20d5"
+DOWNLOAD="http://www.xl-project.com/download/atari++_1.84.tar.gz"
+MD5SUM="569288245236971b7f6115812fb745b1"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/games/atari800/atari800.SlackBuild b/games/atari800/atari800.SlackBuild
index d86adb6830..df5506c710 100644
--- a/games/atari800/atari800.SlackBuild
+++ b/games/atari800/atari800.SlackBuild
@@ -36,9 +36,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/atari800_roms/atari800_roms.SlackBuild b/games/atari800_roms/atari800_roms.SlackBuild
index fa594082c7..77a164bc2c 100644
--- a/games/atari800_roms/atari800_roms.SlackBuild
+++ b/games/atari800_roms/atari800_roms.SlackBuild
@@ -20,9 +20,6 @@ BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/atari800_roms/atari800_roms.info b/games/atari800_roms/atari800_roms.info
index a332b0f0b4..fdf8e5e198 100644
--- a/games/atari800_roms/atari800_roms.info
+++ b/games/atari800_roms/atari800_roms.info
@@ -1,7 +1,7 @@
PRGNAM="atari800_roms"
VERSION="20140424"
-HOMEPAGE="http://atari800.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sourceforge/atari800/xf25.zip"
+HOMEPAGE="https://atari800.github.io/"
+DOWNLOAD="https://downloads.sourceforge.net/sourceforge/atari800/xf25.zip"
MD5SUM="4dc3b6b4313e9596c4d474785a37b94d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/games/bastet/bastet.SlackBuild b/games/bastet/bastet.SlackBuild
index 6f1cf97c2d..7e73f97d9b 100644
--- a/games/bastet/bastet.SlackBuild
+++ b/games/bastet/bastet.SlackBuild
@@ -6,6 +6,7 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211004 bkw: fix build on -current again (use ncursesw).
# 20180212 bkw: fix build on -current.
# 20170301 bkw:
@@ -24,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=bastet
VERSION=${VERSION:-0.43.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -36,9 +37,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -71,11 +69,8 @@ rm -rf $PRGNAM-$VERSION
unzip $CWD/$PRGNAM-$VERSION.zip
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# Don't want/need debugging binary
sed -i 's/-ggdb//g' Makefile
@@ -88,6 +83,8 @@ sed -i "s,/var/games,&/$PRGNAM," Config.cpp $PRGNAM.6
sed -i '/# *include/s,tr1/tr1/\(unordered_set\),\1.hpp,' *.hpp
sed -i 's,std::tr1::,boost::,g' *.hpp *.cpp
+sed -i 's,-lncurses,-lncursesw,' Makefile
+
make CXXFLAGS="$SLKCFLAGS"
# No 'make install', follow the INSTALL document more-or-less, except I
diff --git a/games/bastet/bastet.info b/games/bastet/bastet.info
index a41a22b0e9..243af18ed8 100644
--- a/games/bastet/bastet.info
+++ b/games/bastet/bastet.info
@@ -1,6 +1,6 @@
PRGNAM="bastet"
VERSION="0.43.2"
-HOMEPAGE="http://fph.altervista.org/prog/bastet.html"
+HOMEPAGE="https://fph.altervista.org/prog/bastet.html"
DOWNLOAD="https://github.com/fph/bastet/archive/0.43.2/bastet-0.43.2.zip"
MD5SUM="07d95099389b29f36d5526ee8ae96585"
DOWNLOAD_x86_64=""
diff --git a/games/bloodcm/README b/games/bloodcm/README
index 30629a9271..b5e02f39f8 100644
--- a/games/bloodcm/README
+++ b/games/bloodcm/README
@@ -11,7 +11,3 @@ eduke32 will need to be at least version 20160704_5811 for this to work.
To play BloodCM: Launch EDuke32, select BloodCM in the "Custom Game"
drop-down list, click "Start".
-
-When new versions of BloodCM are released, the download URL doesn't
-change. If you get an md5sum error on the downloaded file, please
-contact the maintainer of this SlackBuild.
diff --git a/games/bloodcm/bloodcm.SlackBuild b/games/bloodcm/bloodcm.SlackBuild
index f9ac592f5c..a0f146fad8 100644
--- a/games/bloodcm/bloodcm.SlackBuild
+++ b/games/bloodcm/bloodcm.SlackBuild
@@ -19,9 +19,6 @@ PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/bloodcm/bloodcm.info b/games/bloodcm/bloodcm.info
index 849e5f8899..9707d9903c 100644
--- a/games/bloodcm/bloodcm.info
+++ b/games/bloodcm/bloodcm.info
@@ -1,7 +1,7 @@
PRGNAM="bloodcm"
VERSION="12.2016"
HOMEPAGE="https://www.moddb.com/games/bloodcm"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/38-blood-crossmatching"
+DOWNLOAD="https://slackware.uk/~urchlay/src/38-blood-crossmatching"
MD5SUM="62c3371f353c07ed0bd42c96a37f7d08"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/games/brickout/README b/games/brickout/README
index afaf7fd606..cc560f2fdd 100644
--- a/games/brickout/README
+++ b/games/brickout/README
@@ -1,3 +1,5 @@
+brickout (ball-and-paddle game)
+
"Brickout" is a ball-and-paddle game where it's your objective to
destroy bricks on the screen. Gameplay is similar to "Breakout" and
"Arkanoid".
diff --git a/games/brickout/brickout.SlackBuild b/games/brickout/brickout.SlackBuild
index 5381d1b4ee..d70f2307c8 100644
--- a/games/brickout/brickout.SlackBuild
+++ b/games/brickout/brickout.SlackBuild
@@ -28,9 +28,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -57,11 +54,8 @@ rm -rf $PRGNAM-$SRCVER
tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
cd $PRGNAM-$SRCVER
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# This is fugly. Apologies.
make \
diff --git a/games/bstone/README b/games/bstone/README
index 842423d0cb..72f207482d 100644
--- a/games/bstone/README
+++ b/games/bstone/README
@@ -6,7 +6,7 @@ Planet Strike.
Features:
* High resolution rendering of world (extended vanilla engine)
* Modern and vanilla controls
-* Allows to customize control bindings
+* Allows customizing control bindings
* Separate volume control of sound effects and music
Supported games:
@@ -18,6 +18,9 @@ Supported games:
* Planet Strike v1.0
* Planet Strike v1.1
-The data files for Aliens of Gold v3.0 shareware are included in the
-package. To play one of the other games, copy its data files to
-/usr/share/games/bstone.
+The data files for Aliens of Gold v3.0 shareware are included in
+the package. To play one of the other games, copy its data files
+(*.bs6 or *.vsi) to /usr/share/games/bstone. When you start bstone,
+it will detect all the available games and ask which one you'd like to
+play. Note that the data files must be named either all uppercase or
+all lowercase.
diff --git a/games/bstone/blake_stone_source_code_license.txt b/games/bstone/blake_stone_source_code_license.txt
new file mode 100644
index 0000000000..945cb68c51
--- /dev/null
+++ b/games/bstone/blake_stone_source_code_license.txt
@@ -0,0 +1,53 @@
+Blake Stone: Planet Strike Source Code Release - July 5, 2013.
+
+Please note that this is being released without any kind of
+support from the original developers of this game or Apogee Software,
+LLC, Apogee Software, Ltd / 3DRealms Entertainment.  
+
+We are releasing this code for the entertainment of the user
+community. This is all the source we have relating to Blake Stone:
+Planet Strike.  We haven't looked at this stuff in years, and
+make no guarantee that you will be able to get it to work, nor do we
+guarantee that it won't blow up your computer if you do try and use
+it. ;)
+
+You will need the data from a released version of Blake Stone: Planet
+Strike to use the .exe built from this code. We cannot and will not
+help in getting this running.
+
+Caveat Emptor - Use at your own risk.
+
+Please note that while we are releasing the source code to Blake
+Stone: Planet Strike, the game itself has not been released in the
+same manner (in other words, Blake Stone: Planet Strike is still
+commercial software). You can still buy the game from us by visiting
+the Apogee Software online store at:
+
+http://apogeesoftware.com/products/blake-stone-planet-strike
+
+...or GOG.com at:
+
+http://www.gog.com/gamecard/blake_stone_planet_strike
+
+Thanks to all the fans who have enjoyed the game and to those that
+have contacted us about the possibility of releasing this source. If
+you produce something cool with this source code, drop us a line at
+info@apogeesoftware.com
+
+=====================================================================
+
+Copyright © 1992 - 2013.
+
+This Source code / program is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU General Public License for more details.You should have
+received a copy of the GNU General Public License along with this
+program; if not, write to the Free Software Foundation, Inc., 59
+Temple Place - Suite 330, Boston, MA  02111-1307, USA.
diff --git a/games/bstone/bstone.SlackBuild b/games/bstone/bstone.SlackBuild
index 770961632b..56ac327034 100644
--- a/games/bstone/bstone.SlackBuild
+++ b/games/bstone/bstone.SlackBuild
@@ -6,6 +6,13 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211004 bkw:
+# - update for v1.2.11.
+# - include .txt version of license.
+# - datadir.diff changed again.
+# - update .desktop file.
+# - better README doc on how to play the full version.
+
# 20201219 bkw: update for v1.2.9.
# 20200804 bkw: update for v1.2.8. datadir.diff changed again.
# 20200222 bkw: update for v1.1.16_2.
@@ -18,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=bstone
-VERSION=${VERSION:-1.2.9}
+VERSION=${VERSION:-1.2.11}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -33,9 +40,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -65,7 +69,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz || tar xvf $CWD/v$SRCVER.tar.gz
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
cd $PRGNAM-$SRCVER
chown -R root:root .
find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
@@ -78,7 +82,8 @@ patch -p1 < $CWD/datadir.diff
# make install and install/strip are borked, do manual install.
# always include the shareware data in the package, the game will
-# only use it if the user hasn't installed the full version.
+# automatically use it if the user hasn't installed the full version,
+# or offer a choice of full version or shareware if he has both.
mkdir -p build
cd build
cmake \
@@ -87,11 +92,11 @@ cd build
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DMAN_INSTALL_DIR=/usr/man \
- -DCMAKE_BUILD_TYPE=Release ../src
+ -DCMAKE_BUILD_TYPE=Release ..
make
mkdir -p $PKG/usr/games $PKG/usr/share/games/$PRGNAM
- install -s -m0755 $PRGNAM $PKG/usr/games
+ install -s -m0755 src/$PRGNAM $PKG/usr/games
unzip $CWD/1bs30.zip
unzip BSSW30.SHR \*.BS1
@@ -105,9 +110,17 @@ 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 src/bstone_todo.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# the original source code license is supplied only as a MS word .doc
+# file. we ship it as-is, but rename it to something without spaces in
+# the filename. also, ship a pre-converted text version (created with
+# wvText, then hand-edited to fix the formatting).
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+LIC=blake_stone_source_code_license
+mkdir -p $PKGDOC
+cp -a LICENSE README.md TODO.md CHANGE* $PKGDOC
+cp -a *.doc $PKGDOC/$LIC.doc
+cat $CWD/$LIC.txt > $PKGDOC/$LIC.txt
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/games/bstone/bstone.desktop b/games/bstone/bstone.desktop
index 57071359d0..0ef74b419e 100644
--- a/games/bstone/bstone.desktop
+++ b/games/bstone/bstone.desktop
@@ -1,7 +1,8 @@
[Desktop Entry]
Type=Application
Name=Blake Stone
-Icon=bstone
-Exec=bstone
+GenericName=First Person Shooting Game
+Icon=/usr/share/pixmaps/bstone.png
+Exec=/usr/games/bstone
Terminal=false
Categories=Game;ActionGame;
diff --git a/games/bstone/bstone.info b/games/bstone/bstone.info
index 3f676dc1d0..71be8f68b8 100644
--- a/games/bstone/bstone.info
+++ b/games/bstone/bstone.info
@@ -1,9 +1,9 @@
PRGNAM="bstone"
-VERSION="1.2.9"
-HOMEPAGE="http://bibendovsky.github.io/bstone/"
-DOWNLOAD="https://github.com/bibendovsky/bstone/archive/v1.2.9/bstone-1.2.9.tar.gz \
+VERSION="1.2.11"
+HOMEPAGE="https://bibendovsky.github.io/bstone/"
+DOWNLOAD="https://github.com/bibendovsky/bstone/archive/v1.2.11/bstone-1.2.11.tar.gz \
https://archive.org/download/BlakeStoneAliensOfGold/1bs30.zip"
-MD5SUM="58bb68e6f7282fdf27f41a9aa90cdb6f \
+MD5SUM="2b8d6a48a20ae0dfeb942550fbf9721a \
a63c88fc5b399ffb5ed42dc215321f36"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/games/bstone/datadir.diff b/games/bstone/datadir.diff
index 19a7100c32..268c10e3c1 100644
--- a/games/bstone/datadir.diff
+++ b/games/bstone/datadir.diff
@@ -1,7 +1,7 @@
-diff -Naur bstone-1.2.8/src/3d_main.cpp bstone-1.2.8.patched/src/3d_main.cpp
---- bstone-1.2.8/src/3d_main.cpp 2020-07-10 09:58:35.000000000 -0400
-+++ bstone-1.2.8.patched/src/3d_main.cpp 2020-08-04 03:07:36.266707676 -0400
-@@ -10722,20 +10722,7 @@
+diff -Naur bstone-1.2.11/src/3d_main.cpp bstone-1.2.11.patched/src/3d_main.cpp
+--- bstone-1.2.11/src/3d_main.cpp 2021-03-21 15:24:36.000000000 -0400
++++ bstone-1.2.11.patched/src/3d_main.cpp 2021-10-04 19:12:08.818938051 -0400
+@@ -10711,20 +10711,7 @@
const std::string& get_default_data_dir()
{
@@ -23,3 +23,14 @@ diff -Naur bstone-1.2.8/src/3d_main.cpp bstone-1.2.8.patched/src/3d_main.cpp
return result;
}
+diff -Naur bstone-1.2.11/src/jm_free.cpp bstone-1.2.11.patched/src/jm_free.cpp
+--- bstone-1.2.11/src/jm_free.cpp 2021-03-21 15:24:36.000000000 -0400
++++ bstone-1.2.11.patched/src/jm_free.cpp 2021-10-04 19:12:39.570935256 -0400
+@@ -718,6 +718,7 @@
+ bstone::file_system::get_working_dir());
+
+ add_search_path("working dir", working_full_dir, search_paths);
++ add_search_path("system dir", "/usr/share/games/bstone", search_paths);
+ }
+
+ {
diff --git a/games/bstone/slack-desc b/games/bstone/slack-desc
index 8bf8b43f38..89634612e8 100644
--- a/games/bstone/slack-desc
+++ b/games/bstone/slack-desc
@@ -9,8 +9,8 @@
bstone: bstone (first-person shooter game)
bstone:
bstone: A source port of Blake Stone: Aliens of Gold and Blake Stone:
-bstone: Planet Strike.
-bstone:
+bstone: Planet Strike. This package includes the game data for Aliens of Gold
+bstone: v3.0 Shareware.
bstone:
bstone:
bstone:
diff --git a/games/burgerspace/README b/games/burgerspace/README
index 966595e8ef..22b349f4da 100644
--- a/games/burgerspace/README
+++ b/games/burgerspace/README
@@ -2,3 +2,6 @@ burgerspace (2D platform game)
BurgerSpace, a hamburger-smashing video game. It is a clone of the 1982
BurgerTime video game by Data East.
+
+Note: on some video cards, with some drivers, pressing F11 for
+fullscreen causes the X server to crash.
diff --git a/games/burgerspace/burgerspace.SlackBuild b/games/burgerspace/burgerspace.SlackBuild
index 8c04574616..555d79e3cd 100644
--- a/games/burgerspace/burgerspace.SlackBuild
+++ b/games/burgerspace/burgerspace.SlackBuild
@@ -9,7 +9,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=burgerspace
-VERSION=${VERSION:-1.9.2}
+VERSION=${VERSION:-1.9.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +22,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -57,11 +54,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/games/burgerspace/burgerspace.info b/games/burgerspace/burgerspace.info
index 7a721b8787..60aaee180f 100644
--- a/games/burgerspace/burgerspace.info
+++ b/games/burgerspace/burgerspace.info
@@ -1,8 +1,8 @@
PRGNAM="burgerspace"
-VERSION="1.9.2"
+VERSION="1.9.4"
HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/burgerspace.html"
-DOWNLOAD="https://slackware.uk/~urchlay/src/burgerspace-1.9.2.tar.gz"
-MD5SUM="8675449bb1c3c014bc51837b60f6cc47"
+DOWNLOAD="https://slackware.uk/~urchlay/src/burgerspace-1.9.4.tar.gz"
+MD5SUM="c942143065bcb5ee235fb69df4389a7b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="flatzebra"
diff --git a/games/ceferino/ceferino.SlackBuild b/games/ceferino/ceferino.SlackBuild
index 9c1d0531b1..f48388ebd0 100644
--- a/games/ceferino/ceferino.SlackBuild
+++ b/games/ceferino/ceferino.SlackBuild
@@ -24,9 +24,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -59,11 +56,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# fix array bounds fail in sound initialization
patch -p1 < $CWD/soundinitfix.diff
@@ -84,7 +78,7 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install-strip DESTDIR=$PKG
-# icon rendered from Debian's cefefino.svg
+# icon rendered from Debian's ceferino.svg
mkdir -p $PKG/usr/share/pixmaps
cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
diff --git a/games/ceferino/ceferino.info b/games/ceferino/ceferino.info
index 8842451927..3e14733065 100644
--- a/games/ceferino/ceferino.info
+++ b/games/ceferino/ceferino.info
@@ -1,7 +1,7 @@
PRGNAM="ceferino"
VERSION="0.97.8+svn37"
-HOMEPAGE="http://web.archive.org/web/20160531044525/http://www.losersjuegos.com.ar/juegos/ceferino"
-DOWNLOAD="http://ftp.debian.org/debian/pool/main/c/ceferino/ceferino_0.97.8+svn37.orig.tar.gz"
+HOMEPAGE="https://web.archive.org/web/20160531044525/http://www.losersjuegos.com.ar/juegos/ceferino"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/c/ceferino/ceferino_0.97.8+svn37.orig.tar.gz"
MD5SUM="6823fe46cadf7c759128c37073e85e2c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/games/chexquest3/chexquest3.SlackBuild b/games/chexquest3/chexquest3.SlackBuild
index fe60f95d33..e32855f153 100644
--- a/games/chexquest3/chexquest3.SlackBuild
+++ b/games/chexquest3/chexquest3.SlackBuild
@@ -6,25 +6,17 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211004 bkw: Derp! This should have been noarch from the beginning.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=chexquest3
VERSION=${VERSION:-20100924}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i586 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
- esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -34,20 +26,6 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
set -e
SRCNAM=ChexQuest3
diff --git a/games/chocolate-doom/chocolate-doom.SlackBuild b/games/chocolate-doom/chocolate-doom.SlackBuild
index c9b7939415..1d34510710 100644
--- a/games/chocolate-doom/chocolate-doom.SlackBuild
+++ b/games/chocolate-doom/chocolate-doom.SlackBuild
@@ -6,6 +6,7 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210727 bkw: fix build on -current (does no harm on 14.2), BUILD=2.
# 20201019 bkw: update for v3.0.1.
# 20180101 bkw:
# - Update for v3.0.0. Building 2.3.0 still works, if someone needs it.
@@ -27,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=chocolate-doom
VERSION=${VERSION:-3.0.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -39,9 +40,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -83,11 +81,11 @@ rm -rf $PRGNAM-$REALVER $PRGNAM-$PRGNAM-$REALVER
tar xvf $CWD/$PRGNAM-$REALVER.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$REALVER.tar.gz
cd $PRGNAM-$REALVER || cd $PRGNAM-$PRGNAM-$REALVER
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# upstream fix from git, easier to use sed than make a diff.
+sed -i '/^boolean demoextend/d' src/hexen/mn_menu.c
[ -x configure ] || sh autogen.sh
diff --git a/games/chocolate-doom/chocolate-doom.info b/games/chocolate-doom/chocolate-doom.info
index a85c369b70..6724c68128 100644
--- a/games/chocolate-doom/chocolate-doom.info
+++ b/games/chocolate-doom/chocolate-doom.info
@@ -1,6 +1,6 @@
PRGNAM="chocolate-doom"
VERSION="3.0.1"
-HOMEPAGE="http://www.chocolate-doom.org/"
+HOMEPAGE="https://www.chocolate-doom.org/"
DOWNLOAD="https://www.chocolate-doom.org/downloads/3.0.1/chocolate-doom-3.0.1.tar.gz"
MD5SUM="9080b4c0a4e6383d841c51d4d245cad8"
DOWNLOAD_x86_64=""
diff --git a/games/chocolate_duke3D/README b/games/chocolate_duke3D/README
index 408645bb02..3b9ef785b6 100644
--- a/games/chocolate_duke3D/README
+++ b/games/chocolate_duke3D/README
@@ -1,3 +1,5 @@
+chocolate_duke3D (Faithful Duke Nukem 3D port)
+
Chocolate Duke Nukem 3D is the equivalent of Chocolate Doom.
A port that:
diff --git a/games/chocolate_duke3D/chocolate_duke3D.SlackBuild b/games/chocolate_duke3D/chocolate_duke3D.SlackBuild
index e3451ea490..20d22e3ee9 100644
--- a/games/chocolate_duke3D/chocolate_duke3D.SlackBuild
+++ b/games/chocolate_duke3D/chocolate_duke3D.SlackBuild
@@ -27,6 +27,10 @@
# Now maintained by B. Watson (yalhcru@gmail.com)
+# 20211004 bkw: look at upstream again, the only new commit makes the
+# build include the bundled enet headers instead of the system ones,
+# which we *don't* want. So, don't bother updating again.
+
# 20170313 bkw:
# - i486 => i586
# - actually use SLKCFLAGS
@@ -54,9 +58,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -89,11 +90,8 @@ rm -rf $PRGNAM-$COMMIT
unzip $CWD/$PRGNAM-$COMMIT.zip
cd $PRGNAM-$COMMIT
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# Let's compile!
./autogen.sh
diff --git a/games/circuslinux/README b/games/circuslinux/README
index 07bf15f0a6..5a02780c0f 100644
--- a/games/circuslinux/README
+++ b/games/circuslinux/README
@@ -1,3 +1,5 @@
+circuslinux (clone of the Atari 2600 game "Circus Atari")
+
"Circus Linux!" is a clone of the Atari 2600 game "Circus Atari,"
produced by Atari, Inc. (which is itself a clone of an earlier arcade
game named, simply "Circus").
diff --git a/games/circuslinux/circuslinux.SlackBuild b/games/circuslinux/circuslinux.SlackBuild
index 2dcb63b75f..8746ed81c0 100644
--- a/games/circuslinux/circuslinux.SlackBuild
+++ b/games/circuslinux/circuslinux.SlackBuild
@@ -23,9 +23,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -54,11 +51,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/games/clonekeen/clonekeen.SlackBuild b/games/clonekeen/clonekeen.SlackBuild
index 0dac845a1e..07cbd121c9 100644
--- a/games/clonekeen/clonekeen.SlackBuild
+++ b/games/clonekeen/clonekeen.SlackBuild
@@ -22,9 +22,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -55,17 +52,14 @@ rm -rf $SRCDIR
tar xvf $CWD/$PRGNAM-src-${VERSION/./}.tar.gz
cd $SRCDIR
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# Fix underlinking
sed -i "s|-lstdc++|-lstdc++ -lm|" src/Makefile
# Makefile doesn't use CFLAGS, ugh
-sed -i "/gcc/s/-O2/$SLKCFLAGS/" src/Makefile
+sed -i "/gcc/s/-O2/$SLKCFLAGS -fcommon/" src/Makefile
# Ugh. The src tarball ships with compiled .o files!
rm -f platform/*.o
diff --git a/games/clonekeen/clonekeen.info b/games/clonekeen/clonekeen.info
index 643d30f824..3d9b8b4285 100644
--- a/games/clonekeen/clonekeen.info
+++ b/games/clonekeen/clonekeen.info
@@ -1,8 +1,8 @@
PRGNAM="clonekeen"
VERSION="8.4"
HOMEPAGE="http://clonekeen.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/clonekeen/clonekeen-src-84.tar.gz \
- http://downloads.sourceforge.net/clonekeen/CKBeta83_Bin_W32.zip \
+DOWNLOAD="https://downloads.sourceforge.net/clonekeen/clonekeen-src-84.tar.gz \
+ https://downloads.sourceforge.net/clonekeen/CKBeta83_Bin_W32.zip \
ftp://ftp.3drealms.com/share/1keen.zip"
MD5SUM="0179c34727d044f07a1c00df340134bd \
a0dfcd00f3d039ef544f344b605f83bd \
diff --git a/games/colem/colem.SlackBuild b/games/colem/colem.SlackBuild
index 272541ebbc..2566fcceeb 100644
--- a/games/colem/colem.SlackBuild
+++ b/games/colem/colem.SlackBuild
@@ -6,6 +6,7 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211004 bkw: updated for 5.6.
# 20210220 bkw: updated for 5.5.
# 20201026 bkw:
# - updated for 5.4.
@@ -66,7 +67,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=colem
-VERSION=${VERSION:-5.5}
+VERSION=${VERSION:-5.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -79,9 +80,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -130,7 +128,7 @@ chown -R root:root .
find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
\! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-sed -i "s/-O2/$SLKCFLAGS/" EMULib/Rules.gcc
+sed -i "s/-O2/$SLKCFLAGS -fcommon/" EMULib/Rules.gcc
# Make the emulator look in /usr/share/colem and ~/.colem for the
# system ROMs, as well as the current directory. Without this, it's
diff --git a/games/colem/colem.info b/games/colem/colem.info
index 7583471b60..2ba42f6541 100644
--- a/games/colem/colem.info
+++ b/games/colem/colem.info
@@ -1,8 +1,8 @@
PRGNAM="colem"
-VERSION="5.5"
-HOMEPAGE="http://fms.komkon.org/ColEm/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/ColEm55-Source.zip"
-MD5SUM="1c643fb1ed3f1f7514b04ff9e61b2bbd"
+VERSION="5.6"
+HOMEPAGE="https://fms.komkon.org/ColEm/"
+DOWNLOAD="https://slackware.uk/~urchlay/src/ColEm56-Source.zip"
+MD5SUM="8b152a5226f1994216277ff85e521741"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/games/cosmic_assault/cosmic_assault.SlackBuild b/games/cosmic_assault/cosmic_assault.SlackBuild
index 03964e2ab3..a6782f51ce 100644
--- a/games/cosmic_assault/cosmic_assault.SlackBuild
+++ b/games/cosmic_assault/cosmic_assault.SlackBuild
@@ -16,9 +16,6 @@ PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -39,11 +36,8 @@ rm -rf $PRGNAM
tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
cd $PRGNAM
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
mkdir -p $PKG/usr/games $PKG/usr/share/games/$PRGNAM
install -m0755 $PRGNAM.py $PKG/usr/share/games/$PRGNAM
diff --git a/games/cosmosmash/cosmosmash.SlackBuild b/games/cosmosmash/cosmosmash.SlackBuild
index 2f8b1e6d6a..048c2afc15 100644
--- a/games/cosmosmash/cosmosmash.SlackBuild
+++ b/games/cosmosmash/cosmosmash.SlackBuild
@@ -9,7 +9,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=cosmosmash
-VERSION=${VERSION:-1.4.7}
+VERSION=${VERSION:-1.4.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +22,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -57,11 +54,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/games/cosmosmash/cosmosmash.info b/games/cosmosmash/cosmosmash.info
index cb0c9edf8d..20759e77b8 100644
--- a/games/cosmosmash/cosmosmash.info
+++ b/games/cosmosmash/cosmosmash.info
@@ -1,8 +1,8 @@
PRGNAM="cosmosmash"
-VERSION="1.4.7"
+VERSION="1.4.8"
HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/cosmosmash.html"
-DOWNLOAD="https://slackware.uk/~urchlay/src/cosmosmash-1.4.7.tar.gz"
-MD5SUM="f0c040b7dca95582e1b77da70d0cbf4a"
+DOWNLOAD="https://slackware.uk/~urchlay/src/cosmosmash-1.4.8.tar.gz"
+MD5SUM="5ae2d6415b0ac1b44baee4a04280b354"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="flatzebra"
diff --git a/games/darkplaces/darkplaces.SlackBuild b/games/darkplaces/darkplaces.SlackBuild
index 3fc95fddd0..1fcf44a837 100644
--- a/games/darkplaces/darkplaces.SlackBuild
+++ b/games/darkplaces/darkplaces.SlackBuild
@@ -100,6 +100,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+( cd darkplaces
+ patch -p1 < $CWD/gcc11.patch )
+
if [ "$SOURCE" != "NO" ]; then
cd $PRGNAM
make OPTIM_RELEASE="$SLKCFLAGS" release
diff --git a/games/darkplaces/gcc11.patch b/games/darkplaces/gcc11.patch
new file mode 100644
index 0000000000..ec653f8bc8
--- /dev/null
+++ b/games/darkplaces/gcc11.patch
@@ -0,0 +1,89 @@
+--- a/dpsoftrast.c 2013-02-07 11:40:40.000000000 +0000
++++ b/dpsoftrast.c 2021-04-30 04:45:31.276607019 +0000
+@@ -21,6 +21,7 @@
+ #if defined(__APPLE__)
+ #include <libkern/OSAtomic.h>
+ #define ALIGN(var) var __attribute__((__aligned__(16)))
++ #define ALIGN_STRUCT(def) struct __attribute__((__aligned__(16))) def
+ #define ATOMIC(var) var __attribute__((__aligned__(4)))
+ #define MEMORY_BARRIER (_mm_sfence())
+ #define ATOMIC_COUNTER volatile int32_t
+@@ -29,6 +30,7 @@
+ #define ATOMIC_ADD(counter, val) ((void)OSAtomicAdd32Barrier((val), &(counter)))
+ #elif defined(__GNUC__) && defined(WIN32)
+ #define ALIGN(var) var __attribute__((__aligned__(16)))
++ #define ALIGN_STRUCT(def) struct __attribute__((__aligned__(16))) def
+ #define ATOMIC(var) var __attribute__((__aligned__(4)))
+ #define MEMORY_BARRIER (_mm_sfence())
+ //(__sync_synchronize())
+@@ -43,6 +45,7 @@
+ #define ATOMIC_ADD(counter, val) ((void)InterlockedExchangeAdd((LONG *) &(counter), (val)))
+ #elif defined(__GNUC__)
+ #define ALIGN(var) var __attribute__((__aligned__(16)))
++ #define ALIGN_STRUCT(def) struct __attribute__((__aligned__(16))) def
+ #define ATOMIC(var) var __attribute__((__aligned__(4)))
+ #define MEMORY_BARRIER (_mm_sfence())
+ //(__sync_synchronize())
+@@ -52,6 +55,7 @@
+ #define ATOMIC_ADD(counter, val) ((void)__sync_fetch_and_add(&(counter), (val)))
+ #elif defined(_MSC_VER)
+ #define ALIGN(var) __declspec(align(16)) var
++ #define ALIGN_STRUCT(def) ALIGN(struct def)
+ #define ATOMIC(var) __declspec(align(4)) var
+ #define MEMORY_BARRIER (_mm_sfence())
+ //(MemoryBarrier())
+@@ -65,6 +69,9 @@
+ #ifndef ALIGN
+ #define ALIGN(var) var
+ #endif
++#ifndef ALIGN_STRUCT
++#define ALIGN_STRUCT(def) def
++#endif
+ #ifndef ATOMIC
+ #define ATOMIC(var) var
+ #endif
+@@ -163,7 +170,7 @@
+ #define DPSOFTRAST_DRAW_MAXCOMMANDPOOL 2097152
+ #define DPSOFTRAST_DRAW_MAXCOMMANDSIZE 16384
+
+-typedef ALIGN(struct DPSOFTRAST_State_Command_Pool_s
++typedef ALIGN_STRUCT(DPSOFTRAST_State_Command_Pool_s
+ {
+ int freecommand;
+ int usedcommands;
+@@ -171,7 +178,7 @@
+ }
+ DPSOFTRAST_State_Command_Pool);
+
+-typedef ALIGN(struct DPSOFTRAST_State_Triangle_s
++typedef ALIGN_STRUCT(DPSOFTRAST_State_Triangle_s
+ {
+ unsigned char mip[DPSOFTRAST_MAXTEXTUREUNITS]; // texcoord to screen space density values (for picking mipmap of textures)
+ float w[3];
+@@ -198,7 +205,7 @@
+
+ #define DPSOFTRAST_DRAW_MAXSUBSPAN 16
+
+-typedef ALIGN(struct DPSOFTRAST_State_Span_s
++typedef ALIGN_STRUCT(DPSOFTRAST_State_Span_s
+ {
+ int triangle; // triangle this span was generated by
+ int x; // framebuffer x coord
+@@ -236,7 +243,7 @@
+ }
+ DPSOFTRAST_BLENDMODE;
+
+-typedef ALIGN(struct DPSOFTRAST_State_Thread_s
++typedef ALIGN_STRUCT(DPSOFTRAST_State_Thread_s
+ {
+ void *thread;
+ int index;
+@@ -302,7 +309,7 @@
+ }
+ DPSOFTRAST_State_Thread);
+
+-typedef ALIGN(struct DPSOFTRAST_State_s
++typedef ALIGN_STRUCT(DPSOFTRAST_State_s
+ {
+ int fb_width;
+ int fb_height;
diff --git a/games/defendguin/README b/games/defendguin/README
index 230724d2dd..cb381f59e3 100644
--- a/games/defendguin/README
+++ b/games/defendguin/README
@@ -1,3 +1,5 @@
+defendguin (clone of the arcade game Defender)
+
Defendguin is a clone of the arcade game "Defender," but with a Linux
theme. Your mission is to defend little penguinoids from being captured
and mutated.
diff --git a/games/defendguin/defendguin.SlackBuild b/games/defendguin/defendguin.SlackBuild
index ed61b330bd..553834ab9d 100644
--- a/games/defendguin/defendguin.SlackBuild
+++ b/games/defendguin/defendguin.SlackBuild
@@ -22,9 +22,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -51,11 +48,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
patch -p1 < $CWD/install_paths.diff
patch -p1 < $CWD/man.diff
diff --git a/games/doom_shareware_data/README b/games/doom_shareware_data/README
index 33a1103195..ff00fc881c 100644
--- a/games/doom_shareware_data/README
+++ b/games/doom_shareware_data/README
@@ -1,5 +1,8 @@
+doom_shareware_data (game data from the shareware Doom release)
+
Game data from the shareware release of Doom (doom1.wad, v1.9). Includes
only the first episode of the game.
-You'll need a Doom engine to use this. Currently slackbuilds.org offers
-zdoom, prboom, prboom-plus, odamex, and skulltag.
+You'll need a Doom engine to use this. Currently slackbuilds.org
+offers zdoom, prboom, prboom-plus, odamex, chocolate-doom, skulltag,
+and probably a few more.
diff --git a/games/doom_shareware_data/doom_shareware_data.SlackBuild b/games/doom_shareware_data/doom_shareware_data.SlackBuild
index 63fd7ca72d..46f4523410 100644
--- a/games/doom_shareware_data/doom_shareware_data.SlackBuild
+++ b/games/doom_shareware_data/doom_shareware_data.SlackBuild
@@ -6,6 +6,9 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211005 bkw: original FTP site is gone, use new download link.
+# Also, don't extract the files we don't need.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=doom_shareware_data
@@ -16,9 +19,6 @@ PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -36,17 +36,13 @@ cd $TMP
rm -rf $PRGNAM-$VERSION
mkdir -p $PRGNAM-$VERSION
cd $PRGNAM-$VERSION
-unzip $CWD/doom19s.zip
+unzip $CWD/doom19s.zip '*.1' '*.2'
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+chmod 644 *
# Zip file is split into 2 chunks
-cat DOOMS_19.1 DOOMS_19.2 > doom.zip
-unzip doom.zip
+cat DOOMS_19.1 DOOMS_19.2 > doomtmp.zip
+unzip doomtmp.zip '*.WAD' 'DMFAQ*.*'
mkdir -p $PKG/usr/share/games/doom
install -m0644 DOOM1.WAD $PKG/usr/share/games/doom/doom1.wad
diff --git a/games/doom_shareware_data/doom_shareware_data.info b/games/doom_shareware_data/doom_shareware_data.info
index a970ff0613..2f5497a0b6 100644
--- a/games/doom_shareware_data/doom_shareware_data.info
+++ b/games/doom_shareware_data/doom_shareware_data.info
@@ -1,7 +1,7 @@
PRGNAM="doom_shareware_data"
VERSION="1.9"
-HOMEPAGE="ftp://ftp.idsoftware.com/idstuff/doom/doom19s.txt"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/doom19s.zip"
+HOMEPAGE="https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/doom/doom19s.txt"
+DOWNLOAD="https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/doom/doom19s.zip"
MD5SUM="244d181457c9be5f28b91b488e67e042"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/games/doomretro/doomretro.SlackBuild b/games/doomretro/doomretro.SlackBuild
index fa832a3ce2..8b8e2ceb57 100644
--- a/games/doomretro/doomretro.SlackBuild
+++ b/games/doomretro/doomretro.SlackBuild
@@ -23,6 +23,9 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20211006 bkw:
+# - update for v4.2.3.
+# - get rid of wrapper script; game now picks an IWAD itself.
# 20210224 bkw: update for v4.0.3
# 20200927 bkw: update for v3.6.1, reformat README to 72 chars
# 20200804 bkw: update for v3.5.10
@@ -32,19 +35,10 @@
# - move binary to /usr/games
# - include wrapper script
-# *** RANT MODE ON***
-# Every Doom engine on the planet besides this one attempts to load *some*
-# IWAD file, if you don't give it one on the command line. But this one is
-# supposed to pop up a file dialog to let you choose one. Only the dialog
-# code hasn't been ported to Linux. So for us, unlike *all other* Doom
-# source ports, we *must* specify the IWAD file on the command line. So I
-# have to use a wrapper script to make it act like a normal Doom engine...
-# *** RANT MODE OFF***
-
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=doomretro
-VERSION=${VERSION:-4.0.3}
+VERSION=${VERSION:-4.2.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -57,9 +51,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -113,10 +104,7 @@ cd build
make install/strip DESTDIR=$PKG
cd ..
-mkdir -p $PKG/usr/games
-mv $PKG/usr/bin/$PRGNAM $PKG/usr/games/$PRGNAM.bin
-rm -rf $PKG/usr/bin
-install -m0755 -oroot -groot $CWD/$PRGNAM.sh $PKG/usr/games/$PRGNAM
+mv $PKG/usr/bin $PKG/usr/games
mkdir -p $PKG/usr/share/applications
cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
@@ -126,6 +114,8 @@ convert res/$PRGNAM.ico[0] $PKG/usr/share/icons/hicolor/256x256/apps/$PRGNAM.png
convert res/$PRGNAM.ico[1] $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
convert res/$PRGNAM.ico[2] $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png
convert res/$PRGNAM.ico[3] $PKG/usr/share/icons/hicolor/24x24/apps/$PRGNAM.png
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a CODEOWNERS LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/doomretro/doomretro.info b/games/doomretro/doomretro.info
index 3795f10a74..e822117936 100644
--- a/games/doomretro/doomretro.info
+++ b/games/doomretro/doomretro.info
@@ -1,8 +1,8 @@
PRGNAM="doomretro"
-VERSION="4.0.3"
+VERSION="4.2.3"
HOMEPAGE="https://www.doomretro.com"
-DOWNLOAD="https://github.com/bradharding/doomretro/archive/v4.0.3/doomretro-4.0.3.tar.gz"
-MD5SUM="5277a9aa632f31d68729f5fa5ce9318f"
+DOWNLOAD="https://github.com/bradharding/doomretro/archive/v4.2.3/doomretro-4.2.3.tar.gz"
+MD5SUM="809a9f73b7892dca8e4103867fe85c93"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/games/doomretro/doomretro.sh b/games/doomretro/doomretro.sh
deleted file mode 100644
index 71b6a0b4f8..0000000000
--- a/games/doomretro/doomretro.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-# doomretro.sh by B. Watson. Part of the SlackBuilds.org doomretro build.
-# Licensed under the WTFPL.
-
-# 20200414 bkw: doomretro on Linux doesn't open any IWAD file by default,
-# and doesn't offer a file-chooser dialog. So this wrapper script tries
-# to pick a suitable IWAD to use, if it can find one. Notice that this
-# only happens if we're run with no arguments.
-
-# Can't use an absolute path for this, or else the engine expects to
-# read doomretro.wad and write doomretro.cfg to the same directory as
-# the binary.
-realbin=doomretro.bin
-
-if [ "$1" ]; then
- # we got arguments, just use them as-is
- exec $realbin "$@"
-fi
-
-# no args, so try to find an IWAD and pass it as an arg to the real exe.
-wadpath="$DOOMWADDIR:\
-$DOOMWADPATH:\
-.:\
-/usr/share/games/doom:\
-/usr/local/share/games/doom:\
-/usr/share/doomretro:\
-/usr/share/doom:\
-/usr/local/doom:\
-$HOME:\
-$HOME/doom:\
-$HOME/.doom:\
-$HOME/.doomwads"
-
-iwads="doom2.wad:doom.wad:doom1.wad"
-
-IFS=:
-for dir in $wadpath; do
- if [ -d "$dir" ]; then
- for wad in $iwads; do
- wad="$dir/$wad"
- if [ -e "$wad" ]; then
- echo "$( basename $0 ): Using $wad" 1>&2
- exec $realbin "$wad"
- fi
- done
- fi
-done
-
-# if we get, no wads found, let the real binary complain about it
-exec $realbin
diff --git a/games/dunelegacy/README b/games/dunelegacy/README
index e9c1cd7a82..f6230d5b0f 100644
--- a/games/dunelegacy/README
+++ b/games/dunelegacy/README
@@ -1,17 +1,20 @@
+dunelegacy (real-time strategy game)
+
Dune Legacy is an effort by a handful of developers to revitalize the
-first-ever real-time strategy game. The original game was the basis for
-the hugely successful Command and Conquer series, and the gameplay has
-been replicated an extended to a wide variety of storylines and series.
+first-ever real-time strategy game. The original game was the basis
+for the hugely successful Command and Conquer series, and the gameplay
+has been replicated and extended to a wide variety of storylines and
+series.
Lead one of three interplanetary houses, Atreides, Harkonnen or Ordos,
in an attempt to harvest the largest amount of spice from the sand
-dunes. Exchange your spice stockpiles for credits through refinement and
-build an army capable of thwarting attempts of the other houses to stop
-your harvesting!
+dunes. Exchange your spice stockpiles for credits through refinement
+and build an army capable of thwarting attempts of the other houses to
+stop your harvesting!
-Dune Legacy is a game engine only. To play the game, you must have the
-data files (*.PAK) from the full version (not the demo) of the original
-game, in /usr/share/dunelegacy. More info here:
+Dune Legacy is a game engine only. To play the game, you must have
+the data files (*.PAK) from the full version (not the demo) of the
+original game, in /usr/share/dunelegacy. More info here:
http://sourceforge.net/apps/mediawiki/dunelegacy/index.php?title=Pakfilelist
diff --git a/games/dunelegacy/dunelegacy.SlackBuild b/games/dunelegacy/dunelegacy.SlackBuild
index 99ea238882..2a5231442a 100644
--- a/games/dunelegacy/dunelegacy.SlackBuild
+++ b/games/dunelegacy/dunelegacy.SlackBuild
@@ -26,9 +26,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -61,11 +58,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION-src.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# Use our CFLAGS. Environment is ignored by configure script.
sed -i "s/-O3/$SLKCFLAGS/" configure
diff --git a/games/dunelegacy/dunelegacy.info b/games/dunelegacy/dunelegacy.info
index a4a5d5fba1..c5fa5c4988 100644
--- a/games/dunelegacy/dunelegacy.info
+++ b/games/dunelegacy/dunelegacy.info
@@ -1,7 +1,7 @@
PRGNAM="dunelegacy"
VERSION="0.96.4"
HOMEPAGE="http://dunelegacy.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/dunelegacy/dunelegacy/0.96.4/dunelegacy-0.96.4-src.tar.bz2"
+DOWNLOAD="https://downloads.sourceforge.net/project/dunelegacy/dunelegacy/0.96.4/dunelegacy-0.96.4-src.tar.bz2"
MD5SUM="de1d0a529cc32ba5d909bf1570272434"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/games/dunelegacy/slack-desc b/games/dunelegacy/slack-desc
index 245a361efc..1a54791a76 100644
--- a/games/dunelegacy/slack-desc
+++ b/games/dunelegacy/slack-desc
@@ -11,8 +11,8 @@ dunelegacy:
dunelegacy: Dune Legacy is an effort by a handful of developers to revitalize
dunelegacy: the first-ever real-time strategy game. The original game was the
dunelegacy: basis for the hugely successful Command and Conquer series, and
-dunelegacy: the gameplay has been replicated an extended to a wide variety of
-dunelegacy: storylines and series. Lead one of three interplanetary houses,
+dunelegacy: the gameplay has been replicated and extended to a wide variety of
+dunelegacy: storylines and series. Lead one of three interplanetary houses,
dunelegacy: Atreides, Harkonnen or Ordos, in an attempt to harvest the largest
dunelegacy: amount of spice from the sand dunes. Exchange your spice stockpiles
dunelegacy: for credits through refinement and build an army capable of thwarting
diff --git a/games/dungeon/dungeon.SlackBuild b/games/dungeon/dungeon.SlackBuild
index b1be11bcf7..ef639c011a 100644
--- a/games/dungeon/dungeon.SlackBuild
+++ b/games/dungeon/dungeon.SlackBuild
@@ -6,11 +6,13 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211006 bkw: BUILD=3, fix -current build.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=dungeon
VERSION=${VERSION:-19800808}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +24,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -65,10 +64,11 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
+chmod 644 *
[ "${DEBUG:-no}" = "yes" ] && DFLAG='DEBUG=1'
-make FFLAGS="$SLKCFLAGS" $DFLAG
+make FFLAGS="$SLKCFLAGS -fallow-invalid-boz" $DFLAG
make install DESTDIR=$PKG
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/enigma/enigma.SlackBuild b/games/enigma/enigma.SlackBuild
index 87444c1cad..04c9acca8c 100644
--- a/games/enigma/enigma.SlackBuild
+++ b/games/enigma/enigma.SlackBuild
@@ -49,9 +49,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/eureka/README b/games/eureka/README
index c848a450e7..5098397fb5 100644
--- a/games/eureka/README
+++ b/games/eureka/README
@@ -1,3 +1,5 @@
+eureka (DOOM level editor)
+
Eureka is a cross-platform DOOM level editor using the FLTK widget
library. It is based on Yadex and provides a new interface, support for
source ports and a 3D preview feature.
diff --git a/games/eureka/eureka.SlackBuild b/games/eureka/eureka.SlackBuild
index c1f0dc7541..85bba4722d 100644
--- a/games/eureka/eureka.SlackBuild
+++ b/games/eureka/eureka.SlackBuild
@@ -47,9 +47,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/eureka/eureka.info b/games/eureka/eureka.info
index 42ea041c67..6aedadfdb3 100644
--- a/games/eureka/eureka.info
+++ b/games/eureka/eureka.info
@@ -1,7 +1,7 @@
PRGNAM="eureka"
VERSION="1.27b"
HOMEPAGE="http://eureka-editor.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/eureka-editor/Eureka/1.27/eureka-1.27b-source.tar.gz"
+DOWNLOAD="https://downloads.sourceforge.net/project/eureka-editor/Eureka/1.27/eureka-1.27b-source.tar.gz"
MD5SUM="ded6495c09e23bfe55513eb47abf17ea"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/games/extremetuxracer/extremetuxracer.SlackBuild b/games/extremetuxracer/extremetuxracer.SlackBuild
index c5236843cb..0f247e6e7c 100644
--- a/games/extremetuxracer/extremetuxracer.SlackBuild
+++ b/games/extremetuxracer/extremetuxracer.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for extremetuxracer
-# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2021 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -11,21 +11,21 @@
# 1. Redistributions of this script must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=extremetuxracer
-VERSION=${VERSION:-0.7.4}
+VERSION=${VERSION:-0.8.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/games/extremetuxracer/extremetuxracer.info b/games/extremetuxracer/extremetuxracer.info
index d2e9558be8..d70a8fa212 100644
--- a/games/extremetuxracer/extremetuxracer.info
+++ b/games/extremetuxracer/extremetuxracer.info
@@ -1,8 +1,8 @@
PRGNAM="extremetuxracer"
-VERSION="0.7.4"
+VERSION="0.8.1"
HOMEPAGE="https://sourceforge.net/projects/extremetuxracer/"
-DOWNLOAD="https://downloads.sourceforge.net/extremetuxracer/etr-0.7.4.tar.xz"
-MD5SUM="474b26c3642312c153587b59676b2e86"
+DOWNLOAD="https://downloads.sourceforge.net/extremetuxracer/etr-0.8.1.tar.xz"
+MD5SUM="ddf604db8e3befa26bb5c129042a69db"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="SFML"
diff --git a/games/fizmo/fizmo.SlackBuild b/games/fizmo/fizmo.SlackBuild
index 0957bce88b..cc43c2b105 100644
--- a/games/fizmo/fizmo.SlackBuild
+++ b/games/fizmo/fizmo.SlackBuild
@@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -79,11 +76,8 @@ rm -rf $PRGNAM-$SRCVER
tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
cd $PRGNAM-$SRCVER
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# The configure script doesn't autodetect when sdl2 is missing,
# so let's help it out a little.
diff --git a/games/fizmo/fizmo.info b/games/fizmo/fizmo.info
index f84df8543d..739a540c1a 100644
--- a/games/fizmo/fizmo.info
+++ b/games/fizmo/fizmo.info
@@ -1,6 +1,6 @@
PRGNAM="fizmo"
VERSION="0.8.5"
-HOMEPAGE="http://spellbreaker.org/~chrender/fizmo/"
+HOMEPAGE="https://spellbreaker.org/~chrender/fizmo/"
DOWNLOAD="https://github.com/chrender/fizmo/releases/download/fizmo_0-8-5/fizmo-0.8.5.tar.gz"
MD5SUM="fcc689fbff12f6e122f37f7f8c9ec31e"
DOWNLOAD_x86_64=""
diff --git a/games/flare-game/flare-game.SlackBuild b/games/flare-game/flare-game.SlackBuild
index c4500d9d0b..31f88467b3 100644
--- a/games/flare-game/flare-game.SlackBuild
+++ b/games/flare-game/flare-game.SlackBuild
@@ -26,7 +26,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=flare-game
-VERSION=${VERSION:-1.11}
+VERSION=${VERSION:-1.12}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/games/flare-game/flare-game.info b/games/flare-game/flare-game.info
index e34d264161..23f3b1378c 100644
--- a/games/flare-game/flare-game.info
+++ b/games/flare-game/flare-game.info
@@ -1,8 +1,8 @@
PRGNAM="flare-game"
-VERSION="1.11"
+VERSION="1.12"
HOMEPAGE="https://github.com/flareteam/flare-game"
-DOWNLOAD="https://github.com/flareteam/flare-game/archive/v1.11/flare-game-1.11.tar.gz"
-MD5SUM="c80107d26879682261fcb69e0252fc26"
+DOWNLOAD="https://github.com/flareteam/flare-game/archive/v1.12/flare-game-1.12.tar.gz"
+MD5SUM="23c327ef7613d20642cc24ad80e69573"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="flare"
diff --git a/games/flare/flare.SlackBuild b/games/flare/flare.SlackBuild
index 199c832751..cfb9a4193f 100644
--- a/games/flare/flare.SlackBuild
+++ b/games/flare/flare.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=flare
SRCNAM=$PRGNAM-engine
-VERSION=${VERSION:-1.11}
+VERSION=${VERSION:-1.12}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/games/flare/flare.info b/games/flare/flare.info
index cd2274be5c..6bf98c0876 100644
--- a/games/flare/flare.info
+++ b/games/flare/flare.info
@@ -1,8 +1,8 @@
PRGNAM="flare"
-VERSION="1.11"
-HOMEPAGE="http://flarerpg.org/"
-DOWNLOAD="https://github.com/flareteam/flare-engine/archive/v1.11/flare-engine-1.11.tar.gz"
-MD5SUM="f7ef0642decebbc7348c334330f632a2"
+VERSION="1.12"
+HOMEPAGE="https://flarerpg.org/"
+DOWNLOAD="https://github.com/flareteam/flare-engine/archive/v1.12/flare-engine-1.12.tar.gz"
+MD5SUM="f0352b87030824683265c111efc8f2ba"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/games/fortune-dune/fortune-dune.SlackBuild b/games/fortune-dune/fortune-dune.SlackBuild
index 5ed1be3d3a..7496725785 100644
--- a/games/fortune-dune/fortune-dune.SlackBuild
+++ b/games/fortune-dune/fortune-dune.SlackBuild
@@ -6,19 +6,19 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211006 bkw: BUILD=2, remove mention of prequels from slack-desc
+# if PREQUELS=no.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=fortune-dune
VERSION=${VERSION:-2.0.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -37,20 +37,15 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# Don't trust the prebuilt index files
rm -f *.dat
# The fan base is divided on the "Prequels suck! No, prequels rule!" issue,
# so accomodate both sides of the debate.
-if [ "${PREQUELS:-yes}" = "no" ]; then
- rm -f house-*
-fi
+[ "${PREQUELS:-yes}" = "no" ] && rm -f house-*
# Instead of separate per-book fortune files, let's just have one big one.
# There just aren't enough quotes to justify splitting them up.
@@ -66,6 +61,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+[ "${PREQUELS:-yes}" = "no" ] && sed -i '19s,:.*,:,' $PKG/install/slack-desc
+
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/games/fortune-farscape/fortune-farscape.SlackBuild b/games/fortune-farscape/fortune-farscape.SlackBuild
index b8474bace0..20c019bd68 100644
--- a/games/fortune-farscape/fortune-farscape.SlackBuild
+++ b/games/fortune-farscape/fortune-farscape.SlackBuild
@@ -22,9 +22,6 @@ TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/fortune-futurama/fortune-futurama.SlackBuild b/games/fortune-futurama/fortune-futurama.SlackBuild
index f3b4ba4005..867a747160 100644
--- a/games/fortune-futurama/fortune-futurama.SlackBuild
+++ b/games/fortune-futurama/fortune-futurama.SlackBuild
@@ -17,9 +17,6 @@ PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/fortune-game_of_thrones/fortune-game_of_thrones.SlackBuild b/games/fortune-game_of_thrones/fortune-game_of_thrones.SlackBuild
index 7389a6e3b9..9e951f91b9 100644
--- a/games/fortune-game_of_thrones/fortune-game_of_thrones.SlackBuild
+++ b/games/fortune-game_of_thrones/fortune-game_of_thrones.SlackBuild
@@ -12,7 +12,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=fortune-game_of_thrones
-VERSION=${VERSION:-20170524}
+VERSION=${VERSION:-20210128}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -25,9 +25,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/fortune-game_of_thrones/fortune-game_of_thrones.info b/games/fortune-game_of_thrones/fortune-game_of_thrones.info
index 0b6686bc55..a1a7c36a64 100644
--- a/games/fortune-game_of_thrones/fortune-game_of_thrones.info
+++ b/games/fortune-game_of_thrones/fortune-game_of_thrones.info
@@ -1,8 +1,8 @@
PRGNAM="fortune-game_of_thrones"
-VERSION="20170524"
-HOMEPAGE="http://www.innermind.com/software/quotes/files/qfiles.htm"
-DOWNLOAD="http://www.innermind.com/software/quotes/files/Game_of_Thrones-quotes.zip"
-MD5SUM="51e800c75b4e0486482ca4e6a909f0c0"
+VERSION="20210128"
+HOMEPAGE="https://www.innermind.com/software/quotes/files/qfiles.htm"
+DOWNLOAD="https://www.innermind.com/software/quotes/files/Game_of_Thrones-quotes.zip"
+MD5SUM="6ccfb925ed727b2ea79047fc2edd7ce8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/games/fortune-noobfarm/fortune-noobfarm.SlackBuild b/games/fortune-noobfarm/fortune-noobfarm.SlackBuild
index 0da893d343..18eaaa51dc 100644
--- a/games/fortune-noobfarm/fortune-noobfarm.SlackBuild
+++ b/games/fortune-noobfarm/fortune-noobfarm.SlackBuild
@@ -15,9 +15,6 @@ TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/fortune-slackware/fortune-slackware.SlackBuild b/games/fortune-slackware/fortune-slackware.SlackBuild
index 8f756858a1..9de3e2473c 100644
--- a/games/fortune-slackware/fortune-slackware.SlackBuild
+++ b/games/fortune-slackware/fortune-slackware.SlackBuild
@@ -15,9 +15,6 @@ TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/fortune-slackware/fortune-slackware.info b/games/fortune-slackware/fortune-slackware.info
index 2f631dc4c5..c57691b86b 100644
--- a/games/fortune-slackware/fortune-slackware.info
+++ b/games/fortune-slackware/fortune-slackware.info
@@ -1,6 +1,6 @@
PRGNAM="fortune-slackware"
VERSION="1.15"
-HOMEPAGE="http://web.archive.org/web/20110816020410/http://fauxascii.com/linux/mod_quotes.html"
+HOMEPAGE="https://web.archive.org/web/20110816020410/http://fauxascii.com/linux/mod_quotes.html"
DOWNLOAD="https://slackware.uk/~urchlay/src/slack-fortunes-all-1.15.tgz"
MD5SUM="8fbf56ffc9ebceda518f02b3a8d0e55e"
DOWNLOAD_x86_64=""
diff --git a/games/fortune-starwars/fortune-starwars.SlackBuild b/games/fortune-starwars/fortune-starwars.SlackBuild
index a9d1bcbe49..51634b12cb 100644
--- a/games/fortune-starwars/fortune-starwars.SlackBuild
+++ b/games/fortune-starwars/fortune-starwars.SlackBuild
@@ -18,9 +18,6 @@ PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/fortune_doctor_who/fortune_doctor_who.SlackBuild b/games/fortune_doctor_who/fortune_doctor_who.SlackBuild
index 4420633089..2d44387d74 100644
--- a/games/fortune_doctor_who/fortune_doctor_who.SlackBuild
+++ b/games/fortune_doctor_who/fortune_doctor_who.SlackBuild
@@ -14,9 +14,6 @@ BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/fortune_doctor_who/fortune_doctor_who.info b/games/fortune_doctor_who/fortune_doctor_who.info
index d02e2b9a95..c58de480d8 100644
--- a/games/fortune_doctor_who/fortune_doctor_who.info
+++ b/games/fortune_doctor_who/fortune_doctor_who.info
@@ -1,12 +1,12 @@
PRGNAM="fortune_doctor_who"
VERSION="20200923"
-HOMEPAGE="http://www.innermind.com/software/quotes/files/qfiles.htm"
-DOWNLOAD="http://www.innermind.com/software/quotes/files/Doctor_Who01-08-quotes.zip \
- http://www.innermind.com/software/quotes/files/Doctor_Who10-quotes.zip \
- http://www.innermind.com/software/quotes/files/Doctor_Who11-quotes.zip \
- http://www.innermind.com/software/quotes/files/Doctor_Who09-quotes.zip \
- http://www.innermind.com/software/quotes/files/Doctor_Who12-quotes.zip \
- http://www.innermind.com/software/quotes/files/Doctor_Who13-quotes.zip"
+HOMEPAGE="https://www.innermind.com/software/quotes/files/qfiles.htm"
+DOWNLOAD="https://www.innermind.com/software/quotes/files/Doctor_Who01-08-quotes.zip \
+ https://www.innermind.com/software/quotes/files/Doctor_Who10-quotes.zip \
+ https://www.innermind.com/software/quotes/files/Doctor_Who11-quotes.zip \
+ https://www.innermind.com/software/quotes/files/Doctor_Who09-quotes.zip \
+ https://www.innermind.com/software/quotes/files/Doctor_Who12-quotes.zip \
+ https://www.innermind.com/software/quotes/files/Doctor_Who13-quotes.zip"
MD5SUM="e26d5ff60423ebd48b28e4e200d4b22f \
4431eeaf5e0f469ccff6d59eaa12bd68 \
13f25a1f6e37c1abd3963de90159db57 \
diff --git a/games/fortune_firefly/README b/games/fortune_firefly/README
index d7df06f7db..620d7a49a5 100644
--- a/games/fortune_firefly/README
+++ b/games/fortune_firefly/README
@@ -1,26 +1,28 @@
+fortune_firefly (fortunes from the TV series "Firefly")
+
This package contains fortunes from the TV series "Firefly", and it's
-movie "Serenity", by Joss Whedon. The series survived only one season
-on Fox; the network scheduled a bad timeslot, played the episodes out
-of order, and in general helped seal its fate. Nonetheless, the series
-built up a cult following; as DVD sales skyrocketted, Universal decided
-to sponsor a movie based on the series.
+movie "Serenity", by Joss Whedon. The series survived only one season
+on Fox; the network scheduled a bad timeslot, played the episodes
+out of order, and in general helped seal its fate. Nonetheless, the
+series built up a cult following; as DVD sales skyrocketted, Universal
+decided to sponsor a movie based on the series.
-Firefly is often described as a "Space Western". A mix of humor
-and seriousness, it is sometimes described as "Star Wars" with
-the Rebellion having been brutally crushed and Han Solo needing a
-new job. Over 500 years in the future, a band of humans terraformed
-a nearby planetary system with dozens of habitable planets. The most
+Firefly is often described as a "Space Western". A mix of humor
+and seriousness, it is sometimes described as "Star Wars" with the
+Rebellion having been brutally crushed and Han Solo needing a new
+job. Over 500 years in the future, a band of humans terraformed a
+nearby planetary system with dozens of habitable planets. The most
developed planets, toward the core, live in "civilization", and formed
the Alliance; the planets on the rim tend to struggle to survive,
-and launched a failed rebellion against Alliance rule. Captain
+and launched a failed rebellion against Alliance rule. Captain
Malcolm Reynolds, a former "browncoat" (rebel) commander, captains
a Firefly-class starship named "Serenity", with a small, mostly
loyal crew, taking whatever jobs (legal or otherwise) that they can.
Their lives become more complicated when, after taking on passengers
-for cover, they inadvertently take in a mentally disturbed girl who the
-Alliance wants more than anything else.
+for cover, they inadvertently take in a mentally disturbed girl who
+the Alliance wants more than anything else.
All of the quotes in this package are copyrighted by Fox Broadcasting
-Corporation and Universal Pictures. Authorship of the quotes is by
-Tim Minear, Joss Whedon, Ben Edulund, Jane Esperson, Drew Z. Greenberg,
+Corporation and Universal Pictures. Authorship of the quotes is by Tim
+Minear, Joss Whedon, Ben Edulund, Jane Esperson, Drew Z. Greenberg,
Jose Molina, Cheryl Cain, and Brent Matthews.
diff --git a/games/fortune_firefly/fortune_firefly.SlackBuild b/games/fortune_firefly/fortune_firefly.SlackBuild
index b4af103324..40698ef4a2 100644
--- a/games/fortune_firefly/fortune_firefly.SlackBuild
+++ b/games/fortune_firefly/fortune_firefly.SlackBuild
@@ -24,9 +24,6 @@ BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/fortune_firefly/slack-desc b/games/fortune_firefly/slack-desc
index 570fa1011c..7363545350 100644
--- a/games/fortune_firefly/slack-desc
+++ b/games/fortune_firefly/slack-desc
@@ -9,7 +9,7 @@
fortune_firefly: fortune_firefly (fortunes from the TV series "Firefly")
fortune_firefly:
fortune_firefly: This package contains fortunes from the TV series "Firefly", and
-fortune_firefly: its movie "Serenity", by Joss Whedon. The series survived only
+fortune_firefly: its movie "Serenity", by Joss Whedon. The series survived only
fortune_firefly: one season on Fox; the network scheduled a bad timeslot, played
fortune_firefly: the episodes out of order, and in general helped seal its fate.
fortune_firefly: Nonetheless, the series built up a cult following; as DVD sales
diff --git a/games/freeblocks/freeblocks.SlackBuild b/games/freeblocks/freeblocks.SlackBuild
index de52f7be10..02efeb850c 100644
--- a/games/freeblocks/freeblocks.SlackBuild
+++ b/games/freeblocks/freeblocks.SlackBuild
@@ -6,14 +6,14 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-# 20170301 bkw:
-# - use long-form github URL
+# 20210808 bkw: fix build on -current
+# 20170301 bkw: use long-form github URL
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=freeblocks
VERSION=${VERSION:-0.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -25,9 +25,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -60,11 +57,15 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20210808 bkw: Build was failing on -current due to duplicate symbols
+# at link time. The correct solution would be a big patch that turns
+# all the declarations in the headers into externs, and add all the
+# declarations as non-extern to some .c file. This seems to work OK
+# though (and the -Wl,-s strips the binary).
+SLKCFLAGS="$SLKCFLAGS -Wl,--allow-multiple-definition -Wl,-s"
mkdir -p build
cd build
@@ -75,10 +76,9 @@ cd build
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release ..
make
- make install DESTDIR=$PKG
+ make install/strip DESTDIR=$PKG
cd ..
-strip $PKG/usr/games/$PRGNAM
sed -i \
'/^Categories/s,\(games\|SDL\);,,g' \
$PKG/usr/share/applications/$PRGNAM.desktop
diff --git a/games/freedoom/freedoom.SlackBuild b/games/freedoom/freedoom.SlackBuild
index a41b8253b9..6dd0b8f3ae 100644
--- a/games/freedoom/freedoom.SlackBuild
+++ b/games/freedoom/freedoom.SlackBuild
@@ -21,9 +21,6 @@ PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/frotz/README b/games/frotz/README
index 20f3a359e6..c4b16bc17f 100644
--- a/games/frotz/README
+++ b/games/frotz/README
@@ -4,10 +4,17 @@ Frotz is an interpreter for Infocom games and other Z-machine games. It
complies with standard 1.0 of Graham Nelson's specification. Games can
be found at: http://www.ifarchive.org/
-Optional dependencies:
+3 executables are always built:
-libmodplug - If this is installed, the curses build (frotz) will
-support sound.
+* frotz - uses curses, no images, needs libmodplug for sound.
+* sfrotz - SDL2 UI, supports images and sound, works great in X11,
+ probably also Wayland (not tested by SlackBuild author).
+* dfrotz - dumb terminal frotz, doesn't support images nor sound.
-SDL2_mixer - If this is installed, the SDL build of frotz (sfrotz) will
-be included in the package. sfrotz always supports sound.
+Optionally, you can set XFROTZ=yes to build:
+
+* xfrotz - native X11 UI, supports images, no sound. Most users won't
+ want this; sfrotz is a better choice on modern X11.
+
+Optional dependency: libmodplug. If this is installed, the curses
+build (frotz) will support sound.
diff --git a/games/frotz/doinst.sh b/games/frotz/doinst.sh
index 9424ce43ff..3d57ee9017 100644
--- a/games/frotz/doinst.sh
+++ b/games/frotz/doinst.sh
@@ -11,3 +11,9 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
/usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
fi
fi
+
+if [ -e usr/share/fonts/misc/Zork_r400-10.pcf ]; then
+ if [ -x /usr/bin/mkfontdir ]; then
+ /usr/bin/mkfontdir usr/share/fonts/misc >/dev/null 2>&1
+ fi
+fi
diff --git a/games/frotz/frotz.SlackBuild b/games/frotz/frotz.SlackBuild
index c18f25dc42..147c52fdbb 100644
--- a/games/frotz/frotz.SlackBuild
+++ b/games/frotz/frotz.SlackBuild
@@ -9,6 +9,12 @@
# Original had no license. This modified version is released under the
# WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211007 bkw:
+# - updated for v2.53.
+# - add optional xfrotz.
+# - expand README.
+# - make slack-desc reflect build options (libmodplug and xfrotz).
+
# 20210215 bkw: fix building without libmodplug. BUILD=2.
# 20201212 bkw: too many changes, can't build older versions.
@@ -28,8 +34,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=frotz
-VERSION=${VERSION:-2.52}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.53}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -41,9 +47,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -87,23 +90,6 @@ sed -i -e 's,invocatio$,&n.,' \
# Document location of config file:
sed -i 's,frotz\.conf,/etc/&,' doc/$PRGNAM.6
-# sfrotz aborts with a "malloc(): memory corruption" error when given
-# a long pathname on the command line. Example:
-
-# $ sfrotz "/export/home/urchlay/interactive_fiction/infocom_collection/The Hitchhikers Guide To The Galaxy (1985)/The Hitchhiker's Guide To The Galaxy R31-871119.z5"
-
-# With a somewhat shorter pathname, the program might not abort, but
-# it will end up with gibberish at the end of f_setup.script_name,
-# which would prevent it from auto-loading scripts (if present).
-
-# I don't fully understand why, but the new_basename() and
-# new_dirname() fuctions in sf_util.c are the culprits. They look OK
-# to me, but getting rid of the calls to free() causes the aborts to
-# go away. Since each function gets called only once (at startup),
-# this doesn't constitute a memory leak worth worrying about.
-
-patch -p1 < $CWD/sfrotz.memcorrupt.diff
-
run_make() {
make \
PREFIX=/usr \
@@ -111,13 +97,19 @@ run_make() {
MANDIR=/usr/man \
MAN_PREFIX=/usr \
BINDIR=/usr/games \
+ MKFONTDIR=/bin/true \
+ X11_FONTDIR=$PKG/usr/share/fonts/misc \
DESTDIR=$PKG \
$1
}
# No autodetection for libmodplug or SDL2_mixer, help it out.
-maintarg="nosound"
-pkg-config --exists libmodplug && maintarg="$PRGNAM"
+maintarg="nosound"; MP=no
+if pkg-config --exists libmodplug; then
+ maintarg="$PRGNAM"
+ MP=yes
+fi
+# on post-14.2 -current and 15.0, sdl2 is part of a full install:
pkg-config --exists sdl2 SDL2_mixer && extra="clean sdl install_sdl"
sed -i "s,-O3.*,$SLKCFLAGS," Makefile
@@ -125,6 +117,17 @@ for target in $maintarg install clean dumb install_dumb $extra; do
run_make $target
done
+# I have no idea why anyone would want this, but in case they do:
+XF=no
+if [ "${XFROTZ:-no}" = "yes" ]; then
+ XF=yes
+ run_make clean
+ run_make x11
+ run_make install_x11
+ mv $PKG/usr/bin/xfrotz $PKG/usr/games
+ rmdir $PKG/usr/bin
+fi
+
strip $PKG/usr/games/*
gzip -9 $PKG/usr/man/man?/*.*
@@ -133,7 +136,14 @@ gzip -9 $PKG/usr/man/man?/*.*
mkdir -p $PKG/usr/share/applications \
$PKG/usr/share/pixmaps \
$PKG/usr/share/icons/hicolor/32x32/apps
-install -m0644 -oroot -groot $CWD/*.desktop $PKG/usr/share/applications
+
+for i in $PKG/usr/games/*; do
+ bin="$( basename $i )"
+ if [ -e $CWD/$bin.desktop ]; then
+ install -m0644 -oroot -groot $CWD/$bin.desktop $PKG/usr/share/applications
+ fi
+done
+
cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
ln -s ../../../../pixmaps/$PRGNAM.png \
$PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png
@@ -155,7 +165,9 @@ cp -a AUTHORS CO* ChangeLog DUMB HOW_TO_PLAY README* TODO *.lsm \
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed -e "s,@MP@,$MP," \
+ -e "s,@XF@,$XF," \
+ $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
diff --git a/games/frotz/frotz.info b/games/frotz/frotz.info
index 3c08902a6b..bb6a954721 100644
--- a/games/frotz/frotz.info
+++ b/games/frotz/frotz.info
@@ -1,8 +1,8 @@
PRGNAM="frotz"
-VERSION="2.52"
+VERSION="2.53"
HOMEPAGE="https://davidgriffith.gitlab.io/frotz/"
-DOWNLOAD="https://gitlab.com/DavidGriffith/frotz/-/archive/2.52/frotz-2.52.tar.bz2"
-MD5SUM="99aeba254257d0ceb2b6bf51650b9d2a"
+DOWNLOAD="https://gitlab.com/DavidGriffith/frotz/-/archive/2.53/frotz-2.53.tar.bz2"
+MD5SUM="02c61ce6de7cd8635f99cb1bc17971e8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/games/frotz/sfrotz.memcorrupt.diff b/games/frotz/sfrotz.memcorrupt.diff
deleted file mode 100644
index a7d49a1ac7..0000000000
--- a/games/frotz/sfrotz.memcorrupt.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur -x '.*.swp' frotz-2.52/src/sdl/sf_util.c frotz-2.52.patched/src/sdl/sf_util.c
---- frotz-2.52/src/sdl/sf_util.c 2020-05-10 19:51:48.000000000 -0400
-+++ frotz-2.52.patched/src/sdl/sf_util.c 2020-12-16 18:33:26.144268039 -0500
-@@ -380,7 +380,6 @@
- static char *new_dirname(const char *path)
- {
- char *p = strdup(path), *p2 = strdup(dirname(p));
-- free(p);
- return p2;
- }
-
-@@ -392,7 +391,6 @@
- static char *new_basename(const char *path)
- {
- char *p = strdup(path), *p2 = strdup(basename(p));
-- free(p);
- return p2;
- }
-
diff --git a/games/frotz/slack-desc b/games/frotz/slack-desc
index 1dde07b4ec..5c8781679c 100644
--- a/games/frotz/slack-desc
+++ b/games/frotz/slack-desc
@@ -12,8 +12,8 @@ frotz: Frotz is an interpreter for Infocom games and other Z-machine games.
frotz: It complies with standard 1.0 of Graham Nelson's specification.
frotz: Games can be found at: http://www.ifarchive.org/
frotz:
-frotz:
-frotz:
-frotz:
+frotz: Build options:
+frotz: * curses frotz sound support: @MP@
+frotz: * xfrotz: @XF@
frotz:
frotz:
diff --git a/games/frotz/xfrotz.desktop b/games/frotz/xfrotz.desktop
new file mode 100644
index 0000000000..9058d9b0ad
--- /dev/null
+++ b/games/frotz/xfrotz.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Name=XFrotz
+GenericName=Z-Code Interpreter
+Comment=X11 Player for Interactive Fiction Games
+Exec=xfrotz %f
+Icon=frotz
+Terminal=false
+Type=Application
+Categories=Game;AdventureGame;
+MimeType=application/x-zmachine;
+NoDisplay=true
+Actions=Play;
+
+[Desktop Action Play]
+Name=Play
+Exec=xfrotz %f
diff --git a/games/frozen-bubble/frozen-bubble-mksrctarball.sh b/games/frozen-bubble/frozen-bubble-mksrctarball.sh
new file mode 100644
index 0000000000..839e65360f
--- /dev/null
+++ b/games/frozen-bubble/frozen-bubble-mksrctarball.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+git clone https://github.com/kthakore/frozen-bubble.git
+
+cd frozen-bubble
+ VERSION="git_$(git log --format="%ad_%h" --date=short | head -n 1 | tr -d -)"
+ LONGDATE="$(git log -1 --format=%cd --date=format:%c )"
+cd ..
+
+mv frozen-bubble frozen-bubble-$VERSION
+
+tar --exclude-vcs -cf frozen-bubble-$VERSION.tar frozen-bubble-$VERSION
+plzip -9 -v frozen-bubble-$VERSION.tar
+touch -d "$LONGDATE" frozen-bubble-$VERSION.tar.lz
+
+rm -rf frozen-bubble-$VERSION
diff --git a/games/frozen-bubble/frozen-bubble.SlackBuild b/games/frozen-bubble/frozen-bubble.SlackBuild
index 87e3fd4efc..c5395e6305 100644
--- a/games/frozen-bubble/frozen-bubble.SlackBuild
+++ b/games/frozen-bubble/frozen-bubble.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for Frozen Bubble
#
# Copyright 2009 Erik W. Hanson, Minneapolis, MN, USA
-# Copyright 2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2017-2021 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -12,22 +12,22 @@
# 1. Redistributions of this script must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=frozen-bubble
-VERSION=${VERSION:-905bf71}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-git_20170702_d6a0291}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -71,7 +71,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.lz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
diff --git a/games/frozen-bubble/frozen-bubble.info b/games/frozen-bubble/frozen-bubble.info
index 86e7ae3bec..33f9703776 100644
--- a/games/frozen-bubble/frozen-bubble.info
+++ b/games/frozen-bubble/frozen-bubble.info
@@ -1,8 +1,8 @@
PRGNAM="frozen-bubble"
-VERSION="905bf71"
+VERSION="git_20170702_d6a0291"
HOMEPAGE="http://www.frozen-bubble.org/"
-DOWNLOAD="http://www.liwjatan.at/files/src/frozen-bubble/frozen-bubble-905bf71.tar.xz"
-MD5SUM="62fa4d53aaaa506eb38dd6595c0ed7cb"
+DOWNLOAD="http://www.liwjatan.at/files/src/frozen-bubble/frozen-bubble-git_20170702_d6a0291.tar.lz"
+MD5SUM="f04690d91e2dba3838e5dc9ce7708f8a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="perl-Compress-Bzip2 perl-File-Slurp perl-IPC-System-Simple perl-Locale-Maketext-Lexicon perl-SDL"
diff --git a/games/glbsp/README b/games/glbsp/README
index bacd32a642..d132e484ad 100644
--- a/games/glbsp/README
+++ b/games/glbsp/README
@@ -1,5 +1,7 @@
+glbsp (OpenGL node builder for Doom engines)
+
glBSP is a node builder specially designed for OpenGL ports of the
-DOOM game engine. It adheres to the "GL-Nodes Specification", which
+DOOM game engine. It adheres to the "GL-Nodes Specification", which
means it adds some new special lumps to a WAD file that makes it easy
and fast for an OpenGL DOOM engine to compute the polygons needed for
drawing the levels.
@@ -8,13 +10,13 @@ There are many DOOM ports that understand the GL-Nodes which glBSP
creates, including: EDGE, the Doomsday engine (JDOOM), PrBoom, Legacy
2.0, Vavoom, Doom3D and ZDoomGL.
-This script builds both the command-line (glbsp) and GUI (glBSPX)
-binaries of glBSP. If you don't need the GUI and/or don't want to
-install fltk, "export OMIT_GUI=yes" in the build script's environment.
+Optional dependency: fltk. If you need the GUI (glBSPX), install fltk
+before running this script. If you have fltk installed but don't want
+glBSPX, export FLTK=no in the script's environment.
The package also includes a C header and a library (what would be
-known as libglbsp-dev on other Linux distributions). By default, a
-dynamic library is created. This works on x86 and x86_64 systems, but
-is untested on others. If you have trouble with the shared library,
+known as libglbsp-dev on other Linux distributions). By default, a
+dynamic library is created. This works on x86 and x86_64 systems, but
+is untested on others. If you have trouble with the shared library,
"export STATIC=yes" in the build script's environment (and please
contact the maintainer of this SlackBuild!)
diff --git a/games/glbsp/doinst.sh b/games/glbsp/doinst.sh
index 4e8ba7071d..3e5691a052 100644
--- a/games/glbsp/doinst.sh
+++ b/games/glbsp/doinst.sh
@@ -2,3 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
diff --git a/games/glbsp/glbsp.SlackBuild b/games/glbsp/glbsp.SlackBuild
index 5b4526c493..8ff894c6c7 100644
--- a/games/glbsp/glbsp.SlackBuild
+++ b/games/glbsp/glbsp.SlackBuild
@@ -6,6 +6,11 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211008 bkw: BUILD=2
+# - include missing *.txt docs.
+# - make fltk an optional dep.
+# - include new-style icons.
+# - add .desktop for nodeview.
# 20170621 bkw: fix build for -current (post-14.2)
# 20151126 bkw: fix build for -current (preparing for 14.2)
@@ -13,7 +18,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=glbsp
VERSION=${VERSION:-2.24}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -25,9 +30,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -62,11 +64,8 @@ rm -rf $PRGNAM-$VERSION-source
tar xvf $CWD/${PRGNAM}_src_${SRCVER}.tar.gz
cd $PRGNAM-$VERSION-source
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# Use fltk-config --cflags and --ldflags instead of hardcoded values
patch -p1 < $CWD/fltkconf.diff
@@ -90,7 +89,8 @@ make -f Makefile.unx install \
gzip -9 $PKG/usr/man/man1/$PRGNAM.1
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PRGNAM.txt $PKG/usr/doc/$PRGNAM-$VERSION
+rm INSTALL.txt
+cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/include/$PRGNAM
@@ -105,24 +105,37 @@ fi
# /usr/include/glbsp.h as a symlink), I will do likewise.
( cd $PKG/usr/include ; ln -s $PRGNAM/$PRGNAM.h $PRGNAM.h ) || exit 1
-# Build with OMIT_GUI=yes if you don't need the GUI (otherwise, fltk is
-# a build dep).
-if [ "${OMIT_GUI:-no}" = "no" ]; then
+INCLUDES="does not include"
+# Build with FLTK=no if have fltk but don't need the GUI.
+if [ "${FLTK:-yes}" = "yes" ] && [ -x /usr/bin/fltk-config ]; then
+ INCLUDES="includes"
make -f Makefile.unx glBSPX
cp glBSPX $PKG/usr/bin
mkdir -p $PKG/usr/share/pixmaps $PKG/usr/share/applications
cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+ cat $CWD/nodeview.desktop > $PKG/usr/share/applications/nodeview.desktop
cat gui/icon.xpm > $PKG/usr/share/pixmaps/$PRGNAM.xpm
cd nodeview
sed -i "s/-O -g3/$SLKCFLAGS/" Makefile.unx
- make -f Makefile.unx
+ make -f Makefile.unx bin
cp nodeview $PKG/usr/bin
cat README.txt TODO.txt > $PKG/usr/doc/$PRGNAM-$VERSION/nodeview.txt
cd ..
+
+# 20211008 bkw: icons were extracted from included OSX icons with
+# libicns, like so:
+# icns2png -x gui/glBSPX.app/Contents/Resources/glbspx.icns
+# rm -f *x1.png
+ for i in 16 32 48 128; do
+ size=${i}x${i}
+ dir=$PKG/usr/share/icons/hicolor/$size/apps
+ mkdir -p $dir
+ cat $CWD/icons/glbspx_${size}x32.png > $dir/$PRGNAM.png
+ done
fi
mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@INCLUDES@,$INCLUDES," < $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
diff --git a/games/glbsp/glbsp.info b/games/glbsp/glbsp.info
index 4a25bbe30b..6fb4262c42 100644
--- a/games/glbsp/glbsp.info
+++ b/games/glbsp/glbsp.info
@@ -1,10 +1,10 @@
PRGNAM="glbsp"
VERSION="2.24"
HOMEPAGE="http://glbsp.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/glbsp/glbsp/2.24/glbsp_src_224.tar.gz"
+DOWNLOAD="https://downloads.sourceforge.net/project/glbsp/glbsp/2.24/glbsp_src_224.tar.gz"
MD5SUM="3f33320cd9cb58075e5e9d76f92940a5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="fltk"
+REQUIRES=""
MAINTAINER="B. Watson"
EMAIL="yalhcru@gmail.com"
diff --git a/games/glbsp/icons/glbspx_128x128x32.png b/games/glbsp/icons/glbspx_128x128x32.png
new file mode 100644
index 0000000000..b4bb3c3c76
--- /dev/null
+++ b/games/glbsp/icons/glbspx_128x128x32.png
Binary files differ
diff --git a/games/glbsp/icons/glbspx_16x16x32.png b/games/glbsp/icons/glbspx_16x16x32.png
new file mode 100644
index 0000000000..54494870b6
--- /dev/null
+++ b/games/glbsp/icons/glbspx_16x16x32.png
Binary files differ
diff --git a/games/glbsp/icons/glbspx_32x32x32.png b/games/glbsp/icons/glbspx_32x32x32.png
new file mode 100644
index 0000000000..cbd43028a8
--- /dev/null
+++ b/games/glbsp/icons/glbspx_32x32x32.png
Binary files differ
diff --git a/games/glbsp/icons/glbspx_48x48x32.png b/games/glbsp/icons/glbspx_48x48x32.png
new file mode 100644
index 0000000000..81267528d1
--- /dev/null
+++ b/games/glbsp/icons/glbspx_48x48x32.png
Binary files differ
diff --git a/games/glbsp/nodeview.desktop b/games/glbsp/nodeview.desktop
new file mode 100644
index 0000000000..0561b44e03
--- /dev/null
+++ b/games/glbsp/nodeview.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=NodeView
+GenericName=Doom Node Viewer
+Icon=glbsp
+Exec=nodeview %f
+Terminal=false
+Categories=Game;ActionGame;
diff --git a/games/glbsp/slack-desc b/games/glbsp/slack-desc
index ed389edffa..27810a6597 100644
--- a/games/glbsp/slack-desc
+++ b/games/glbsp/slack-desc
@@ -14,6 +14,6 @@ glbsp: which means it adds some new special lumps to a WAD file that makes
glbsp: it easy and fast for an OpenGL DOOM engine to compute the polygons
glbsp: needed for drawing the levels.
glbsp:
-glbsp: There are many DOOM ports that understand the GL-Nodes which glBSP
-glbsp: creates, including: EDGE, the Doomsday engine (JDOOM), PrBoom, Legacy
-glbsp: 2.0, Vavoom, Doom3D and ZDoomGL.
+glbsp: This package @INCLUDES@ glBSPX and nodeview (fltk GUIs).
+glbsp:
+glbsp:
diff --git a/games/gnugo/gnugo.SlackBuild b/games/gnugo/gnugo.SlackBuild
index 2a17123008..42bbef4a0a 100644
--- a/games/gnugo/gnugo.SlackBuild
+++ b/games/gnugo/gnugo.SlackBuild
@@ -79,7 +79,7 @@ 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 {} \;
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/games/gottet/README b/games/gottet/README
index eb670fbd26..2e2af20cf8 100644
--- a/games/gottet/README
+++ b/games/gottet/README
@@ -1 +1,3 @@
-gottet is a simple tetris clone.
+gottet (A basic tetris clone)
+
+gottet is a simple tetris clone with a Qt user interface.
diff --git a/games/gottet/gottet.SlackBuild b/games/gottet/gottet.SlackBuild
index 86662b2453..924aa28664 100644
--- a/games/gottet/gottet.SlackBuild
+++ b/games/gottet/gottet.SlackBuild
@@ -3,27 +3,14 @@
# Slackware build script for gottet
# Originally written by:
-# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
-
+# Ryan P.C. McQuen | Everett, WA | email removed
# Now maintained by B. Watson (yalhcru@gmail.com)
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version, with the following exception:
-# the text of the GPL license may be omitted.
-
-# This program is distributed in the hope that it will be useful, but
-# without any warranty; without even the implied warranty of
-# merchantability or fitness for a particular purpose. Compiling,
-# interpreting, executing or merely reading the text of the program
-# may result in lapses of consciousness and/or very being, up to and
-# including the end of all existence and the Universe as we know it.
-# See the GNU General Public License for more details.
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-# You may have received a copy of the GNU General Public License along
-# with this program (most likely, a file named COPYING). If not, see
-# <http://www.gnu.org/licenses/>.
+# 20211008 bkw:
+# - relicensed with permission from Ryan.
+# - update for v1.2.0. qt5 now in Slackware...
# 20170309 bkw:
# - take over maintenance
@@ -37,8 +24,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=gottet
-VERSION=${VERSION:-1.0.6}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.2.0}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -50,9 +37,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -86,17 +70,18 @@ tar xvf $CWD/$PRGNAM-$VERSION-src.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20211008 bkw: upstream now includes a man page, put it in the right place.
+sed -i 's,share/man,man,' $PRGNAM.pro
-qmake PREFIX=/usr BINDIR=games
+qmake-qt5 PREFIX=/usr BINDIR=games
sed -i "s,-O2,$SLKCFLAGS," Makefile
make
make install INSTALL_ROOT=$PKG
strip $PKG/usr/games/$PRGNAM
+gzip $PKG/usr/man/man*/*.*
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a COPYING ChangeLog CREDITS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/gottet/gottet.info b/games/gottet/gottet.info
index e5e178dcac..d606753ff9 100644
--- a/games/gottet/gottet.info
+++ b/games/gottet/gottet.info
@@ -1,8 +1,8 @@
PRGNAM="gottet"
-VERSION="1.0.6"
+VERSION="1.2.0"
HOMEPAGE="https://gottcode.org/gottet/"
-DOWNLOAD="https://gottcode.org/gottet/gottet-1.0.6-src.tar.bz2"
-MD5SUM="cacc0861304ee161451bb4ea3c8246d9"
+DOWNLOAD="https://gottcode.org/gottet/gottet-1.2.0-src.tar.bz2"
+MD5SUM="58156a38b2b28548810cda1f960a5ac0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/games/gottet/slack-desc b/games/gottet/slack-desc
index 8aea0e1cd9..1111e333a5 100644
--- a/games/gottet/slack-desc
+++ b/games/gottet/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-gottet: gottet (A basic tetris clone)
+gottet: gottet (a basic tetris clone)
+gottet:
+gottet: gottet is a simple tetris clone with a Qt user interface.
gottet:
-gottet: gottet is a simple tetris clone.
gottet:
gottet:
gottet:
gottet:
gottet:
gottet:
-gottet: http://gottcode.org/gottet/
gottet:
diff --git a/games/gtklife/README b/games/gtklife/README
index 9db8a016ca..4782f7648f 100644
--- a/games/gtklife/README
+++ b/games/gtklife/README
@@ -1,2 +1,4 @@
+gtklife (Conway's Life program)
+
GtkLife is a fast, featureful, open-source Conway's Life program for
*nix.
diff --git a/games/gtklife/doinst.sh b/games/gtklife/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/games/gtklife/doinst.sh
+++ b/games/gtklife/doinst.sh
@@ -1,3 +1,9 @@
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
diff --git a/games/gtklife/gtklife.SlackBuild b/games/gtklife/gtklife.SlackBuild
index 5d7b93677b..6278d7f70b 100644
--- a/games/gtklife/gtklife.SlackBuild
+++ b/games/gtklife/gtklife.SlackBuild
@@ -6,11 +6,16 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211008 bkw: BUILD=3
+# - new-style icons.
+# - build with gtk+2, not gtk+1. nicer UI.
+# - binary in /usr/games, not /usr/bin.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=gtklife
VERSION=${VERSION:-5.2}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +27,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -57,11 +59,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
CFLAGS="$SLKCFLAGS -std=gnu89" \
CXXFLAGS="$SLKCFLAGS" \
@@ -69,13 +68,24 @@ CXXFLAGS="$SLKCFLAGS" \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--with-docdir=/usr/doc/$PRGNAM-$VERSION/html \
+ --with-gtk2 \
--build=$ARCH-slackware-linux
make
-make install-strip prefix=$PKG/usr docdir=$PKG/usr/doc/$PRGNAM-$VERSION/html
+make install-strip \
+ prefix=$PKG/usr \
+ docdir=$PKG/usr/doc/$PRGNAM-$VERSION/html \
+ bindir=$PKG/usr/games
+
+for i in icon_*.png; do
+ size="$( echo $i | cut -d_ -f2 | cut -d. -f1 )"
+ dir=$PKG/usr/share/icons/hicolor/$size/apps
+ mkdir -p $dir
+ cat $i > $dir/$PRGNAM.png
+done
mkdir -p $PKG/usr/share/pixmaps
-cat icon_48x48.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
mkdir -p $PKG/usr/share/applications
cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
diff --git a/games/gtklife/gtklife.desktop b/games/gtklife/gtklife.desktop
index 674f8d328c..90918dd502 100644
--- a/games/gtklife/gtklife.desktop
+++ b/games/gtklife/gtklife.desktop
@@ -3,7 +3,7 @@ Version=1.0
Name=GtkLife
GenericName=GtkLife Conway Life Simulation
Type=Application
-Exec=gtklife
+Exec=/usr/games/gtklife
Icon=gtklife
Terminal=false
StartupNotify=false
diff --git a/games/gzdoom-legacy/README b/games/gzdoom-legacy/README
index f3f8386df7..1c3496f600 100644
--- a/games/gzdoom-legacy/README
+++ b/games/gzdoom-legacy/README
@@ -1,3 +1,5 @@
+gzdoom-legacy (OpenGL port of DOOM, older version)
+
Enhanced OpenGL port of the official DOOM source code that also supports
Heretic, Hexen, and Strife.
diff --git a/games/gzdoom-legacy/README_versions.txt b/games/gzdoom-legacy/README_versions.txt
index bd7e56e233..3676c68eb9 100644
--- a/games/gzdoom-legacy/README_versions.txt
+++ b/games/gzdoom-legacy/README_versions.txt
@@ -18,9 +18,6 @@ VERSION="1.8.09"
DOWNLOAD="https://slackware.uk/~urchlay/src/g1.8.09.tar.gz"
MD5SUM="ddc1dd8aef254312031184be6dec21e6"
-Note that SDL2 is not required for 1.8.09 (you can remove it from REQUIRES
-in the .info file, if you like).
-
For 1.9.1:
VERSION="1.9.1"
diff --git a/games/gzdoom-legacy/compilefix.1.8.09.diff b/games/gzdoom-legacy/compilefix.1.8.09.diff
new file mode 100644
index 0000000000..ac9d89d363
--- /dev/null
+++ b/games/gzdoom-legacy/compilefix.1.8.09.diff
@@ -0,0 +1,143 @@
+diff -Naur gzdoom-g1.8.09/game-music-emu/CMakeLists.txt gzdoom-g1.8.09.patched/game-music-emu/CMakeLists.txt
+--- gzdoom-g1.8.09/game-music-emu/CMakeLists.txt 2014-12-21 09:18:40.000000000 -0500
++++ gzdoom-g1.8.09.patched/game-music-emu/CMakeLists.txt 2021-10-09 16:57:46.630159506 -0400
+@@ -84,7 +84,7 @@
+ if (__LIBGME_TEST_VISIBILITY)
+ # get the gcc version
+ exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
+- string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++ string (REGEX MATCH "[1-9][0-9]*\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+
+ # gcc <4.1 had poor support for symbol visibility
+ if ((${_gcc_version} VERSION_GREATER "4.1") OR (${_gcc_version} VERSION_EQUAL "4.1"))
+diff -Naur gzdoom-g1.8.09/src/b_func.cpp gzdoom-g1.8.09.patched/src/b_func.cpp
+--- gzdoom-g1.8.09/src/b_func.cpp 2014-12-21 09:18:40.000000000 -0500
++++ gzdoom-g1.8.09.patched/src/b_func.cpp 2021-10-09 16:57:46.631159506 -0400
+@@ -123,7 +123,7 @@
+ if (vangle == 0)
+ return false; //Looker seems to be blind.
+
+- return (angle_t)abs (R_PointToAngle2 (player->mo->x, player->mo->y, to->x, to->y) - player->mo->angle) <= vangle/2;
++ return (angle_t)fabs (R_PointToAngle2 (player->mo->x, player->mo->y, to->x, to->y) - player->mo->angle) <= vangle/2;
+ }
+
+ //-------------------------------------
+@@ -210,7 +210,7 @@
+ {
+ angle = an;
+ //have to be somewhat precise. to avoid suicide.
+- if (abs (angle - player->mo->angle) < 12*ANGLE_1)
++ if (fabs (angle - player->mo->angle) < 12*ANGLE_1)
+ {
+ t_rocket = 9;
+ no_fire = false;
+@@ -252,7 +252,7 @@
+ angle -= m;
+ }
+
+- if (abs (angle - player->mo->angle) < 4*ANGLE_1)
++ if (fabs (angle - player->mo->angle) < 4*ANGLE_1)
+ {
+ increase = !increase;
+ }
+diff -Naur gzdoom-g1.8.09/src/g_hexen/a_dragon.cpp gzdoom-g1.8.09.patched/src/g_hexen/a_dragon.cpp
+--- gzdoom-g1.8.09/src/g_hexen/a_dragon.cpp 2014-12-21 09:18:40.000000000 -0500
++++ gzdoom-g1.8.09.patched/src/g_hexen/a_dragon.cpp 2021-10-09 17:06:47.628110327 -0400
+@@ -79,7 +79,7 @@
+ { // attack the destination mobj if it's attackable
+ AActor *oldTarget;
+
+- if (abs(actor->angle-R_PointToAngle2(actor->x, actor->y,
++ if (fabs(actor->angle-R_PointToAngle2(actor->x, actor->y,
+ target->x, target->y)) < ANGLE_45/2)
+ {
+ oldTarget = actor->target;
+@@ -121,9 +121,9 @@
+ }
+ angleToSpot = R_PointToAngle2(actor->x, actor->y,
+ mo->x, mo->y);
+- if ((angle_t)abs(angleToSpot-angleToTarget) < bestAngle)
++ if ((angle_t)fabs(angleToSpot-angleToTarget) < bestAngle)
+ {
+- bestAngle = abs(angleToSpot-angleToTarget);
++ bestAngle = fabs(angleToSpot-angleToTarget);
+ bestActor = mo;
+ }
+ }
+@@ -198,14 +198,14 @@
+ }
+ angle = R_PointToAngle2(self->x, self->y, self->target->x,
+ self->target->y);
+- if (abs(self->angle-angle) < ANGLE_45/2 && self->CheckMeleeRange())
++ if (fabs(self->angle-angle) < ANGLE_45/2 && self->CheckMeleeRange())
+ {
+ int damage = pr_dragonflight.HitDice (8);
+ int newdam = P_DamageMobj (self->target, self, self, damage, NAME_Melee);
+ P_TraceBleed (newdam > 0 ? newdam : damage, self->target, self);
+ S_Sound (self, CHAN_WEAPON, self->AttackSound, 1, ATTN_NORM);
+ }
+- else if (abs(self->angle-angle) <= ANGLE_1*20)
++ else if (fabs(self->angle-angle) <= ANGLE_1*20)
+ {
+ self->SetState (self->MissileState);
+ S_Sound (self, CHAN_WEAPON, self->AttackSound, 1, ATTN_NORM);
+diff -Naur gzdoom-g1.8.09/src/g_hexen/a_heresiarch.cpp gzdoom-g1.8.09.patched/src/g_hexen/a_heresiarch.cpp
+--- gzdoom-g1.8.09/src/g_hexen/a_heresiarch.cpp 2014-12-21 09:18:40.000000000 -0500
++++ gzdoom-g1.8.09.patched/src/g_hexen/a_heresiarch.cpp 2021-10-09 17:06:55.063109651 -0400
+@@ -314,7 +314,7 @@
+ case SORC_STOPPING: // Balls stopping
+ if ((parent->StopBall == RUNTIME_TYPE(actor)) &&
+ (parent->args[1] > SORCBALL_SPEED_ROTATIONS) &&
+- (abs(angle - (parent->angle>>ANGLETOFINESHIFT)) < (30<<5)))
++ (fabs(angle - (parent->angle>>ANGLETOFINESHIFT)) < (30<<5)))
+ {
+ // Can stop now
+ actor->target->args[3] = SORC_FIRESPELL;
+diff -Naur gzdoom-g1.8.09/src/g_hexen/a_hexenspecialdecs.cpp gzdoom-g1.8.09.patched/src/g_hexen/a_hexenspecialdecs.cpp
+--- gzdoom-g1.8.09/src/g_hexen/a_hexenspecialdecs.cpp 2014-12-21 09:18:40.000000000 -0500
++++ gzdoom-g1.8.09.patched/src/g_hexen/a_hexenspecialdecs.cpp 2021-10-09 17:07:05.703108684 -0400
+@@ -109,7 +109,7 @@
+ if (playeringame[i])
+ {
+ AActor *pmo = players[i].mo;
+- if (P_CheckSight (self, pmo) && (abs (R_PointToAngle2 (pmo->x,
++ if (P_CheckSight (self, pmo) && (fabs (R_PointToAngle2 (pmo->x,
+ pmo->y, self->x, self->y) - pmo->angle) <= ANGLE_45))
+ { // Previous state (pottery bit waiting state)
+ self->SetState (self->state - 1);
+diff -Naur gzdoom-g1.8.09/src/p_enemy.cpp gzdoom-g1.8.09.patched/src/p_enemy.cpp
+--- gzdoom-g1.8.09/src/p_enemy.cpp 2014-12-21 09:18:40.000000000 -0500
++++ gzdoom-g1.8.09.patched/src/p_enemy.cpp 2021-10-09 16:57:46.631159506 -0400
+@@ -2738,7 +2738,7 @@
+
+ // 0 means no limit. Also, if we turn in a single step anyways, no need to go through the algorithms.
+ // It also means that there is no need to check for going past the other.
+- if (max_turn && (max_turn < (angle_t)abs(self->angle - other_angle)))
++ if (max_turn && (max_turn < (angle_t)fabs(self->angle - other_angle)))
+ {
+ if (self->angle > other_angle)
+ {
+diff -Naur gzdoom-g1.8.09/src/p_mobj.cpp gzdoom-g1.8.09.patched/src/p_mobj.cpp
+--- gzdoom-g1.8.09/src/p_mobj.cpp 2014-12-21 09:18:40.000000000 -0500
++++ gzdoom-g1.8.09.patched/src/p_mobj.cpp 2021-10-09 16:59:08.847152032 -0400
+@@ -2932,7 +2932,7 @@
+ if (thing->flags4&MF4_SHIELDREFLECT)
+ {
+ // Shield reflection (from the Centaur
+- if (abs (angle - thing->angle)>>24 > 45)
++ if ((int)(fabs (angle - thing->angle))>>24 > 45)
+ return true; // Let missile explode
+
+ if (thing->IsKindOf (RUNTIME_CLASS(AHolySpirit))) // shouldn't this be handled by another flag???
+diff -Naur gzdoom-g1.8.09/src/p_setup.cpp gzdoom-g1.8.09.patched/src/p_setup.cpp
+--- gzdoom-g1.8.09/src/p_setup.cpp 2014-12-21 09:18:40.000000000 -0500
++++ gzdoom-g1.8.09.patched/src/p_setup.cpp 2021-10-09 17:02:30.783133675 -0400
+@@ -1311,7 +1311,7 @@
+
+ ptp_angle = R_PointToAngle2 (li->v1->x, li->v1->y, li->v2->x, li->v2->y);
+ dis = 0;
+- delta_angle = (abs(ptp_angle-(segangle<<16))>>ANGLETOFINESHIFT)*360/FINEANGLES;
++ delta_angle = ((int)fabs(ptp_angle-(segangle<<16))>>ANGLETOFINESHIFT)*360/FINEANGLES;
+
+ if (delta_angle != 0)
+ {
diff --git a/games/gzdoom-legacy/compilefix.1.9.1.diff b/games/gzdoom-legacy/compilefix.1.9.1.diff
new file mode 100644
index 0000000000..129886b3ea
--- /dev/null
+++ b/games/gzdoom-legacy/compilefix.1.9.1.diff
@@ -0,0 +1,12 @@
+diff -Naur gzdoom-g1.9.1/game-music-emu/CMakeLists.txt gzdoom-g1.9.1.patched/game-music-emu/CMakeLists.txt
+--- gzdoom-g1.9.1/game-music-emu/CMakeLists.txt 2016-02-23 05:34:50.000000000 -0500
++++ gzdoom-g1.9.1.patched/game-music-emu/CMakeLists.txt 2021-10-09 15:42:40.090569168 -0400
+@@ -84,7 +84,7 @@
+ if (__LIBGME_TEST_VISIBILITY)
+ # get the gcc version
+ exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
+- string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++ string (REGEX MATCH "[1-9][0-9]*\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+
+ # gcc <4.1 had poor support for symbol visibility
+ if ((${_gcc_version} VERSION_GREATER "4.1") OR (${_gcc_version} VERSION_EQUAL "4.1"))
diff --git a/games/gzdoom-legacy/compilefix.2.4.0.diff b/games/gzdoom-legacy/compilefix.2.4.0.diff
new file mode 100644
index 0000000000..15aff4b37b
--- /dev/null
+++ b/games/gzdoom-legacy/compilefix.2.4.0.diff
@@ -0,0 +1,23 @@
+diff -Naur gzdoom-g2.4.0/game-music-emu/CMakeLists.txt gzdoom-g2.4.0.patched/game-music-emu/CMakeLists.txt
+--- gzdoom-g2.4.0/game-music-emu/CMakeLists.txt 2017-03-19 16:37:06.000000000 -0400
++++ gzdoom-g2.4.0.patched/game-music-emu/CMakeLists.txt 2021-10-09 14:02:12.973117056 -0400
+@@ -89,7 +89,7 @@
+ if (__LIBGME_TEST_VISIBILITY)
+ # get the gcc version
+ exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
+- string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++ string (REGEX MATCH "[1-9][0-9]*\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+
+ # gcc <4.1 had poor support for symbol visibility
+ if ((${_gcc_version} VERSION_GREATER "4.1") OR (${_gcc_version} VERSION_EQUAL "4.1"))
+diff -Naur gzdoom-g2.4.0/src/sound/oalsound.cpp gzdoom-g2.4.0.patched/src/sound/oalsound.cpp
+--- gzdoom-g2.4.0/src/sound/oalsound.cpp 2017-03-19 16:37:06.000000000 -0400
++++ gzdoom-g2.4.0.patched/src/sound/oalsound.cpp 2021-10-09 13:59:39.997130962 -0400
+@@ -40,6 +40,7 @@
+ #include <dlfcn.h>
+ #endif
+
++#include <functional>
+ #include <memory>
+ #include <chrono>
+
diff --git a/games/gzdoom-legacy/gzdoom-legacy.SlackBuild b/games/gzdoom-legacy/gzdoom-legacy.SlackBuild
index 6087eb7917..d2ab9ef85a 100644
--- a/games/gzdoom-legacy/gzdoom-legacy.SlackBuild
+++ b/games/gzdoom-legacy/gzdoom-legacy.SlackBuild
@@ -6,6 +6,7 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211009 bkw: BUILD=3, fix build on -current.
# 20200426 bkw:
# - Fix <unknown version> in window title for real this time, BUILD=2.
@@ -38,7 +39,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=gzdoom-legacy
SRCNAM=gzdoom
VERSION=${VERSION:-2.4.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -50,9 +51,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -107,7 +105,8 @@ patch -p1 < $CWD/window_title_version.diff
# title will read 1.8.08 for version 1.8.09, eg.
sed -i "/#define *VERSIONSTR/s,[^ ]*$,\"$VERSION\"," src/version.h
-# This isn't currently used, but was in the past, and will be again I'm sure.
+# Version-specific patches. As of 2021, it's unlikely any old versions
+# of gzdoom will build without patching.
[ -e $CWD/compilefix.$VERSION.diff ] && \
patch -p1 < $CWD/compilefix.$VERSION.diff
diff --git a/games/gzdoom-legacy/slack-desc b/games/gzdoom-legacy/slack-desc
index 18c19805b0..518ebe6f7b 100644
--- a/games/gzdoom-legacy/slack-desc
+++ b/games/gzdoom-legacy/slack-desc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-gzdoom-legacy: gzdoom-legacy (OpenGL port of DOOM)
+gzdoom-legacy: gzdoom-legacy (OpenGL port of DOOM, older version)
gzdoom-legacy:
gzdoom-legacy: Enhanced OpenGL port of the official DOOM source code that also
gzdoom-legacy: supports Heretic, Hexen, and Strife.
diff --git a/games/gzdoom/compilefix.4.5.0.diff b/games/gzdoom/compilefix.4.5.0.diff
deleted file mode 100644
index 5c19518901..0000000000
--- a/games/gzdoom/compilefix.4.5.0.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gzdoom-g4.5.0/src/common/scripting/core/dynarrays.cpp gzdoom-g4.5.0.patched/src/common/scripting/core/dynarrays.cpp
---- gzdoom-g4.5.0/src/common/scripting/core/dynarrays.cpp 2020-10-31 05:07:33.000000000 -0400
-+++ gzdoom-g4.5.0.patched/src/common/scripting/core/dynarrays.cpp 2020-11-08 14:45:48.654222783 -0500
-@@ -89,7 +89,7 @@
- {
- int oldSize = self->Size();
- self->Insert(index, static_cast<typename T::value_type>(val));
-- if constexpr (fill)
-+ if (fill)
- {
- for (unsigned i = oldSize; i < self->Size() - 1; i++) (*self)[i] = 0;
- }
diff --git a/games/gzdoom/fix_zipdir.diff b/games/gzdoom/fix_zipdir.diff
deleted file mode 100644
index 88fb016966..0000000000
--- a/games/gzdoom/fix_zipdir.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/zipdir/zipdir.c
-+++ b/tools/zipdir/zipdir.c
-@@ -781,6 +781,8 @@
- if (central_dir == NULL)
- {
- fprintf(stderr, "Could not read central directory from %s. (Is it a zipfile?)\n", zipname);
-+ fclose(ozip);
-+ ozip = NULL;
- update = 0;
- }
- }
diff --git a/games/gzdoom/gzdoom.SlackBuild b/games/gzdoom/gzdoom.SlackBuild
index 1f5a823aa1..780f2f6f31 100644
--- a/games/gzdoom/gzdoom.SlackBuild
+++ b/games/gzdoom/gzdoom.SlackBuild
@@ -36,7 +36,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=gzdoom
-VERSION=${VERSION:-4.5.0}
+VERSION=${VERSION:-4.7.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -49,9 +49,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -95,15 +92,6 @@ sed -i '/COMMAND.*UpdateRevision/s,^,# ,' src/CMakeLists.txt
echo "#define GIT_HASH \"release\""
echo "#define GIT_TIME __DATE__" ) > src/gitinfo.h
-# 4.5.0 uses "if constexpr", which is a c++17 feature not supported by
-# our compiler from 2016.
-[ -e $CWD/compilefix.$VERSION.diff ] && \
- patch -p1 < $CWD/compilefix.$VERSION.diff
-
-# 20201107 bkw: 4.5.0 needs this, patch comes from upstream git. Thanks
-# to Steven Voges on the mailing list for pointing it out to me.
-patch -p1 < $CWD/fix_zipdir.diff
-
# 3.1.0 started needing -DNDEBUG. Using ld.gold speeds up the final link
# enough to be worth using (saves 17+ sec on my test box).
SLKCFLAGS="$SLKCFLAGS -DNDEBUG -fuse-ld=gold"
@@ -115,7 +103,6 @@ sed -i '1i#include <cmath>' \
mkdir -p build
cd build
- export "PATH=/opt/cmake-202x/bin:$PATH"
cmake \
-DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -DSHARE_DIR=\\\"/usr/share/games/doom\\\"" \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -DSHARE_DIR=\\\"/usr/share/games/doom\\\"" \
diff --git a/games/gzdoom/gzdoom.info b/games/gzdoom/gzdoom.info
index 21083a0aad..cc474393e8 100644
--- a/games/gzdoom/gzdoom.info
+++ b/games/gzdoom/gzdoom.info
@@ -1,8 +1,8 @@
PRGNAM="gzdoom"
-VERSION="4.5.0"
+VERSION="4.7.0"
HOMEPAGE="http://gzdoom.drdteam.org/"
-DOWNLOAD="https://github.com/coelckers/gzdoom/archive/g4.5.0/gzdoom-g4.5.0.tar.gz"
-MD5SUM="64b0b98c6538a75626de3319653d6539"
+DOWNLOAD="https://github.com/coelckers/gzdoom/archive/g4.7.0/gzdoom-g4.7.0.tar.gz"
+MD5SUM="1b858a2ef68f04c2c9f0ba7592cb73bd"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="zmusic"
diff --git a/games/gzdoom/gzdoom.png b/games/gzdoom/gzdoom.png
deleted file mode 100644
index 013cf60890..0000000000
--- a/games/gzdoom/gzdoom.png
+++ /dev/null
Binary files differ
diff --git a/games/hedgewars/fpc-3.2.0.patch b/games/hedgewars/fpc-3.2.0.patch
new file mode 100644
index 0000000000..042997cf3c
--- /dev/null
+++ b/games/hedgewars/fpc-3.2.0.patch
@@ -0,0 +1,20 @@
+Description: Fix/Workaround build failure with newer fpc 3.2.0
+Origin: http://hg.hedgewars.org/hedgewars/rev/6832dab555ae
+Bug-Debian: https://bugs.debian.org/968125
+Last-Update: 2020-08-10
+
+--- a/hedgewars/uWorld.pas Sun Aug 09 14:43:02 2020 +0200
++++ b/hedgewars/uWorld.pas Mon Aug 10 12:56:53 2020 +0300
+@@ -1129,8 +1129,8 @@
+ procedure ShiftWorld(Dir: LongInt); inline;
+ begin
+ preShiftWorldDx:= WorldDx;
+- WorldDx:= WorldDx + LongInt(Dir * LongInt(playWidth));
+-
++ Dir := Dir * LongInt(playWidth);
++ WorldDx:= WorldDx + Dir;
+ end;
+
+ procedure UnshiftWorld(); inline;
+
+
diff --git a/games/hedgewars/hedgewars.SlackBuild b/games/hedgewars/hedgewars.SlackBuild
index 23cdb298b0..70ea97aafa 100644
--- a/games/hedgewars/hedgewars.SlackBuild
+++ b/games/hedgewars/hedgewars.SlackBuild
@@ -22,6 +22,10 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20210905 bkw: Modified by SlackBuilds.org:
+# - add fpc-3.2.0.patch for recent fpc upgrade
+# - add include.qpainterpath.diff to fix compile on -current
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=hedgewars
@@ -79,6 +83,9 @@ 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 {} \;
+patch -p1 < $CWD/fpc-3.2.0.patch
+patch -p1 < $CWD/include.qpainterpath.diff
+
mkdir -p build
cd build
cmake \
diff --git a/games/hedgewars/include.qpainterpath.diff b/games/hedgewars/include.qpainterpath.diff
new file mode 100644
index 0000000000..430edc2da7
--- /dev/null
+++ b/games/hedgewars/include.qpainterpath.diff
@@ -0,0 +1,21 @@
+From 0eb95ff5c1c29887f14ecb2bb5f9c3cdd8b3ff29 Mon Sep 17 00:00:00 2001
+From: felixonmars <felixonmars@archlinux.org>
+Date: Thu, 4 Jun 2020 12:33:24 +0200
+Subject: [PATCH] Fix build with Qt 5.15+
+
+---
+ QTfrontend/ui/page/pagegamestats.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/QTfrontend/ui/page/pagegamestats.cpp b/QTfrontend/ui/page/pagegamestats.cpp
+index c0ad9a974f..655b70d37b 100644
+--- a/QTfrontend/ui/page/pagegamestats.cpp
++++ b/QTfrontend/ui/page/pagegamestats.cpp
+@@ -22,6 +22,7 @@
+ #include <QGraphicsScene>
+ #include <QGroupBox>
+ #include <QSizePolicy>
++#include <QPainterPath>
+
+ #include "pagegamestats.h"
+ #include "team.h"
diff --git a/games/lgogdownloader/lgogdownloader.SlackBuild b/games/lgogdownloader/lgogdownloader.SlackBuild
index 0fb4b6c739..78c1063579 100644
--- a/games/lgogdownloader/lgogdownloader.SlackBuild
+++ b/games/lgogdownloader/lgogdownloader.SlackBuild
@@ -28,7 +28,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=lgogdownloader
-VERSION=${VERSION:-3.7}
+VERSION=${VERSION:-3.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/games/lgogdownloader/lgogdownloader.info b/games/lgogdownloader/lgogdownloader.info
index 92ed48c4c4..74e2933b09 100644
--- a/games/lgogdownloader/lgogdownloader.info
+++ b/games/lgogdownloader/lgogdownloader.info
@@ -1,8 +1,8 @@
PRGNAM="lgogdownloader"
-VERSION="3.7"
+VERSION="3.8"
HOMEPAGE="https://sites.google.com/site/gogdownloader/home/"
-DOWNLOAD="https://sites.google.com/site/gogdownloader/lgogdownloader-3.7.tar.gz"
-MD5SUM="f23ea65cd9ca604bd5bb0b1039bd1e7d"
+DOWNLOAD="https://sites.google.com/site/gogdownloader/lgogdownloader-3.8.tar.gz"
+MD5SUM="f684d8641f68550b14ab7f0f43cbf0f9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="htmlcxx jsoncpp rhash tinyxml2"
diff --git a/games/marathon-data/marathon-data.SlackBuild b/games/marathon-data/marathon-data.SlackBuild
index f480f483c2..1c845c406a 100644
--- a/games/marathon-data/marathon-data.SlackBuild
+++ b/games/marathon-data/marathon-data.SlackBuild
@@ -6,19 +6,18 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211010 bkw: update for 20210408
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=marathon-data
-VERSION=${VERSION:-20200904}
+VERSION=${VERSION:-20210408}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -45,8 +44,8 @@ chown -R root:root $DATADIR
# NB: the usual find predicate is different (zipfile stores +x permissions
# on some files for no good reason)
find $DATADIR \
- \( -type f -exec chmod 644 {} \; \) -o \
- \( -type d -exec chmod 755 {} \; \)
+ \( -type f -exec chmod 644 {} \+ \) -o \
+ \( -type d -exec chmod 755 {} \+ \)
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/marathon-data/marathon-data.info b/games/marathon-data/marathon-data.info
index 64b0b00acb..0ee3f37620 100644
--- a/games/marathon-data/marathon-data.info
+++ b/games/marathon-data/marathon-data.info
@@ -1,8 +1,8 @@
PRGNAM="marathon-data"
-VERSION="20200904"
+VERSION="20210408"
HOMEPAGE="https://alephone.lhowon.org/"
-DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20200904/Marathon-20200904-Data.zip"
-MD5SUM="f608af955110a0681f284e823debe752"
+DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20210408/Marathon-20210408-Data.zip"
+MD5SUM="f3d4b264147eb497534ddb05671a34ac"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="alephone"
diff --git a/games/marathon-infinity-data/marathon-infinity-data.SlackBuild b/games/marathon-infinity-data/marathon-infinity-data.SlackBuild
index 35c06e510a..7f181085e0 100644
--- a/games/marathon-infinity-data/marathon-infinity-data.SlackBuild
+++ b/games/marathon-infinity-data/marathon-infinity-data.SlackBuild
@@ -6,19 +6,18 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211010 bkw: update for 20210408
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=marathon-infinity-data
-VERSION=${VERSION:-20200904}
+VERSION=${VERSION:-20210408}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -46,8 +45,8 @@ chown -R root:root $DATADIR
# NB: the usual find predicate is different (zipfile stores +x permissions
# on some files for no good reason)
find $DATADIR \
- \( -type f -exec chmod 644 {} \; \) -o \
- \( -type d -exec chmod 755 {} \; \)
+ \( -type f -exec chmod 644 {} \+ \) -o \
+ \( -type d -exec chmod 755 {} \+ \)
mkdir -p $PKG/usr/games
cat $CWD/$WRAPPER > $PKG/usr/games/$WRAPPER
diff --git a/games/marathon-infinity-data/marathon-infinity-data.info b/games/marathon-infinity-data/marathon-infinity-data.info
index 65d2289201..b6acef6831 100644
--- a/games/marathon-infinity-data/marathon-infinity-data.info
+++ b/games/marathon-infinity-data/marathon-infinity-data.info
@@ -1,8 +1,8 @@
PRGNAM="marathon-infinity-data"
-VERSION="20200904"
+VERSION="20210408"
HOMEPAGE="https://alephone.lhowon.org/"
-DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20200904/MarathonInfinity-20200904-Data.zip"
-MD5SUM="a64be0fff890c5712dd61efe5d264ba5"
+DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20210408/MarathonInfinity-20210408-Data.zip"
+MD5SUM="65f37366d47935c8041012af1fd945bd"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="alephone"
diff --git a/games/marathon2-data/marathon2-data.SlackBuild b/games/marathon2-data/marathon2-data.SlackBuild
index bfa0336126..933722331c 100644
--- a/games/marathon2-data/marathon2-data.SlackBuild
+++ b/games/marathon2-data/marathon2-data.SlackBuild
@@ -6,19 +6,18 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211010 bkw: update for 20210408
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=marathon2-data
-VERSION=${VERSION:-20200904}
+VERSION=${VERSION:-20210408}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -46,8 +45,8 @@ chown -R root:root $DATADIR
# NB: the usual find predicate is different (zipfile stores +x permissions
# on some files for no good reason)
find $DATADIR \
- \( -type f -exec chmod 644 {} \; \) -o \
- \( -type d -exec chmod 755 {} \; \)
+ \( -type f -exec chmod 644 {} \+ \) -o \
+ \( -type d -exec chmod 755 {} \+ \)
mkdir -p $PKG/usr/games
cat $CWD/$WRAPPER > $PKG/usr/games/$WRAPPER
diff --git a/games/marathon2-data/marathon2-data.info b/games/marathon2-data/marathon2-data.info
index 371b43b353..c065de8f71 100644
--- a/games/marathon2-data/marathon2-data.info
+++ b/games/marathon2-data/marathon2-data.info
@@ -1,8 +1,8 @@
PRGNAM="marathon2-data"
-VERSION="20200904"
+VERSION="20210408"
HOMEPAGE="https://alephone.lhowon.org/"
-DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20200904/Marathon2-20200904-Data.zip"
-MD5SUM="b6878568d5b4c91dd6a79beb9d7f009a"
+DOWNLOAD="https://github.com/Aleph-One-Marathon/alephone/releases/download/release-20210408/Marathon2-20210408-Data.zip"
+MD5SUM="7b79ee9b56205627c82f4e2e8b8a8004"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="alephone"
diff --git a/games/minetest/gcc11.patch b/games/minetest/gcc11.patch
new file mode 100644
index 0000000000..bb37cdf31e
--- /dev/null
+++ b/games/minetest/gcc11.patch
@@ -0,0 +1,21 @@
+From 7c2826cbc0f36027d4a9781f433150d1c5d0d03f Mon Sep 17 00:00:00 2001
+From: lhofhansl <larsh@apache.org>
+Date: Thu, 6 May 2021 10:24:30 -0700
+Subject: [PATCH] Fix build for newer versions of GCC (#11246)
+
+---
+ src/clientiface.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/clientiface.h b/src/clientiface.h
+index cc5292b71bf9..dfd97674137c 100644
+--- a/src/clientiface.h
++++ b/src/clientiface.h
+@@ -31,6 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
+ #include <list>
+ #include <vector>
+ #include <set>
++#include <memory>
+ #include <mutex>
+
+ class MapBlock;
diff --git a/games/minetest/minetest.SlackBuild b/games/minetest/minetest.SlackBuild
index b223d9d1e6..4563795705 100644
--- a/games/minetest/minetest.SlackBuild
+++ b/games/minetest/minetest.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=minetest
-VERSION=${VERSION:-5.3.0}
+VERSION=${VERSION:-5.4.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -79,6 +79,8 @@ 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 {} \;
+patch -p1 < $CWD/gcc11.patch
+
# Fix man page path
sed -i "s/share\/man/man/" CMakeLists.txt
diff --git a/games/minetest/minetest.info b/games/minetest/minetest.info
index 9912cdb1cd..6aaa220910 100644
--- a/games/minetest/minetest.info
+++ b/games/minetest/minetest.info
@@ -1,8 +1,8 @@
PRGNAM="minetest"
-VERSION="5.3.0"
+VERSION="5.4.1"
HOMEPAGE="http://minetest.net/"
-DOWNLOAD="https://github.com/minetest/minetest/archive/5.3.0/minetest-5.3.0.tar.gz"
-MD5SUM="858ac78e732e54b1d0d70e2f1a7026f7"
+DOWNLOAD="https://github.com/minetest/minetest/archive/5.4.1/minetest-5.4.1.tar.gz"
+MD5SUM="1814139a9b82aa07ad89867095224b4d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="irrlicht luajit jsoncpp"
diff --git a/games/notpacman/notpacman.SlackBuild b/games/notpacman/notpacman.SlackBuild
index f55a608adb..daae6a1b8c 100644
--- a/games/notpacman/notpacman.SlackBuild
+++ b/games/notpacman/notpacman.SlackBuild
@@ -24,9 +24,6 @@ PKGTYPE=${PKGTYPE:-tgz}
# *.love files are just zip files full of lua code, they're cross-platform
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/notpacman/notpacman.info b/games/notpacman/notpacman.info
index 1257de73d7..33c3e1cd8f 100644
--- a/games/notpacman/notpacman.info
+++ b/games/notpacman/notpacman.info
@@ -1,6 +1,6 @@
PRGNAM="notpacman"
VERSION="1.0.4"
-HOMEPAGE="http://stabyourself.net/notpacman/"
+HOMEPAGE="https://stabyourself.net/notpacman/"
DOWNLOAD="https://slackware.uk/~urchlay/src/notpacman-source.zip"
MD5SUM="a7f00ac3b1c8cb94bfa07b711b076223"
DOWNLOAD_x86_64=""
diff --git a/games/nottetris2/nottetris2.SlackBuild b/games/nottetris2/nottetris2.SlackBuild
index bc4117cd91..0d10ca10fe 100644
--- a/games/nottetris2/nottetris2.SlackBuild
+++ b/games/nottetris2/nottetris2.SlackBuild
@@ -22,9 +22,6 @@ PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/nottetris2/nottetris2.info b/games/nottetris2/nottetris2.info
index bfa438a8fe..2431044150 100644
--- a/games/nottetris2/nottetris2.info
+++ b/games/nottetris2/nottetris2.info
@@ -1,6 +1,6 @@
PRGNAM="nottetris2"
VERSION="20110620"
-HOMEPAGE="http://stabyourself.net/nottetris2/"
+HOMEPAGE="https://stabyourself.net/nottetris2/"
DOWNLOAD="https://slackware.uk/~urchlay/src/nottetris2-source.zip"
MD5SUM="35090d40c02139ea8b2f14c1b8de3f95"
DOWNLOAD_x86_64=""
diff --git a/games/pingus/missing-header.patch b/games/pingus/patches/missing-header.patch
index cc1dcdbb85..cc1dcdbb85 100644
--- a/games/pingus/missing-header.patch
+++ b/games/pingus/patches/missing-header.patch
diff --git a/games/pingus/patches/pingus-0.7.6-gcc470-udl.patch b/games/pingus/patches/pingus-0.7.6-gcc470-udl.patch
new file mode 100644
index 0000000000..843439321c
--- /dev/null
+++ b/games/pingus/patches/pingus-0.7.6-gcc470-udl.patch
@@ -0,0 +1,22 @@
+--- src/pingus/pingus_main.cpp~ 2011-12-24 15:46:47.000000000 -0600
++++ src/pingus/pingus_main.cpp 2012-01-03 13:13:03.034195720 -0600
+@@ -465,7 +465,7 @@
+ void
+ PingusMain::print_greeting_message()
+ {
+- std::string greeting = "Welcome to Pingus "VERSION;
++ std::string greeting = "Welcome to Pingus " VERSION;
+ greeting += "!";
+ std::cout << greeting << std::endl;
+ for (unsigned int i = 0; i < greeting.length(); ++i)
+--- src/pingus/screens/pingus_menu.cpp~ 2011-12-24 15:46:47.000000000 -0600
++++ src/pingus/screens/pingus_menu.cpp 2012-01-03 13:30:28.967700554 -0600
+@@ -153,7 +153,7 @@
+ gc.get_height()/2 - 280));
+
+ gc.print_left(Fonts::pingus_small, Vector2i(gc.get_width()/2 - 400 + 25, gc.get_height()-140),
+- "Pingus "VERSION" - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n"
++ "Pingus " VERSION " - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n"
+ "See the file AUTHORS for a complete list of contributors.\n"
+ "Pingus comes with ABSOLUTELY NO WARRANTY. This is free software, and you are\n"
+ "welcome to redistribute it under certain conditions; see the file COPYING for details.\n");
diff --git a/games/pingus/patches/pingus-boost-1.69.patch b/games/pingus/patches/pingus-boost-1.69.patch
new file mode 100644
index 0000000000..e412ffbb2e
--- /dev/null
+++ b/games/pingus/patches/pingus-boost-1.69.patch
@@ -0,0 +1,380 @@
+From fef8cf6512fa4aa09e87643c22ef66de9ec7bb41 Mon Sep 17 00:00:00 2001
+From: Ingo Ruhnke <grumbel@gmail.com>
+Date: Sat, 26 Jul 2014 20:49:11 +0200
+Subject: [PATCH] Switched to boost::signals2
+
+---
+ SConscript | 5 ++---
+ src/editor/button.hpp | 4 ++--
+ src/editor/checkbox.hpp | 4 ++--
+ src/editor/combobox.hpp | 4 ++--
+ src/editor/file_list.hpp | 4 ++--
+ src/editor/inputbox.hpp | 6 +++---
+ src/editor/message_box.hpp | 2 +-
+ src/editor/object_selector.cpp | 4 ++--
+ src/editor/viewport.hpp | 4 ++--
+ src/pingus/components/check_box.hpp | 4 ++--
+ src/pingus/components/choice_box.hpp | 4 ++--
+ src/pingus/components/slider_box.hpp | 4 ++--
+ src/pingus/config_manager.hpp | 28 ++++++++++++++--------------
+ src/pingus/screens/option_menu.hpp | 4 ++--
+ 14 files changed, 40 insertions(+), 41 deletions(-)
+
+diff --git a/SConscript b/SConscript
+index 758567f51..c4d25a8a9 100644
+--- SConscript
++++ SConscript
+@@ -187,9 +187,8 @@ class Project:
+ 'src/engine/input/xinput/xinput_device.cpp'])
+
+ def configure_boost(self):
+- if not self.conf.CheckLibWithHeader('boost_signals', 'boost/signals.hpp', 'c++'):
+- if not self.conf.CheckLibWithHeader('boost_signals-mt', 'boost/signals.hpp', 'c++'):
+- self.fatal_error += " * library 'boost_signals' not found\n"
++ if not self.conf.CheckHeader('boost/signals2.hpp', '<>', 'c++'):
++ self.fatal_error += " * library 'boost_signals2' not found\n"
+
+ def configure_png(self):
+ if self.conf.CheckMyProgram('pkg-config'):
+diff --git a/src/editor/button.hpp b/src/editor/button.hpp
+index c85d7da9e..d89dfe669 100644
+--- src/editor/button.hpp
++++ src/editor/button.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_BUTTON_HPP
+ #define HEADER_PINGUS_EDITOR_BUTTON_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "engine/gui/rect_component.hpp"
+
+@@ -48,7 +48,7 @@ public:
+ void enable() { enabled = true; }
+ void disable() { enabled = false; }
+
+- boost::signal<void()> on_click;
++ boost::signals2::signal<void()> on_click;
+
+ private:
+ Button (const Button&);
+diff --git a/src/editor/checkbox.hpp b/src/editor/checkbox.hpp
+index 7c3bc835f..66382d79b 100644
+--- src/editor/checkbox.hpp
++++ src/editor/checkbox.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_CHECKBOX_HPP
+ #define HEADER_PINGUS_EDITOR_CHECKBOX_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "engine/gui/rect_component.hpp"
+
+@@ -40,7 +40,7 @@ public:
+ bool is_checked() const { return checked; }
+ void on_primary_button_press(int x, int y);
+
+- boost::signal<void (bool)> on_change;
++ boost::signals2::signal<void (bool)> on_change;
+
+ private:
+ Checkbox (const Checkbox&);
+diff --git a/src/editor/combobox.hpp b/src/editor/combobox.hpp
+index 0ca742593..603556bd9 100644
+--- src/editor/combobox.hpp
++++ src/editor/combobox.hpp
+@@ -18,7 +18,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_COMBOBOX_HPP
+ #define HEADER_PINGUS_EDITOR_COMBOBOX_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "engine/display/sprite.hpp"
+ #include "engine/gui/rect_component.hpp"
+@@ -88,7 +88,7 @@ public:
+
+ void update_layout() {}
+
+- boost::signal<void (const ComboItem&)> on_select;
++ boost::signals2::signal<void (const ComboItem&)> on_select;
+
+ private:
+ Combobox();
+diff --git a/src/editor/file_list.hpp b/src/editor/file_list.hpp
+index cc4bba2de..85efe6aa0 100644
+--- src/editor/file_list.hpp
++++ src/editor/file_list.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_FILE_LIST_HPP
+ #define HEADER_PINGUS_EDITOR_FILE_LIST_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "engine/display/sprite.hpp"
+ #include "engine/gui/rect_component.hpp"
+@@ -61,7 +61,7 @@ public:
+ bool has_more_next_pages();
+ bool has_more_prev_pages();
+
+- boost::signal<void (const System::DirectoryEntry&)> on_click;
++ boost::signals2::signal<void (const System::DirectoryEntry&)> on_click;
+
+ private:
+ int items_per_page();
+diff --git a/src/editor/inputbox.hpp b/src/editor/inputbox.hpp
+index cad9663ec..87321dbba 100644
+--- src/editor/inputbox.hpp
++++ src/editor/inputbox.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_INPUTBOX_HPP
+ #define HEADER_PINGUS_EDITOR_INPUTBOX_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "engine/gui/rect_component.hpp"
+
+@@ -40,8 +40,8 @@ public:
+
+ void update_layout() {}
+
+- boost::signal<void (const std::string&)> on_change;
+- boost::signal<void (const std::string&)> on_enter;
++ boost::signals2::signal<void (const std::string&)> on_change;
++ boost::signals2::signal<void (const std::string&)> on_enter;
+
+ private:
+ Inputbox (const Inputbox&);
+diff --git a/src/editor/message_box.hpp b/src/editor/message_box.hpp
+index 385387a61..d885767cf 100644
+--- src/editor/message_box.hpp
++++ src/editor/message_box.hpp
+@@ -45,7 +45,7 @@ public:
+ void on_cancel_button();
+
+ public:
+- boost::signal<void()> on_ok;
++ boost::signals2::signal<void()> on_ok;
+
+ private:
+ MessageBox(const MessageBox&);
+diff --git a/src/editor/object_selector.cpp b/src/editor/object_selector.cpp
+index 28e306826..f3a36b5e8 100644
+--- src/editor/object_selector.cpp
++++ src/editor/object_selector.cpp
+@@ -16,7 +16,7 @@
+
+ #include "editor/object_selector.hpp"
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "editor/generic_level_obj.hpp"
+ #include "editor/gui_style.hpp"
+@@ -47,7 +47,7 @@ private:
+ std::string tooltip;
+
+ public:
+- boost::signal<void()> on_click;
++ boost::signals2::signal<void()> on_click;
+
+ public:
+ ObjectSelectorButton(ObjectSelectorList* object_list_,
+diff --git a/src/editor/viewport.hpp b/src/editor/viewport.hpp
+index 1ae9eff7c..18868254d 100644
+--- src/editor/viewport.hpp
++++ src/editor/viewport.hpp
+@@ -18,7 +18,7 @@
+ #ifndef HEADER_PINGUS_EDITOR_VIEWPORT_HPP
+ #define HEADER_PINGUS_EDITOR_VIEWPORT_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+ #include <set>
+
+ #include "editor/selection.hpp"
+@@ -148,7 +148,7 @@ public:
+
+ void clear_selection();
+
+- boost::signal<void (const Selection&)> selection_changed;
++ boost::signals2::signal<void (const Selection&)> selection_changed;
+ private:
+ Viewport();
+ Viewport (const Viewport&);
+diff --git a/src/pingus/components/check_box.hpp b/src/pingus/components/check_box.hpp
+index 00e23b764..5bef50f6b 100644
+--- src/pingus/components/check_box.hpp
++++ src/pingus/components/check_box.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_CHECK_BOX_HPP
+ #define HEADER_PINGUS_PINGUS_COMPONENTS_CHECK_BOX_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "engine/display/sprite.hpp"
+ #include "engine/gui/rect_component.hpp"
+@@ -39,7 +39,7 @@ public:
+
+ void set_state(bool v, bool send_signal);
+
+- boost::signal<void (bool)> on_change;
++ boost::signals2::signal<void (bool)> on_change;
+
+ private:
+ CheckBox (const CheckBox&);
+diff --git a/src/pingus/components/choice_box.hpp b/src/pingus/components/choice_box.hpp
+index 49d6e1948..ef51b6dd2 100644
+--- src/pingus/components/choice_box.hpp
++++ src/pingus/components/choice_box.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_CHOICE_BOX_HPP
+ #define HEADER_PINGUS_PINGUS_COMPONENTS_CHOICE_BOX_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "engine/gui/rect_component.hpp"
+
+@@ -36,7 +36,7 @@ public:
+ void add_choice(const std::string& str);
+ void set_current_choice(int choice);
+
+- boost::signal<void (std::string)> on_change;
++ boost::signals2::signal<void (std::string)> on_change;
+
+ private:
+ ChoiceBox (const ChoiceBox&);
+diff --git a/src/pingus/components/slider_box.hpp b/src/pingus/components/slider_box.hpp
+index ae4d92406..75118eac2 100644
+--- src/pingus/components/slider_box.hpp
++++ src/pingus/components/slider_box.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_SLIDER_BOX_HPP
+ #define HEADER_PINGUS_PINGUS_COMPONENTS_SLIDER_BOX_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "engine/gui/rect_component.hpp"
+
+@@ -39,7 +39,7 @@ public:
+
+ void set_value(int v);
+
+- boost::signal<void (int)> on_change;
++ boost::signals2::signal<void (int)> on_change;
+
+ private:
+ SliderBox (const SliderBox&);
+diff --git a/src/pingus/config_manager.hpp b/src/pingus/config_manager.hpp
+index b07b83e65..4cf08e046 100644
+--- src/pingus/config_manager.hpp
++++ src/pingus/config_manager.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP
+ #define HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include "math/size.hpp"
+ #include "pingus/options.hpp"
+@@ -39,55 +39,55 @@ public:
+
+ void set_master_volume(int);
+ int get_master_volume() const;
+- boost::signal<void(int)> on_master_volume_change;
++ boost::signals2::signal<void(int)> on_master_volume_change;
+
+ void set_sound_volume(int);
+ int get_sound_volume() const;
+- boost::signal<void(int)> on_sound_volume_change;
++ boost::signals2::signal<void(int)> on_sound_volume_change;
+
+ void set_music_volume(int);
+ int get_music_volume() const;
+- boost::signal<void(int)> on_music_volume_change;
++ boost::signals2::signal<void(int)> on_music_volume_change;
+
+ void set_fullscreen_resolution(const Size& size);
+ Size get_fullscreen_resolution() const;
+- boost::signal<void(Size)> on_fullscreen_resolution_change;
++ boost::signals2::signal<void(Size)> on_fullscreen_resolution_change;
+
+ void set_fullscreen(bool);
+ bool get_fullscreen() const;
+- boost::signal<void(bool)> on_fullscreen_change;
++ boost::signals2::signal<void(bool)> on_fullscreen_change;
+
+ void set_renderer(FramebufferType type);
+ FramebufferType get_renderer() const;
+- boost::signal<void(FramebufferType)> on_renderer_change;
++ boost::signals2::signal<void(FramebufferType)> on_renderer_change;
+
+ void set_resizable(bool);
+ bool get_resizable() const;
+- boost::signal<void(bool)> on_resizable_change;
++ boost::signals2::signal<void(bool)> on_resizable_change;
+
+ void set_mouse_grab(bool);
+ bool get_mouse_grab() const;
+- boost::signal<void(bool)> on_mouse_grab_change;
++ boost::signals2::signal<void(bool)> on_mouse_grab_change;
+
+ void set_print_fps(bool);
+ bool get_print_fps() const;
+- boost::signal<void(bool)> on_print_fps_change;
++ boost::signals2::signal<void(bool)> on_print_fps_change;
+
+ void set_language(const tinygettext::Language&);
+ tinygettext::Language get_language() const;
+- boost::signal<void(const tinygettext::Language&)> on_language_change;
++ boost::signals2::signal<void(const tinygettext::Language&)> on_language_change;
+
+ void set_software_cursor(bool);
+ bool get_software_cursor() const;
+- boost::signal<void(bool)> on_software_cursor_change;
++ boost::signals2::signal<void(bool)> on_software_cursor_change;
+
+ void set_auto_scrolling(bool);
+ bool get_auto_scrolling() const;
+- boost::signal<void(bool)> on_auto_scrolling_change;
++ boost::signals2::signal<void(bool)> on_auto_scrolling_change;
+
+ void set_drag_drop_scrolling(bool);
+ bool get_drag_drop_scrolling() const;
+- boost::signal<void(bool)> on_drag_drop_scrolling_change;
++ boost::signals2::signal<void(bool)> on_drag_drop_scrolling_change;
+
+ private:
+ ConfigManager (const ConfigManager&);
+diff --git a/src/pingus/screens/option_menu.hpp b/src/pingus/screens/option_menu.hpp
+index 60b1578d2..154ef0f69 100644
+--- src/pingus/screens/option_menu.hpp
++++ src/pingus/screens/option_menu.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_PINGUS_PINGUS_SCREENS_OPTION_MENU_HPP
+ #define HEADER_PINGUS_PINGUS_SCREENS_OPTION_MENU_HPP
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <map>
+ #include <vector>
+
+@@ -66,7 +66,7 @@ private:
+ //Label* defaults_label;
+ //CheckBox* defaults_box;
+
+- typedef std::vector<boost::signals::connection> Connections;
++ typedef std::vector<boost::signals2::connection> Connections;
+ Connections connections;
+
+ tinygettext::Language m_language;
+--
+2.18.1
+
diff --git a/games/pingus/patches/scons-python3.patch b/games/pingus/patches/scons-python3.patch
new file mode 100644
index 0000000000..96c36e4563
--- /dev/null
+++ b/games/pingus/patches/scons-python3.patch
@@ -0,0 +1,19 @@
+--- pingus-0.7.6/SConscript.orig 2019-07-27 08:28:23.143619494 +0000
++++ pingus-0.7.6/SConscript 2019-07-27 08:29:35.844531921 +0000
+@@ -126,12 +126,12 @@
+ def configure_end(self):
+ self.env = self.conf.Finish()
+
+- print "Reports:"
+- print self.reports
++ print ("Reports:")
++ print (self.reports)
+
+ if not self.fatal_error == "":
+- print "Fatal Errors:"
+- print self.fatal_error
++ print ("Fatal Errors:")
++ print (self.fatal_error)
+ Exit(1)
+
+ def configure_gxx(self):
diff --git a/games/pingus/pingus.SlackBuild b/games/pingus/pingus.SlackBuild
index 453ff583dd..45e91f2094 100644
--- a/games/pingus/pingus.SlackBuild
+++ b/games/pingus/pingus.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for pingus
-# Copyright 2007-2013 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2007-2021 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -11,22 +11,22 @@
# 1. Redistributions of this script must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=pingus
VERSION=${VERSION:-0.7.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -80,7 +80,13 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Thanks archlinux
-patch -p1 < $CWD/missing-header.patch
+patch -p1 -i $CWD/patches/missing-header.patch
+patch -p1 -i $CWD/patches/scons-python3.patch
+patch -p0 -i $CWD/patches/pingus-boost-1.69.patch
+patch -p0 -i $CWD/patches/pingus-0.7.6-gcc470-udl.patch
+
+# Fix man-page location
+sed -i "s|/man1/|/man6/|g" Makefile
mkdir -p build
diff --git a/games/typhoon_2001/README b/games/typhoon_2001/README
index ffe5928951..18d5bcc347 100644
--- a/games/typhoon_2001/README
+++ b/games/typhoon_2001/README
@@ -1,10 +1,12 @@
+typhoon_2001 (a freeware game)
+
Typhoon 2001 is a freeware game inspired by both the Atari Jaguar hit
game Tempest 2000 and the arcade hit Tempest. It takes ideas and concepts
from both games, but rearranges and changes them. A few new ideas have
been implemented as well.
To run the Linux version of Typhoon 2001, you will need hardware OpenGL
-video accleration support for your X server.
+video acceleration support for your X server.
This game is not open source: it's distributed binary-only. The SlackBuild
simply installs the binary distribution files in the appropriate places,
diff --git a/games/typhoon_2001/doinst.sh b/games/typhoon_2001/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/games/typhoon_2001/doinst.sh
+++ b/games/typhoon_2001/doinst.sh
@@ -1,3 +1,9 @@
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
diff --git a/games/typhoon_2001/slack-desc b/games/typhoon_2001/slack-desc
index cc36052310..9f0fa3a547 100644
--- a/games/typhoon_2001/slack-desc
+++ b/games/typhoon_2001/slack-desc
@@ -14,6 +14,6 @@ typhoon_2001: and concepts from both games, but rearranges and changes them. A
typhoon_2001: few new ideas have been implemented as well.
typhoon_2001:
typhoon_2001: To run the Linux version of Typhoon 2001, you will need hardware
-typhoon_2001: OpenGL video accleration support for your X server.
+typhoon_2001: OpenGL video acceleration support for your X server.
typhoon_2001:
typhoon_2001: Homepage: http://typhoon.kuto.de/
diff --git a/games/typhoon_2001/typhoon_2001.SlackBuild b/games/typhoon_2001/typhoon_2001.SlackBuild
index 00961e63eb..3807ca82bc 100644
--- a/games/typhoon_2001/typhoon_2001.SlackBuild
+++ b/games/typhoon_2001/typhoon_2001.SlackBuild
@@ -11,11 +11,16 @@
# typhoon.cfg needs to be a real file and be writable by the user.
# (it will be created the first time the game is run).
+# 20211012 bkw: BUILD=2
+# - binary in /usr/games.
+# - new-style icons.
+# - fix typo in README and slack-desc.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=typhoon_2001
VERSION=${VERSION:-r3992}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -24,9 +29,6 @@ PKGTYPE=${PKGTYPE:-tgz}
# so the check is gone and the ARCH is hardcoded.
ARCH=i586
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -49,32 +51,31 @@ tar xvf $CWD/${PRGNAM}_$VERSION.tar.gz
# Don't trust the ownership/permissions...
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
chmod 755 typhoon
# OK, put everything where it goes in a proper Slack package...
mkdir -p $PKG/usr/share/games/$PRGNAM \
- $PKG/usr/libexec \
- $PKG/usr/doc/$PRGNAM-$VERSION \
- $PKG/install \
- $PKG/usr/bin
+ $PKG/usr/libexec \
+ $PKG/usr/doc/$PRGNAM-$VERSION \
+ $PKG/install \
+ $PKG/usr/games
-mv readme_linux.txt $PKG/usr/doc/$PRGNAM-$VERSION
-mv typhoon $PKG/usr/libexec
-mv * $PKG/usr/share/games/$PRGNAM
+cp -a readme_linux.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a typhoon $PKG/usr/libexec
+cp -a game *.mod *.dat $PKG/usr/share/games/$PRGNAM
-install -m 0755 $CWD/$PRGNAM $PKG/usr/bin/$PRGNAM
+install -m 0755 $CWD/$PRGNAM $PKG/usr/games/$PRGNAM
mkdir -p $PKG/usr/share/applications
cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
# Icon extracted from the windows .exe with wrestool, converted with icotool
-mkdir -p $PKG/usr/share/pixmaps
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+mkdir -p $PKG/usr/share/pixmaps \
+ $PKG/usr/share/icons/hicolor/32x32/apps
+cat $CWD/$PRGNAM.png > $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png
+ln -s ../icons/hicolor/32x32/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/games/typhoon_2001/typhoon_2001.desktop b/games/typhoon_2001/typhoon_2001.desktop
index 75fef3dfc9..30702c0be8 100644
--- a/games/typhoon_2001/typhoon_2001.desktop
+++ b/games/typhoon_2001/typhoon_2001.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Typhoon 2001
-Exec=typhoon_2001
+Exec=/usr/games/typhoon_2001
Type=Application
Icon=typhoon_2001
-GenericName=Typhoon 2001 Game
+GenericName=Tempest-like game
Categories=Game;ArcadeGame;
diff --git a/games/warzone2100/warzone2100.SlackBuild b/games/warzone2100/warzone2100.SlackBuild
index f98e6f8929..b73e81e24a 100644
--- a/games/warzone2100/warzone2100.SlackBuild
+++ b/games/warzone2100/warzone2100.SlackBuild
@@ -34,7 +34,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=warzone2100
-VERSION=${VERSION:-4.1.1}
+VERSION=${VERSION:-4.1.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/games/warzone2100/warzone2100.info b/games/warzone2100/warzone2100.info
index 23672267a3..530054b137 100644
--- a/games/warzone2100/warzone2100.info
+++ b/games/warzone2100/warzone2100.info
@@ -1,8 +1,8 @@
PRGNAM="warzone2100"
-VERSION="4.1.1"
-HOMEPAGE="http://wz2100.net"
-DOWNLOAD="https://github.com/Warzone2100/warzone2100/releases/download/4.1.1/warzone2100_src.tar.xz"
-MD5SUM="b1fc772779ac03ec71b45b4b13dd3c3f"
+VERSION="4.1.3"
+HOMEPAGE="https://wz2100.net"
+DOWNLOAD="https://github.com/Warzone2100/warzone2100/releases/download/4.1.3/warzone2100_src.tar.xz"
+MD5SUM="8593b6f324c0b09a0644d63f97916f74"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="physfs"
diff --git a/games/widelands/doinst.sh b/games/widelands/doinst.sh
index 3857649f50..11813c3101 100644
--- a/games/widelands/doinst.sh
+++ b/games/widelands/doinst.sh
@@ -1,3 +1,9 @@
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications &> /dev/null
fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
diff --git a/games/widelands/widelands-1.0-boost-1.77.patch b/games/widelands/widelands-1.0-boost-1.77.patch
new file mode 100644
index 0000000000..69c1cb8caf
--- /dev/null
+++ b/games/widelands/widelands-1.0-boost-1.77.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/808747
+
+https://github.com/widelands/widelands/commit/316eaea
+From: matthiakl <t-m.42@mailpost.spdns.org>
+Date: Sat, 14 Aug 2021 19:24:08 +0200
+Subject: [PATCH] Added missing direct incude (#5025)
+--- a/src/network/bufferedconnection.h
++++ b/src/network/bufferedconnection.h
+@@ -20,6 +20,7 @@
+ #ifndef WL_NETWORK_BUFFEREDCONNECTION_H
+ #define WL_NETWORK_BUFFEREDCONNECTION_H
+
++#include <map>
+ #include <memory>
+ #include <mutex>
+ #include <thread>
diff --git a/games/widelands/widelands.SlackBuild b/games/widelands/widelands.SlackBuild
index e3d5408257..8af1205fdd 100644
--- a/games/widelands/widelands.SlackBuild
+++ b/games/widelands/widelands.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for widelands
-# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2021 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -11,21 +11,21 @@
# 1. Redistributions of this script must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=widelands
-VERSION=${VERSION:-build21}
+VERSION=${VERSION:-1.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -70,7 +70,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-source.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -79,32 +79,31 @@ 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 building against boost 1.77.0
+patch -p1 -i $CWD/widelands-1.0-boost-1.77.patch
+
mkdir -p build1
cd build1
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_PREFIX=/usr/bin \
-DCMAKE_BUILD_TYPE=Release \
- -DWL_INSTALL_PREFIX=/usr \
-DWL_INSTALL_DATADIR=/usr/share/widelands \
+ -DWL_INSTALL_BASEDIR=/usr/doc/$PRGNAM-$VERSION \
+ -DGTK_UPDATE_ICON_CACHE=OFF \
..
make
make install DESTDIR=$PKG
cd ..
-mkdir -p $PKG/usr/bin
-mv $PKG/usr/{widelands,wl_map_object_info,wl_map_info,wl_create_spritesheet} $PKG/usr/bin
-
-mkdir -p $PKG/usr/share/applications
-install -m 0644 $CWD/widelands.desktop \
- $PKG/usr/share/applications/widelands.desktop
+mv $PKG/usr/share/man $PKG/usr/
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/{VERSION,ChangeLog,CREDITS,COPYING} $PKG/usr/doc/$PRGNAM-$VERSION
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/games/widelands/widelands.desktop b/games/widelands/widelands.desktop
deleted file mode 100644
index 8c62d39991..0000000000
--- a/games/widelands/widelands.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Widelands
-Name[de]=Widelands
-Comment="Settlers II" clone
-Comment[de]= Ein "Siedler II" Clone
-Exec=widelands
-Icon=/usr/share/games/widelands/pics/wl-ico-48.png
-Terminal=false
-Type=Application
-Categories=Game;StrategyGame;
diff --git a/games/widelands/widelands.info b/games/widelands/widelands.info
index 0287fabcc3..a9a9e667ed 100644
--- a/games/widelands/widelands.info
+++ b/games/widelands/widelands.info
@@ -1,10 +1,10 @@
PRGNAM="widelands"
-VERSION="build21"
+VERSION="1.0"
HOMEPAGE="http://www.widelands.org"
-DOWNLOAD="https://launchpad.net/widelands/build21/build21/+download/widelands-build21-source.tar.gz"
-MD5SUM="2933da247b2009f5608e92624d606851"
+DOWNLOAD="https://github.com/widelands/widelands/archive/v1.0/widelands-1.0.tar.gz"
+MD5SUM="ac576b20273205a09bc1e6dc19550499"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="lua"
+REQUIRES=""
MAINTAINER="Heinz Wiesinger"
EMAIL="pprkut@slackbuilds.org"
diff --git a/games/xspacewarp/README b/games/xspacewarp/README
index d2dcecc72e..f10ecc74c3 100644
--- a/games/xspacewarp/README
+++ b/games/xspacewarp/README
@@ -1,5 +1,7 @@
-In xspacewarp the player maneuvers a Federation spaceship, called the Endever,
-through 81 sectors of space trying to destroy an Armada of enemy Jovian ships
-before they destroy the all the Federation bases.
+xspacewarp (Time Trek like game for X Window System)
+
+In xspacewarp the player maneuvers a Federation spaceship, called the
+Endever, through 81 sectors of space trying to destroy an Armada of
+enemy Jovian ships before they destroy the all the Federation bases.
Ported to X from a game originally written for the TRS-80 in 1977.
diff --git a/games/xspacewarp/XSpacewarp b/games/xspacewarp/XSpacewarp
deleted file mode 100644
index 15960e6a1e..0000000000
--- a/games/xspacewarp/XSpacewarp
+++ /dev/null
@@ -1,267 +0,0 @@
-! app-defaults for xspacewarp 1.2 (12/22/95)
-
-! whether to use mouse pointer inside xspacewarp window
-*nomouse: true
-
-! number rows of 9x15 blocks in a sector of the universe
-*rows: 26
-
-! number columns of 9x15 blocks in a sector of the universe
-*columns: 79
-
-! The following resources refer to the number of bases, jovians,
-! stars and blackholes in the universe. "min" values correspond
-! to the lowest skill level of the game and "max" values
-! correspond to the highest skill level. Values for the other
-! skill levels are interpolated linearly between the "min" value
-! and the "max" value. Populations are chosen randomly in the
-! range: (average) +/- (variation).
-
-! Limits for the average population and the variation in
-! population for bases. The actual average and variation used
-! is interpolated linearly from these limits as a function of
-! the skill level.
-
-*minAverageBasePop: 18
-*maxAverageBasePop: 18
-*minVariationBasePop: 3
-*maxVariationBasePop: 3
-
-! Limits for the average population and the variation in
-! population for jovians.
-
-*minAverageJovianPop: 10
-*maxAverageJovianPop: 73
-*minVariationJovianPop: 3
-*maxVariationJovianPop: 3
-
-! Limits for the average population and the variation in
-! population for stars.
-
-*minAverageStarPop: 75
-*maxAverageStarPop: 75
-*minVariationStarPop: 5
-*maxVariationStarPop: 5
-
-! Limits for the average population and the variation in
-! population for blackholes.
-
-*minAverageBlackholePop: 5
-*maxAverageBlackholePop: 5
-*minVariationBlackholePop: 4
-*maxVariationBlackholePop: 4
-
-! color for text and graphical borders
-*foreground: white
-
-! background color for everything
-*background: black
-
-! visual representation of the endever (icon must have exactly 3 characters)
-*endeverColor: white
-*endeverIcon: >-0
-
-! visual representation of the jovians (icon must have exactly 3 characters)
-*jovianColor: white
-*jovianIcon: <*>
-
-! visual representation of the bases (icon must have exactly 3 characters)
-*baseColor: white
-*baseIcon: +0+
-
-! visual representation of the stars (icon must have exactly 1 character)
-*starColor: white
-*starIcon: .
-
-! visual representation of the blackholes (icon must have exactly 1 character)
-*blackholeColor: black
-*blackholeIcon: \040
-
-! faser color
-*faserColor: white
-
-! torpedo color
-*torpedoColor: white
-
-! Fasers are drawn as dashed lines. The dash list describes the
-! dash pattern of the line. A list such as "3 2 4" (elements of
-! the list are separated by \040, the octal code for a space
-! character) will make a dash pattern that has the first 3
-! pixels of the line lit, the next 2 pixels dark and the next 4
-! pixels lit. This pattern is repeated through the dashed
-! line. The dash offset is the pixel in the dash list at which
-! to begin the pattern. Eg, offset=3 in the example above would
-! mean starting the dashed line with 2 lit pixels followed by 4
-! unlit pixels and then 3 lit pixels, etc.
-*faserDashList: 4\0404
-*faserDashOffset: 0
-
-! Thickness of faser in pixels
-*faserWidth: 9
-
-! millisec time determines speed of ion thrusters
-*endeverThrustSpeed: 100
-
-! millisec interval for ship (base, jovian, endever) re-energizing
-*shipEnergizeSpeed: 3000
-
-! millisec interval between jovian actions
-*jovianActionSpeed: 100
-
-! millisec interval for faser movement
-*faserSpeed: 15
-
-! millisec interval for torpedo movement
-*torpedoSpeed: 30
-
-! dimensions of torpedo (in pixels)
-*torpedoLength: 6
-*torpedoWidth: 9
-
-! millisec interval for rate of explosion growth
-*explosionSpeed: 20
-
-*explosionColor: white
-
-! radius to use for most ship explosions
-*explosionRadiusSmall: 35
-
-! radius to use for endever self-destruct explosion
-*explosionRadiusBig: 200
-
-! endever self-destruct code
-*selfDestructCode: 123
-
-! endever default faser/torpedo angle (radians). type float.
-*defaultFiringAngle: 0.0
-
-! starting number of torpedoes for endever
-*maxTorpedoes: 10
-
-*maxJoviansPerSector: 3
-*maxStarsPerSector: 5
-
-! probability a sector is masked (percent)
-*maskProbability: 5
-
-! When the Endever leaps into a new sector, it gets placed at a
-! random location inside that sector. The euclidean distance
-! (in pixels) from this location to the jovians inside the
-! sector is at least this value.
-
-*minJovianDistance: 150
-
-! min percent energy needed for endever fasers to work
-*endeverMinFaserEnergy: 10
-
-! min percent energy for endever warpdrive to work
-*endeverMinWarpEnergy: 20
-
-! min percent energy for endever ion thrusters to work
-*endeverMinThrustEnergy: 10
-
-! min percent energy needed for jovian fasers to work
-*jovianMinFaserEnergy: 10
-
-! min percent energy for jovian warpdrive to work
-*jovianMinWarpEnergy: 20
-
-! min percent energy for ion thrusters to work
-*jovianMinThrustEnergy: 10
-
-
-! Now some "artificial intelligence" parameters for controlling
-! jovian behavior.
-
-! If the percent energy levels (ie, percent of maximum energy)
-! of the thrusters, warpdrive, fasers and shields of a jovian
-! drop to levels less than the respective "retreat" energies
-! given below, then the jovian will exit the battle scene with
-! probability (given as a percent)
-! jovianRetreatProbability. jovianRetreatSpeed (type float) is
-! the average rate (movements/sec) at which the jovian retreats
-! toward the sector edge. Thus if jovianRetreatSpeed is 1.4,
-! then a fleeing jovian will make a movement toward the edge of
-! the sector, on average, once every 1.4 seconds. And if the
-! jovian happens to already be on the edge of the sector, then
-! the jovian will leap to a different sector (if its warpdrive
-! energy is adequate) after a pause of 1.4 seconds on average.
-
-*jovianThrustRetreatEnergy: 30
-*jovianWarpRetreatEnergy: 40
-*jovianFaserRetreatEnergy: 30
-*jovianShieldRetreatEnergy: 40
-*jovianRetreatProbability: 50
-*jovianRetreatSpeed: 1.0
-
-
-! If the endever or a base being raided is in the same sector as
-! a jovian, then the jovian moves or shoots (on average) every
-! jovianMaxFightFrequency seconds in the highest skill level of
-! the game and every jovianMinFightFrequency seconds in lowest
-! skill level. Fight frequencies for the other skill levels are
-! interpolated linearly between jovianMinFightFrequency and
-! jovianMaxFightFrequency. These resources are type "float".
-
-*jovianMaxFightFrequency: 1.5
-*jovianMinFightFrequency: 3.5
-
-! When a sector contains a base and a jovian, but not the
-! endever, then there is a possibility of an attack or "raid" on
-! the base. These resources are the average time in seconds
-! before some jovian somewhere in the universe launches a raid
-! on a base. jovianMaxRaidFrequency is for the highest skill
-! level, jovianMinRaidFrequency is for the lowest skill
-! level. Values for other skill levels are interpolated linearly
-! between these extremes. These resources are type "float".
-
-*jovianMaxRaidFrequency: 40.0
-*jovianMinRaidFrequency: 400.0
-
-! If a jovian is in a sector containing neither a base nor the
-! endever, then there is a possibility of the jovian leaping to
-! a different sector. These resources are the average number of
-! seconds until some jovian somewhere in the universe leaps to a
-! sector containing a base or the
-! endever. jovianMaxLeapFrequency is for the highest skill level
-! and jovianMinLeapFrequency is for the lowest skill
-! level. Values for the other skill levels are interpolated in
-! between these extremes. These resources are type "float".
-
-*jovianMaxLeapFrequency: 40.0
-*jovianMinLeapFrequency: 400.0
-
-! key bindings for the endever
-
-*widget.translations: #replace \n\
- <Expose>: expose() \n\
- <Key>KP_Up: move(up) \n\
- <Key>KP_Down: move(down) \n\
- <Key>KP_Left: move(left) \n\
- <Key>KP_Right: move(right) \n\
- <Key>Up: move(up) \n\
- <Key>Down: move(down) \n\
- <Key>Left: move(left) \n\
- <Key>Right: move(right) \n\
- <Key>space: mission(start) sector() \n\
- <Key>1: input() scanner() \n\
- <Key>2: input() summary() \n\
- <Key>3: input() leap() \n\
- <Key>4: input() shields() \n\
- <Key>5: input() fasers() \n\
- <Key>6: input() torpedoes() \n\
- <Key>7: input() selfdestruct() \n\
- <Key>8: input() \n\
- <Key>9: input() \n\
- <Key>0: input() \n\
- <Key>-: input() \n\
- <Key>Return: endinput() \n\
- <Key>BackSpace: backspace() \n\
- <Key>n: orientation(next) replay(no) \n\
- <Key>o: mission(orient) \n\
- <Key>p: orientation(prev) pause() \n\
- <Key>q: orientation(quit) \n\
- <Key>y: replay(yes)
-
-! end app-defaults
-
diff --git a/games/xspacewarp/doinst.sh b/games/xspacewarp/doinst.sh
index 1015d8fd4d..519aaca034 100644
--- a/games/xspacewarp/doinst.sh
+++ b/games/xspacewarp/doinst.sh
@@ -16,3 +16,9 @@ config etc/X11/app-defaults/XSpacewarp.new
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
diff --git a/games/xspacewarp/slack-desc b/games/xspacewarp/slack-desc
index 25c2651c01..3b0bd7daa5 100644
--- a/games/xspacewarp/slack-desc
+++ b/games/xspacewarp/slack-desc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-xspacewarp: xspacewarp (Time Trek - like game for X Window System)
+xspacewarp: xspacewarp (Time Trek like game for X Window System)
xspacewarp:
xspacewarp: In xspacewarp the player maneuvers a Federation spaceship, called the
xspacewarp: Endever, through 81 sectors of space trying to destroy an Armada of
diff --git a/games/xspacewarp/winclose.diff b/games/xspacewarp/winclose.diff
new file mode 100644
index 0000000000..15da48e27d
--- /dev/null
+++ b/games/xspacewarp/winclose.diff
@@ -0,0 +1,78 @@
+diff -Naur xspacewarp-1.2/actions.cc xspacewarp-1.2.patched/actions.cc
+--- xspacewarp-1.2/actions.cc 2021-10-12 04:25:30.580232070 -0400
++++ xspacewarp-1.2.patched/actions.cc 2021-10-12 05:37:05.063841685 -0400
+@@ -287,6 +287,7 @@
+ break;
+ case 'n': // quit xspacewarp
+ cout << "Live long and prosper!" << endl;
++ XCloseDisplay(XtDisplay(w));
+ exit(0);
+ default:
+ cerr << "xspacewarp: replay: unknown argument in X defaults." << endl;
+@@ -310,6 +311,12 @@
+ }
+ }
+
++void quit(Widget w, XEvent *event, String *str, Cardinal *len) {
++ if(event->type == ClientMessage && ((Atom) event->xclient.data.l[0]) == wm_delete_window) {
++ XCloseDisplay(XtDisplay(w));
++ exit(0);
++ }
++}
+
+ // not an action but invoked by one.
+ // Initialize Jovian AI data and start AppTimeOuts so jovians
+diff -Naur xspacewarp-1.2/globals.hh xspacewarp-1.2.patched/globals.hh
+--- xspacewarp-1.2/globals.hh 1995-12-29 02:41:39.000000000 -0500
++++ xspacewarp-1.2.patched/globals.hh 2021-10-12 05:03:56.900022417 -0400
+@@ -24,6 +24,7 @@
+ extern Pixmap pixmap;
+ extern GC def_GC, defrv_GC, faserGC, faserGC_rv, torpGC, torpGC_rv, explodeGC;
+ extern GC endeverGC, baseGC, jovianGC, starGC, blackholeGC;
++extern Atom wm_delete_window;
+
+ extern Sector universe[UROWS][UCOLS];
+ extern GameState gamestate;
+diff -Naur xspacewarp-1.2/xprep.cc xspacewarp-1.2.patched/xprep.cc
+--- xspacewarp-1.2/xprep.cc 2021-10-12 04:25:30.587232070 -0400
++++ xspacewarp-1.2.patched/xprep.cc 2021-10-12 05:23:53.950913600 -0400
+@@ -28,6 +28,7 @@
+ static int read_dashes(const char *, char *);
+ static void check_values(void);
+
++Atom wm_delete_window;
+
+ void xprep(int argc, char **argv)
+ {
+@@ -66,6 +67,10 @@
+
+ XtRealizeWidget(toplevel);
+
++ wm_delete_window = XInternAtom(XtDisplay(toplevel), "WM_DELETE_WINDOW", False);
++ XSetWMProtocols(XtDisplay(toplevel), XtWindow(toplevel), &wm_delete_window, 1);
++ XtOverrideTranslations(toplevel, XtParseTranslationTable("<Message>WM_PROTOCOLS: quit()"));
++
+ // if desired, install an invisible mouse cursor
+ // that does not block view of xspacewarp.
+
+diff -Naur xspacewarp-1.2/xprep.hh xspacewarp-1.2.patched/xprep.hh
+--- xspacewarp-1.2/xprep.hh 2021-10-12 04:25:30.588232069 -0400
++++ xspacewarp-1.2.patched/xprep.hh 2021-10-12 05:29:26.455883374 -0400
+@@ -39,6 +39,7 @@
+ extern void endinput(Widget, XEvent *, String *, Cardinal *);
+ extern void replay(Widget, XEvent *, String *, Cardinal *);
+ extern void pause(Widget, XEvent *, String *, Cardinal *);
++extern void quit(Widget, XEvent *, String *, Cardinal *);
+
+ static XtActionsRec actions[] =
+ {
+@@ -58,7 +59,8 @@
+ {(char*)"backspace", (XtActionProc)backspace},
+ {(char*)"endinput", (XtActionProc)endinput},
+ {(char*)"replay", (XtActionProc)replay},
+- {(char*)"pause", (XtActionProc)pause}
++ {(char*)"pause", (XtActionProc)pause},
++ {(char*)"quit", (XtActionProc)quit},
+ };
+
+
diff --git a/games/xspacewarp/xspacewarp.SlackBuild b/games/xspacewarp/xspacewarp.SlackBuild
index f620f0171b..27305a04a2 100644
--- a/games/xspacewarp/xspacewarp.SlackBuild
+++ b/games/xspacewarp/xspacewarp.SlackBuild
@@ -1,49 +1,35 @@
#!/bin/bash
# Slackware build script for xspacewarp
-# Time Trek - like game for X Window System
-# Written by Niels Horn <niels.horn@gmail.com>
+# Written by Niels Horn <email removed>.
+# man page by Luis Henrique <email removed>.
+# Formerly maintained by Ryan P.C. McQuen.
+# Now maintained by B. Watson <yalhcru@gmail.com>.
-# man-page and app-defaults files by Luis Henrique <lmello.009@gmail.com>
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-# Formerly maintained by:
-# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
-
-# Now maintained by B. Watson <yalhcru@gmail.com>
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version, with the following exception:
-# the text of the GPL license may be omitted.
-
-# This program is distributed in the hope that it will be useful, but
-# without any warranty; without even the implied warranty of
-# merchantability or fitness for a particular purpose. Compiling,
-# interpreting, executing or merely reading the text of the program
-# may result in lapses of consciousness and/or very being, up to and
-# including the end of all existence and the Universe as we know it.
-# See the GNU General Public License for more details.
-
-# You may have received a copy of the GNU General Public License along
-# with this program (most likely, a file named COPYING). If not, see
-# <http://www.gnu.org/licenses/>.
+# 20211012 bkw: BUILD=3
+# - relicense as WTFPL with permissions from Ryan (who was the one
+# who originally added the license).
+# - new-style icon.
+# - use copy of app defaults file shipped with the source, instead
+# of including our own. they were identical except for one extra
+# blank line.
+# - fix man page typos.
+# - make the window close button work.
# 20170309 bkw:
# - take over maintenance
# - fix download & homepage URLs
# - i486 => i586
# - minor tweaks
-# - TODO: re-enable the close button on the window? I don't see a way
-# to quit the game (nothing mentioned in the 'Orientation', man page,
-# or README).
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=xspacewarp
VERSION=${VERSION:-1.2b}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -57,9 +43,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -92,15 +75,17 @@ rm -rf $PRGNAM-$SRCVER
tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
cd $PRGNAM-$SRCVER
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# Apply patch to version 1.2b (adapt for modern gcc compiler)
patch -p1 < $CWD/version12b.patch
+# Patch by B. Watson: make the window close button work. This took
+# more effort than I wanted it to... and I had to look at the source
+# to xbiff to see how this gibberish works.
+patch -p1 < $CWD/winclose.diff
+
xmkmf
make Makefile
make CDEBUGFLAGS="$SLKCFLAGS -fno-strength-reduce -fno-strict-aliasing" $PRGNAM
@@ -108,17 +93,18 @@ make CDEBUGFLAGS="$SLKCFLAGS -fno-strength-reduce -fno-strict-aliasing" $PRGNAM
strip $PRGNAM
make install BINDIR=/usr/games DESTDIR=$PKG
-mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps
+mkdir -p $PKG/usr/share/applications \
+ $PKG/usr/share/pixmaps \
+ $PKG/usr/share/icons/hicolor/32x32/apps
cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+cat $CWD/$PRGNAM.png > $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png
+ln -s ../icons/hicolor/32x32/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
-# Install X app-defaults
mkdir -p $PKG/etc/X11/app-defaults
-cat $CWD/XSpacewarp > $PKG/etc/X11/app-defaults/XSpacewarp.new
+cat XSpacewarp.app_def > $PKG/etc/X11/app-defaults/XSpacewarp.new
-# Put man-page in package
mkdir -p $PKG/usr/man/man6
-cat $CWD/xspacewarp.man | gzip -9 > $PKG/usr/man/man6/xspacewarp.6.gz
+gzip -9c <$CWD/xspacewarp.man > $PKG/usr/man/man6/xspacewarp.6.gz
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a CHANGES $PKG/usr/doc/$PRGNAM-$VERSION/
diff --git a/games/xspacewarp/xspacewarp.desktop b/games/xspacewarp/xspacewarp.desktop
index 0fa4793e08..f431de2f7a 100644
--- a/games/xspacewarp/xspacewarp.desktop
+++ b/games/xspacewarp/xspacewarp.desktop
@@ -4,7 +4,6 @@ Type=Application
Name=XSpaceWarp
Comment=Live long and prosper!
Categories=Game;
-Exec=xspacewarp
+Exec=/usr/games/xspacewarp
Icon=xspacewarp
StartupNotify=false
-
diff --git a/games/xspacewarp/xspacewarp.man b/games/xspacewarp/xspacewarp.man
index f2ed190759..e4b462c682 100644
--- a/games/xspacewarp/xspacewarp.man
+++ b/games/xspacewarp/xspacewarp.man
@@ -1,4 +1,4 @@
-.TH XSPACEWARP 6 "July 26, 2010"
+.TH XSPACEWARP 6 "October 2021" "1.2b" "SlackBuilds.org"
.SH NAME
xspacewarp -\ Time Trek like game for X Window System
.SH SYNOPSIS
@@ -10,7 +10,7 @@ xspacewarp -\ Time Trek like game for X Window System
In \fBxspacewarp\fP the player maneuvers a Federation spaceship,
called the Endever, through 81 sectors of space trying to
destroy an Armada of enemy Jovian ships before they destroy the
-all the Federation bases. To accompish this task, the Endever
+all the Federation bases. To accomplish this task, the Endever
has fasers, ion thrust engines, warpdrive for jumping between
sectors, a limited number of photon torpedoes, and a finite
store of energy which gets depleted during battles and must be
@@ -20,13 +20,13 @@ limit and has a choice of 10 skill levels.
Ported to X from a game originally written for the TRS-80 in 1977.
.SH OPTIONS
.B xspacewarp
-only takes default \fIX options\fR, see X(7) for more details.
+only takes default \fIX options\fR, see \fBX\fR(7) for more details.
.SH FILES
-You can modify pratically every single variable of the game by
-making a copy of \fI/etc/X11/app-defaults/XSpacewarp\fR into your
+You can modify practically every single variable of the game by
+making a copy of \fI/etc/X11/app-defaults/XSpacewarp\fR in your
home directory and tweaking it accordingly.
.SH SEE ALSO
-X(7)
+\fBX\fR(7)
.SH CREDITS
Joshua Lavinsky - original TRS-80 program (1977)
.br
diff --git a/games/xu4/README b/games/xu4/README
index 79217a2373..9d3b15967e 100644
--- a/games/xu4/README
+++ b/games/xu4/README
@@ -1,11 +1,13 @@
-XU4 is a remake of the computer game Ultima IV. The goal is to make
+xu4 (Ultima IV remake)
+
+XU4 is a remake of the computer game Ultima IV. The goal is to make
it easy and convenient to play this classic on modern operating
systems.
XU4 isn't a new game based on the Ultima IV story -- it is a faithful
-recreation of the old game, right up to the crappy graphics. If you
+recreation of the old game, right up to the crappy graphics. If you
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
+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
diff --git a/games/xu4/disable_alt_x.diff b/games/xu4/disable_alt_x.diff
new file mode 100644
index 0000000000..62f18c3f76
--- /dev/null
+++ b/games/xu4/disable_alt_x.diff
@@ -0,0 +1,24 @@
+diff -Naur xu4-20130612_svn/src/event_sdl.cpp xu4-20130612_svn.patched/src/event_sdl.cpp
+--- xu4-20130612_svn/src/event_sdl.cpp 2013-06-12 19:34:25.000000000 -0400
++++ xu4-20130612_svn.patched/src/event_sdl.cpp 2021-10-12 03:38:36.048487922 -0400
+@@ -43,7 +43,7 @@
+ case U4_META + 'q': /* Cmd+q */
+ case U4_META + 'x': /* Cmd+x */
+ #endif
+- case U4_ALT + 'x': /* Alt+x */
++ // case U4_ALT + 'x': /* Alt+x */
+ #if defined(WIN32)
+ case U4_ALT + U4_FKEY + 3:
+ #endif
+diff -Naur xu4-20130612_svn/src/game.cpp xu4-20130612_svn.patched/src/game.cpp
+--- xu4-20130612_svn/src/game.cpp 2013-06-12 19:34:24.000000000 -0400
++++ xu4-20130612_svn.patched/src/game.cpp 2021-10-12 03:33:55.794513398 -0400
+@@ -1205,7 +1205,7 @@
+ screenMessage("Quit & Save...\n%d moves\n", c->saveGame->moves);
+ if (c->location->context & CTX_CAN_SAVE_GAME) {
+ gameSave();
+- screenMessage("Press Alt-x to quit\n");
++ screenMessage("Close window to quit\n");
+ }
+ else screenMessage("%cNot here!%c\n", FG_GREY, FG_WHITE);
+
diff --git a/games/xu4/doinst.sh b/games/xu4/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/games/xu4/doinst.sh
+++ b/games/xu4/doinst.sh
@@ -1,3 +1,9 @@
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
diff --git a/games/xu4/icons/128.png b/games/xu4/icons/128.png
new file mode 100644
index 0000000000..40d12d1bb7
--- /dev/null
+++ b/games/xu4/icons/128.png
Binary files differ
diff --git a/games/xu4/icons/16.png b/games/xu4/icons/16.png
new file mode 100644
index 0000000000..d96bf37a3f
--- /dev/null
+++ b/games/xu4/icons/16.png
Binary files differ
diff --git a/games/xu4/icons/32.png b/games/xu4/icons/32.png
new file mode 100644
index 0000000000..bc594186b6
--- /dev/null
+++ b/games/xu4/icons/32.png
Binary files differ
diff --git a/games/xu4/icons/48.png b/games/xu4/icons/48.png
new file mode 100644
index 0000000000..43b3509bbe
--- /dev/null
+++ b/games/xu4/icons/48.png
Binary files differ
diff --git a/games/xu4/icons/64.png b/games/xu4/icons/64.png
new file mode 100644
index 0000000000..8f5f6b38b6
--- /dev/null
+++ b/games/xu4/icons/64.png
Binary files differ
diff --git a/games/xu4/slack-desc b/games/xu4/slack-desc
index 992d9f91e2..3a8e1dfd4a 100644
--- a/games/xu4/slack-desc
+++ b/games/xu4/slack-desc
@@ -8,12 +8,12 @@
|-----handy-ruler------------------------------------------------------|
xu4: xu4 (Ultima IV remake)
xu4:
-xu4: XU4 is a remake of the computer game Ultima IV. The goal is to make
+xu4: XU4 is a remake of the computer game Ultima IV. The goal is to make
xu4: it easy and convenient to play this classic on modern operating
xu4: systems.
xu4:
xu4: XU4 isn't a new game based on the Ultima IV story -- it is a faithful
-xu4: recreation of the old game, right up to the crappy graphics. If you
+xu4: recreation of the old game, right up to the crappy graphics. If you
xu4: are looking for a game with modern gameplay and graphics, this is not
-xu4: it -- yet. New features that improve the gameplay and keep with the
+xu4: it -- yet. New features that improve the gameplay and keep with the
xu4: spirit of the original game will be added.
diff --git a/games/xu4/u4.1 b/games/xu4/u4.6
index 0fc8fe2376..5ccf1d4bd6 100644
--- a/games/xu4/u4.1
+++ b/games/xu4/u4.6
@@ -1,4 +1,4 @@
-.TH u4 1 "26 Oct 2011" "Version 1.1+svn" "XU4 Manual"
+.TH u4 6 "12 Oct 2021" "Version 1.1+svn" "XU4 Manual"
.SH NAME
\fBu4\fR \- A modern reimplementation of the classic Ultima IV role\-playing game.
diff --git a/games/xu4/u4.desktop b/games/xu4/u4.desktop
index 6674892a97..cbe5634486 100644
--- a/games/xu4/u4.desktop
+++ b/games/xu4/u4.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Ultima 4
Comment=Ultima 4 (xu4)
-Exec=u4
+Exec=/usr/games/u4
Icon=u4
Terminal=false
Type=Application
diff --git a/games/xu4/xu4.SlackBuild b/games/xu4/xu4.SlackBuild
index 4a6347643f..443875df22 100644
--- a/games/xu4/xu4.SlackBuild
+++ b/games/xu4/xu4.SlackBuild
@@ -6,11 +6,21 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211012 bkw: BUILD=3,
+# - new-style icon.
+# - binary in /usr/games.
+# - man page in section 6.
+# - disable Alt-x keystroke (it crashes the game).
+# - "Press Alt-x to quit" => "Close window to quit".
+
+# TODO: make Alt-x stop crashing the game. It seems to work correctly
+# only at the main menu, not while playing. Disabled it for now.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=xu4
VERSION=${VERSION:-20130612_svn}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +32,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -57,11 +64,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# There actually are some executables in the lib dir. If there hadn't
# been, I would have left it as /usr/lib even on 64-bit, or better yet
@@ -86,9 +90,13 @@ sed -i '/#define *DEFAULT_VALIDATE_XML/s,1,0,' src/settings.h
# Patch for GCC 7
patch -p1 < $CWD/gcc7.patch
+# 20211012 bkw: work around a bug. Disable Alt-X as it crashes the
+# game. Tell the user to close the window to quit, instead.
+patch -p1 < $CWD/disable_alt_x.diff
+
# 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
+make -C src install prefix=$PKG/usr bindir=$PKG/usr/games libdir=$PKGLIBDIR
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -120,6 +128,18 @@ find $PKGLIBDIR \
-name \*.xml -o -name \*.dtd -o -name \*.ogg \) \
-print0 | xargs -0 chmod 644
+# 20211012 bkw: new-style icon...
+for i in $CWD/icons/*.png; do
+ px=$( basename $i | cut -d. -f1 )
+ size=${px}x${px}
+ dir=$PKG/usr/share/icons/hicolor/$size/apps
+ mkdir -p $dir
+ cat $i > $dir/u4.png
+done
+
+rm -f $PKG/usr/share/pixmaps/u4.png
+ln -s ../icons/hicolor/64x64/apps/u4.png $PKG/usr/share/pixmaps/u4.png
+
# Docs. N.B. we don't need border.png.
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/developers
cp -a *.html AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
@@ -167,13 +187,13 @@ sed -i 's/\r//' *.txt
cd -
# I hate packages called "xfoo" whose binaries are called "foo".
-ln -s u4 $PKG/usr/bin/$PRGNAM
+ln -s u4 $PKG/usr/games/$PRGNAM
# I also hate binaries that take options but have no man pages, so here's
# the one I made. Enjoy.
-mkdir -p $PKG/usr/man/man1
-sed "s/@VERSION@/$VERSION/" $CWD/u4.1 | gzip -9c - > $PKG/usr/man/man1/u4.1.gz
-ln -s u4.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz
+mkdir -p $PKG/usr/man/man6
+sed "s/@VERSION@/$VERSION/" $CWD/u4.6 | gzip -9c - > $PKG/usr/man/man6/u4.6.gz
+ln -s u4.6.gz $PKG/usr/man/man6/$PRGNAM.6.gz
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/games/xu4/xu4.info b/games/xu4/xu4.info
index 7c0e1d4661..4678af5b50 100644
--- a/games/xu4/xu4.info
+++ b/games/xu4/xu4.info
@@ -2,7 +2,7 @@ PRGNAM="xu4"
VERSION="20130612_svn"
HOMEPAGE="http://xu4.sourceforge.net/"
DOWNLOAD="https://slackware.uk/~urchlay/src/xu4-20130612_svn.tar.xz \
- http://www.thatfleminggent.com/ultima/ultima4.zip"
+ https://web.archive.org/web/20091209235819/http://www.thatfleminggent.com/ultima/ultima4.zip"
MD5SUM="a0c013bf91458b2b4c5ad8c729990d62 \
f2006a5dbf175571912ef2594b6eb900"
DOWNLOAD_x86_64=""
diff --git a/games/yae/README b/games/yae/README
index 4ae1908a53..e41fbf9b3f 100644
--- a/games/yae/README
+++ b/games/yae/README
@@ -5,5 +5,3 @@ Emulates the 8-bit Apple II, II+, and //e computers.
This is an older emulator without a lot of fancy features.
The package includes the ROM images and an Apple DOS 3.3 disk image.
-
-Audio is supported, but only if OSS modules are loaded.
diff --git a/games/yae/doinst.sh b/games/yae/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/games/yae/doinst.sh
+++ b/games/yae/doinst.sh
@@ -1,3 +1,9 @@
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
diff --git a/games/yae/icons/128.png b/games/yae/icons/128.png
new file mode 100644
index 0000000000..fd6e712ae6
--- /dev/null
+++ b/games/yae/icons/128.png
Binary files differ
diff --git a/games/yae/icons/16.png b/games/yae/icons/16.png
new file mode 100644
index 0000000000..bc176a6fff
--- /dev/null
+++ b/games/yae/icons/16.png
Binary files differ
diff --git a/games/yae/icons/32.png b/games/yae/icons/32.png
new file mode 100644
index 0000000000..ec3c712d85
--- /dev/null
+++ b/games/yae/icons/32.png
Binary files differ
diff --git a/games/yae/icons/48.png b/games/yae/icons/48.png
new file mode 100644
index 0000000000..2fdf9bfc7a
--- /dev/null
+++ b/games/yae/icons/48.png
Binary files differ
diff --git a/games/yae/icons/64.png b/games/yae/icons/64.png
new file mode 100644
index 0000000000..0a843f393a
--- /dev/null
+++ b/games/yae/icons/64.png
Binary files differ
diff --git a/games/yae/patches/allow_x_window_close.diff b/games/yae/patches/allow_x_window_close.diff
new file mode 100644
index 0000000000..d596ce7b39
--- /dev/null
+++ b/games/yae/patches/allow_x_window_close.diff
@@ -0,0 +1,33 @@
+diff -Naur -Naur yae-0.7/x_window.c yae-0.7.patched/x_window.c
+--- yae-0.7/x_window.c 2007-04-03 17:47:59.000000000 -0400
++++ yae-0.7.patched/x_window.c 2021-10-12 00:23:48.765550342 -0400
+@@ -57,6 +57,8 @@
+
+ static Cursor InvisibleCursor;
+
++static Atom delete_atom;
++
+ Visual *getVisual( Display *dpy, int screen, int depth, int class )
+ {
+ XVisualInfo vinfo, *vinfoList;
+@@ -219,6 +221,9 @@
+ XFlush( dc->display );
+ #endif
+
++ delete_atom = XInternAtom(dc->display, "WM_DELETE_WINDOW", False);
++ XSetWMProtocols(dc->display, dc->window, &delete_atom, 1);
++
+ /*
+ * startup micro job for X window
+ */
+@@ -313,6 +318,10 @@
+ #endif
+ refreshScreen();
+ break;
++ case ClientMessage:
++ if(event.xclient.data.l[0] == delete_atom)
++ shutdown_6502();
++ break;
+ case DestroyNotify:
+ Signal6502( SIG_6502_SHUTDOWN );
+ break;
diff --git a/games/yae/yae.1 b/games/yae/yae.1
index 41aedfacb2..677232182f 100644
--- a/games/yae/yae.1
+++ b/games/yae/yae.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.20)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -38,27 +38,36 @@
. ds PI \(*p
. ds L" ``
. ds R" ''
+. ds C`
+. ds C'
'br\}
.\"
.\" Escape single quotes in literal strings from groff's Unicode transform.
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
..
-. nr % 0
-. rr F
-.\}
-.el \{\
-. de IX
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{\
+. if \nF \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
+. if !\nF==2 \{\
+. nr % 0
+. nr F 2
+. \}
+. \}
.\}
+.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -124,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "YAE 1"
-.TH YAE 1 "2013-08-29" "0.7" "yae"
+.TH YAE 1 "2021-10-12" "0.7" "yae"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -136,51 +145,51 @@ yae \- Yet another Apple Emulator
\&\fByae\fR [\-2|\-e|\-+] [disk\-image] ...
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"
-\&\fByae\fR emulates the Apple \s-1II\s0, \s-1II+\s0, and //e 8\-bit computers from Apple,
+\&\fByae\fR emulates the Apple \s-1II, II+,\s0 and //e 8\-bit computers from Apple,
Inc. Standard .dsk images are supported. If \fByae\fR is run without any
disk image arguments, \fI/usr/share/yae/Master.dsk\fR will be booted.
.PP
\&\s-1ROM\s0 image files are required; see \fB\s-1FILES\s0\fR for details.
.PP
-\&\s-1OSS\s0 audio is supported, using the /dev/audio device. For Linux systems
-using \s-1ALSA\s0, \s-1OSS\s0 audio is provided by the snd_pcm_oss and snd_mixer_oss
-kernel modules. If /dev/audio can't be opened, the emulator will run
-with sound disabled.
+\&\s-1ALSA\s0 audio is supported, by linking the emulator with \fB\-laoss\fR. This
+also allows PulseAudio to work, if you have the default \s-1ALSA\s0 device
+set to \*(L"pcm.default pulse\*(R" (and \*(L"ctl.default pulse\*(R") in \fB/etc/asound.conf\fR.
.SH "OPTIONS"
.IX Header "OPTIONS"
-.IP "\-2" 4
+.IP "\fB\-2\fR" 4
.IX Item "-2"
-Emulate the Apple \s-1II\s0.
+Emulate the Apple \s-1II.\s0
.Sp
-Note that the emulator uses the same \s-1ROM\s0 image for \s-1II\s0 and \s-1II+\s0, so the
+Note that the emulator uses the same \s-1ROM\s0 image for \s-1II\s0 and \s-1II+,\s0 so the
emulated \s-1II\s0 will have Applesoft and autostart (which the original \s-1II\s0
didn't ship with).
-.IP "\-+" 4
-Emulate the Apple \s-1II+\s0.
-.IP "\-e" 4
+.IP "\fB\-+\fR" 4
+.IX Item "-+"
+Emulate the Apple \s-1II+.\s0
+.IP "\fB\-e\fR" 4
.IX Item "-e"
Emulate the Apple //e (the default).
.SH "KEYSTROKES"
.IX Header "KEYSTROKES"
-.IP "Backspace" 4
+.IP "\fBBackspace\fR" 4
.IX Item "Backspace"
Alias for the left-arrow key.
-.IP "Control+Delete" 4
+.IP "\fBControl+Delete\fR" 4
.IX Item "Control+Delete"
Apple Reset key.
-.IP "Left Alt" 4
+.IP "\fBLeft Alt\fR" 4
.IX Item "Left Alt"
The left (open) apple key on the //e keyboard.
-.IP "Right Alt" 4
+.IP "\fBRight Alt\fR" 4
.IX Item "Right Alt"
The right (closed) apple key on the //e keyboard.
-.IP "F1" 4
+.IP "\fBF1\fR" 4
.IX Item "F1"
Change disks in the first drive (slot 6, drive 0). This will either
read a filename on standard input (if kdialog can't be run), or display
a kdialog file-selector. Either way, the emulator stops and its window
becomes unresponsive until a file has been chosen.
-.IP "F2" 4
+.IP "\fBF2\fR" 4
.IX Item "F2"
Exit the emulator immediately. No confirmation dialog, so
be careful.
@@ -195,10 +204,10 @@ keyboard.
Config file. Searched for first in the current directory,
then in user's home directory. For config file syntax, see
\&\fI/usr/share/yae/yaerc.sample\fR.
-.IP "\s-1ROM\s0 files" 4
+.IP "\fB\s-1ROM\s0 files\fR" 4
.IX Item "ROM files"
-For \s-1II\s0 and \s-1II+\s0 emulation, the required \s-1ROM\s0 image is called \fB\s-1APPLE2\s0.ROM\fR.
-For the //e, the image is \fB\s-1APPLE2E\s0.ROM\fR. For all modes, \fB\s-1DISK\s0.ROM\fR is
+For \s-1II\s0 and \s-1II+\s0 emulation, the required \s-1ROM\s0 image is called \fB\s-1APPLE2.ROM\s0\fR.
+For the //e, the image is \fB\s-1APPLE2E.ROM\s0\fR. For all modes, \fB\s-1DISK.ROM\s0\fR is
required.
.Sp
\&\s-1ROM\s0 file locations can be set in the config file. By default, they're
diff --git a/games/yae/yae.SlackBuild b/games/yae/yae.SlackBuild
index 316c92a7b8..991fa3eb03 100644
--- a/games/yae/yae.SlackBuild
+++ b/games/yae/yae.SlackBuild
@@ -6,11 +6,18 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211011 bkw: BUILD=2
+# - fix -current build (-fcommon).
+# - link with -laoss, makes audio work on ALSA or pulseaudio systems.
+# - new-style icons.
+# - update man page.
+# - allow X window close button to work. yet another patch.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=yae
VERSION=${VERSION:-0.7}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +29,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -86,6 +90,13 @@ patch -p1 < $CWD/patches/defaultmasterdisk.diff
# this package, which Just Work instead of requiring user configuration.
patch -p1 < $CWD/patches/defaultromlocation.diff
+# *So* annoying: the standard X close button wasn't enabled. If this
+# application did the whole "Are you sure you want to quit?" thing, I
+# might understand why... but it already exits without confirmation,
+# you just have to remember that F2 is the exit key. So why not the
+# easily-memorable window close button?
+patch -p1 < $CWD/patches/allow_x_window_close.diff
+
# Try to make 64-bit work. This seems OK, the scanline code seems to
# assume sizeof(long)==4, which is wrong on x86_64. Using int (which
# is still 4 bytes) fixes the display issues. There still might be
@@ -104,6 +115,9 @@ CONFSUB=/usr/share/libtool/config/config.sub
cp $CONFSUB .
autoreconf -if
+SLKCFLAGS+=" -fcommon"
+
+LIBS="-laoss" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -144,10 +158,20 @@ cat $CWD/${PRGNAM}rc.sample > $PKG/usr/share/$PRGNAM/${PRGNAM}rc.sample
mkdir -p $PKG/usr/share/applications
cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-# icon created for this build, based on
+# icons created for this build, based on
# http://www.callapple.org/soft/images/icons/apple.gif
+# 20211012 bkw: resized with convert(1), the aspect ratio is
+# slightly squashed, but that just makes it look retro...
+for i in $CWD/icons/*.png; do
+ px=$( basename $i | cut -d. -f1 )
+ size=${px}x${px}
+ dir=$PKG/usr/share/icons/hicolor/$size/apps
+ mkdir -p $dir
+ cat $i > $dir/$PRGNAM.png
+done
+
mkdir -p $PKG/usr/share/pixmaps
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../icons/hicolor/64x64/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cat $PRGNAM-roms/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.roms
diff --git a/games/yae/yae.desktop b/games/yae/yae.desktop
index e2b04ee7fe..b93789da51 100644
--- a/games/yae/yae.desktop
+++ b/games/yae/yae.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Name=YAE
Comment=Apple II Emulator
-StartupNotify=true
-Exec=yae
+StartupNotify=false
+Exec=/usr/games/yae
Icon=yae
Terminal=false
Type=Application
diff --git a/games/yae/yae.png b/games/yae/yae.png
deleted file mode 100644
index 0df8b45369..0000000000
--- a/games/yae/yae.png
+++ /dev/null
Binary files differ
diff --git a/games/yae/yae.pod b/games/yae/yae.pod
index dbb72b976e..2b258b25b9 100644
--- a/games/yae/yae.pod
+++ b/games/yae/yae.pod
@@ -18,16 +18,15 @@ disk image arguments, I</usr/share/yae/Master.dsk> will be booted.
ROM image files are required; see B<FILES> for details.
-OSS audio is supported, using the /dev/audio device. For Linux systems
-using ALSA, OSS audio is provided by the snd_pcm_oss and snd_mixer_oss
-kernel modules. If /dev/audio can't be opened, the emulator will run
-with sound disabled.
+ALSA audio is supported, by linking the emulator with B<-laoss>. This
+also allows PulseAudio to work, if you have the default ALSA device
+set to "pcm.default pulse" (and "ctl.default pulse") in B</etc/asound.conf>.
=head1 OPTIONS
=over
-=item -2
+=item B<-2>
Emulate the Apple II.
@@ -35,11 +34,11 @@ Note that the emulator uses the same ROM image for II and II+, so the
emulated II will have Applesoft and autostart (which the original II
didn't ship with).
-=item -+
+=item B<-+>
Emulate the Apple II+.
-=item -e
+=item B<-e>
Emulate the Apple //e (the default).
@@ -49,30 +48,30 @@ Emulate the Apple //e (the default).
=over
-=item Backspace
+=item B<Backspace>
Alias for the left-arrow key.
-=item Control+Delete
+=item B<Control+Delete>
Apple Reset key.
-=item Left Alt
+=item B<Left Alt>
The left (open) apple key on the //e keyboard.
-=item Right Alt
+=item B<Right Alt>
The right (closed) apple key on the //e keyboard.
-=item F1
+=item B<F1>
Change disks in the first drive (slot 6, drive 0). This will either
read a filename on standard input (if kdialog can't be run), or display
a kdialog file-selector. Either way, the emulator stops and its window
becomes unresponsive until a file has been chosen.
-=item F2
+=item B<F2>
Exit the emulator immediately. No confirmation dialog, so
be careful.
@@ -93,7 +92,7 @@ Config file. Searched for first in the current directory,
then in user's home directory. For config file syntax, see
I</usr/share/yae/yaerc.sample>.
-=item ROM files
+=item B<ROM files>
For II and II+ emulation, the required ROM image is called B<APPLE2.ROM>.
For the //e, the image is B<APPLE2E.ROM>. For all modes, B<DISK.ROM> is
diff --git a/games/yahtzee/doinst.sh b/games/yahtzee/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/games/yahtzee/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
diff --git a/games/yahtzee/yahtzee.png b/games/yahtzee/icons/128.png
index 4d41fbf51d..4d41fbf51d 100644
--- a/games/yahtzee/yahtzee.png
+++ b/games/yahtzee/icons/128.png
Binary files differ
diff --git a/games/yahtzee/icons/16.png b/games/yahtzee/icons/16.png
new file mode 100644
index 0000000000..ddb2e4428c
--- /dev/null
+++ b/games/yahtzee/icons/16.png
Binary files differ
diff --git a/games/yahtzee/icons/32.png b/games/yahtzee/icons/32.png
new file mode 100644
index 0000000000..df3471cdcd
--- /dev/null
+++ b/games/yahtzee/icons/32.png
Binary files differ
diff --git a/games/yahtzee/icons/48.png b/games/yahtzee/icons/48.png
new file mode 100644
index 0000000000..6d2421d06f
--- /dev/null
+++ b/games/yahtzee/icons/48.png
Binary files differ
diff --git a/games/yahtzee/icons/64.png b/games/yahtzee/icons/64.png
new file mode 100644
index 0000000000..69d71838d0
--- /dev/null
+++ b/games/yahtzee/icons/64.png
Binary files differ
diff --git a/games/yahtzee/yahtzee.SlackBuild b/games/yahtzee/yahtzee.SlackBuild
index 34b8b813f2..1e5e4fa944 100644
--- a/games/yahtzee/yahtzee.SlackBuild
+++ b/games/yahtzee/yahtzee.SlackBuild
@@ -6,6 +6,8 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211011 bkw: BUILD=2, new-style icons, add doinst.sh.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=yahtzee
@@ -22,9 +24,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -57,11 +56,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# By default, the Makefile builds one binary with the dumb, curses, and SDL
# UIs. It tries to init SDL, then falls back on curses... unfortunately on a
@@ -82,10 +78,18 @@ for ui in sdl curses text; do
install -s $PRGNAM $PKG/usr/games/$PRGNAM-$ui
done
-# icon came from:
+# icons came from:
# http://www.iconarchive.com/show/mahjong-icons-by-jommans/Trash-Full-Dice-icon.html
+for i in $CWD/icons/*.png; do
+ px=$( basename $i | cut -d. -f1 )
+ size=${px}x${px}
+ dir=$PKG/usr/share/icons/hicolor/$size/apps
+ mkdir -p $dir
+ cat $i > $dir/$PRGNAM.png
+done
+
mkdir -p $PKG/usr/share/pixmaps
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../icons/hicolor/64x64/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
# .desktop file written for this build
mkdir -p $PKG/usr/share/applications
@@ -99,6 +103,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/games/yahtzee/yahtzee.desktop b/games/yahtzee/yahtzee.desktop
index d9283b8615..20fa68eed7 100644
--- a/games/yahtzee/yahtzee.desktop
+++ b/games/yahtzee/yahtzee.desktop
@@ -3,7 +3,7 @@ Type=Application
Name=Yahtzee
GenericName=Yahtzee
Comment=Yahtzee dice/board game
-Exec=yahtzee-sdl
+Exec=/usr/games/yahtzee-sdl
Icon=yahtzee
Terminal=false
Categories=Game;BoardGame;
diff --git a/games/yahtzee/yahtzee.info b/games/yahtzee/yahtzee.info
index 7f81b26c4e..d89fb2a7d9 100644
--- a/games/yahtzee/yahtzee.info
+++ b/games/yahtzee/yahtzee.info
@@ -1,7 +1,7 @@
PRGNAM="yahtzee"
VERSION="1.6"
-HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/yahtzee.html"
-DOWNLOAD="http://www.muppetlabs.com/~breadbox/pub/software/yahtzee-1.6.tar.gz"
+HOMEPAGE="https://www.muppetlabs.com/~breadbox/software/yahtzee.html"
+DOWNLOAD="https://www.muppetlabs.com/~breadbox/pub/software/yahtzee-1.6.tar.gz"
MD5SUM="6ad1c98eb0136ac378425d469d270060"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/games/yar/yar.SlackBuild b/games/yar/yar.SlackBuild
index dc56469070..322b6440cc 100644
--- a/games/yar/yar.SlackBuild
+++ b/games/yar/yar.SlackBuild
@@ -6,11 +6,19 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211011 bkw: BUILD=2, new-style icon
+
+# TODO: make a bigger/better icon. The game doesn't have any image
+# files, it draws everything algorithmically, so I have to take
+# a screenshot. Except I'm on -current, and the fucking X server
+# freezes when I try to do that. Maybe this will get fixed, but I'm
+# not holding my breath.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=yar
VERSION=${VERSION:-0.99}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +30,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -57,11 +62,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
zcat $CWD/missingincludes.diff.gz | patch -p1
@@ -84,8 +86,9 @@ cp -a AUTHORS COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
# icon made from a screenshot of the game
-mkdir -p $PKG/usr/share/pixmaps
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+mkdir -p $PKG/usr/share/icons/hicolor/48x48/apps $PKG/usr/share/pixmaps
+cat $CWD/$PRGNAM.png > $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
# .desktop written for this build
mkdir -p $PKG/usr/share/applications
diff --git a/games/yar/yar.info b/games/yar/yar.info
index 8b45ae5e17..714177aad1 100644
--- a/games/yar/yar.info
+++ b/games/yar/yar.info
@@ -1,7 +1,7 @@
PRGNAM="yar"
VERSION="0.99"
-HOMEPAGE="http://web.archive.org/web/20081012141232/http://www.sourcefiles.org/Games/Action/Space_Shooter/yar-0.99.tar.gz.shtml"
-DOWNLOAD="http://distfiles.gentoo.org/distfiles/yar-0.99.tar.gz"
+HOMEPAGE="https://web.archive.org/web/20081012141232/http://www.sourcefiles.org/Games/Action/Space_Shooter/yar-0.99.tar.gz.shtml"
+DOWNLOAD="https://distfiles.gentoo.org/distfiles/yar-0.99.tar.gz"
MD5SUM="eab1d6a58ed13410a5347f83f8938367"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/games/z26/z26.SlackBuild b/games/z26/z26.SlackBuild
index ea04d61fd1..4534915c20 100644
--- a/games/z26/z26.SlackBuild
+++ b/games/z26/z26.SlackBuild
@@ -36,9 +36,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -68,11 +65,8 @@ rm -rf $SNAPVER
tar xvf $CWD/$TARBALL
cd $SNAPVER
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# man page belongs in section 6
sed -i '/pod2man -c/s,-c,-s6 -c,' Makefile
diff --git a/games/z26v3/z26v3.SlackBuild b/games/z26v3/z26v3.SlackBuild
index 9e38ba14fd..703bb17408 100644
--- a/games/z26v3/z26v3.SlackBuild
+++ b/games/z26v3/z26v3.SlackBuild
@@ -36,9 +36,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
diff --git a/games/z26v3/z26v3.info b/games/z26v3/z26v3.info
index 5757da7ccd..cf8e102690 100644
--- a/games/z26v3/z26v3.info
+++ b/games/z26v3/z26v3.info
@@ -1,7 +1,7 @@
PRGNAM="z26v3"
VERSION="3.02.01"
-HOMEPAGE="http://www.whimsey.com/z26/z26.html"
-DOWNLOAD="http://www.whimsey.com/z26/z26v3.02.01s.zip"
+HOMEPAGE="https://www.whimsey.com/z26/z26.html"
+DOWNLOAD="https://www.whimsey.com/z26/z26v3.02.01s.zip"
MD5SUM="5c28a898a6a6145c222a8f0b5c8ce8d6"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/games/zdbsp/zdbsp.6 b/games/zdbsp/zdbsp.6
index 8ad88104dc..c701ce3c1d 100644
--- a/games/zdbsp/zdbsp.6
+++ b/games/zdbsp/zdbsp.6
@@ -1,4 +1,4 @@
-.TH ZDBSP "6" "March 2012" "SlackBuilds.org" "Games"
+.TH ZDBSP "6" "October 2021" "zdbsp 1.19" "SlackBuilds.org"
.SH NAME
ZDBSP \- nodes builder for Doom and related games
.SH SYNOPSIS
diff --git a/games/zdbsp/zdbsp.SlackBuild b/games/zdbsp/zdbsp.SlackBuild
index 782de89e9d..d03c2ec31e 100644
--- a/games/zdbsp/zdbsp.SlackBuild
+++ b/games/zdbsp/zdbsp.SlackBuild
@@ -6,13 +6,14 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211011 bkw: BUILD=3, slight man page update
# 20180213 bkw: move binary to /usr/games, BUILD=2
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=zdbsp
VERSION=${VERSION:-1.19}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -24,9 +25,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -60,11 +58,8 @@ mkdir -p $PRGNAM-$VERSION
cd $PRGNAM-$VERSION
unzip $CWD/$PRGNAM-$VERSION-src.zip
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
mkdir -p build
cd build
diff --git a/games/zdbsp/zdbsp.info b/games/zdbsp/zdbsp.info
index 9f6d1d9ac7..84d2170c8d 100644
--- a/games/zdbsp/zdbsp.info
+++ b/games/zdbsp/zdbsp.info
@@ -1,7 +1,7 @@
PRGNAM="zdbsp"
VERSION="1.19"
-HOMEPAGE="http://zdoom.org/"
-DOWNLOAD="http://zdoom.org/files/utils/zdbsp/zdbsp-1.19-src.zip"
+HOMEPAGE="https://zdoom.org/"
+DOWNLOAD="https://zdoom.org/files/utils/zdbsp/zdbsp-1.19-src.zip"
MD5SUM="d3540c1727744ce5d630e7781b921373"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/games/zdoom/README b/games/zdoom/README
index fe2573a123..ac6ed62d60 100644
--- a/games/zdoom/README
+++ b/games/zdoom/README
@@ -1,9 +1,9 @@
zdoom (an enhanced port of the official DOOM source code)
-ZDoom is a family of enhanced ports of the Doom engine to modern operating
-systems. It runs on Windows, Linux, and OS X, and adds new features not
-found in the games as originally published by id Software. It supports
-Doom, Doom II, Heretic, Hexen, Strife, and more.
+ZDoom is a family of enhanced ports of the Doom engine to modern
+operating systems. It runs on Windows, Linux, and OS X, and adds
+new features not found in the games as originally published by id
+Software. It supports Doom, Doom II, Heretic, Hexen, Strife, and more.
zdoom is only a game engine. To actually play the game, you'll need the
game data (IWAD file) from one or more of the supported games. These
@@ -20,10 +20,11 @@ of these slackbuilds.org packages to get a playable game:
- chexquest3
Optional compile time dependency: openal-soft, used for audio playback
-(as an alternative to fmodapi, which is always built in). It will be
-autodetected at build time. If you want to build zdoom without openal-soft,
-set OPENAL=no in the script's environment. There have been reports that
-various mods work better with OpenAL, while others crash or misbehave; YMMV.
+(as an alternative to fmodapi, which is always built in). It will
+be autodetected at build time. If you want to build zdoom without
+openal-soft, set OPENAL=no in the script's environment. There have
+been reports that various mods work better with OpenAL, while others
+crash or misbehave; YMMV.
Optional runtime dependencies: fluid-soundfont, and/or TiMidity++ and
eawpats (used for MIDI playback). MIDI playback is still possible when
diff --git a/games/zdoom/doinst.sh b/games/zdoom/doinst.sh
index 4e8ba7071d..3e5691a052 100644
--- a/games/zdoom/doinst.sh
+++ b/games/zdoom/doinst.sh
@@ -2,3 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
diff --git a/games/zdoom/icons/128.png b/games/zdoom/icons/128.png
new file mode 100644
index 0000000000..89a571b8fe
--- /dev/null
+++ b/games/zdoom/icons/128.png
Binary files differ
diff --git a/games/zdoom/icons/16.png b/games/zdoom/icons/16.png
new file mode 100644
index 0000000000..3d99a2e834
--- /dev/null
+++ b/games/zdoom/icons/16.png
Binary files differ
diff --git a/games/zdoom/icons/32.png b/games/zdoom/icons/32.png
new file mode 100644
index 0000000000..36a50547aa
--- /dev/null
+++ b/games/zdoom/icons/32.png
Binary files differ
diff --git a/games/zdoom/icons/48.png b/games/zdoom/icons/48.png
new file mode 100644
index 0000000000..ec5e96ff50
--- /dev/null
+++ b/games/zdoom/icons/48.png
Binary files differ
diff --git a/games/zdoom/icons/64.png b/games/zdoom/icons/64.png
new file mode 100644
index 0000000000..e6e3434e45
--- /dev/null
+++ b/games/zdoom/icons/64.png
Binary files differ
diff --git a/games/zdoom/zdoom.SlackBuild b/games/zdoom/zdoom.SlackBuild
index e6278dbd67..443ff986ab 100644
--- a/games/zdoom/zdoom.SlackBuild
+++ b/games/zdoom/zdoom.SlackBuild
@@ -8,6 +8,10 @@
# version had no license, modified version released under the WTFPL,
# see http://www.wtfpl.net/txt/copying/ for details.
+# 20211012 bkw: BUILD=2
+# - Fix -current build.
+# - New-style icons.
+
# 20170207 bkw:
# - Take over maintenance, update for v2.8.1, BUILD=1. Upstream
# says zdoom development has halted, so 2.8.1 should be the last
@@ -41,7 +45,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=zdoom
VERSION=${VERSION:-2.8.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -53,9 +57,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -117,14 +118,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-
-# Slight template deviation: I used \+ rather than \; (same result, but maybe
-# 40x faster).
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# gitinfo.h made like so:
## git clone https://github.com/rheit/zdoom.git
@@ -145,6 +140,10 @@ sed -i \
"s,setPluginPath(progdir),setPluginPath(\"/usr/lib$LIBDIRSUFFIX/$PRGNAM\")," \
src/sound/fmodsound.cpp
+# silly gcc version detection assumes the major version will always be
+# only one digit, this broke when we got gcc 10.
+sed -i '/REGEX *MATCH/s,\[3-9\],[1-9][0-9]*,g' game-music-emu/CMakeLists.txt
+
mkdir release
cd release
@@ -162,6 +161,7 @@ mkdir -p \
$PKG/usr/games \
$PKG/usr/share/applications \
$PKG/usr/share/pixmaps \
+ $PKG/usr/share/icons/hicolor/48x48/apps \
$PKG/usr/share/games/doom \
$PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
@@ -171,9 +171,17 @@ install -s -m755 $PRGNAM $PKG/usr/games
[ -e liboutput_sdl.so ] && \
install -s -m755 liboutput_sdl.so $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
install -m644 $PRGNAM.pk3 $PKG/usr/share/games/doom/
-install -m644 $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/
install -m644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/
+for i in $CWD/icons/*.png; do
+ px=$( basename $i | cut -d. -f1 )
+ size=${px}x${px}
+ dir=$PKG/usr/share/icons/hicolor/$size/apps
+ mkdir -p $dir
+ cat $i > $dir/$PRGNAM.png
+done
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
cd ..
# Get rid of CRLF endings in the docs.
diff --git a/games/zdoom/zdoom.desktop b/games/zdoom/zdoom.desktop
index 5e4a383a80..265fed75f8 100644
--- a/games/zdoom/zdoom.desktop
+++ b/games/zdoom/zdoom.desktop
@@ -3,6 +3,6 @@ Type=Application
Name=ZDoom
GenericName=Enhanced Doom Engine
Icon=zdoom
-Exec=zdoom %F
+Exec=/usr/games/zdoom %F
Terminal=false
Categories=Game;ActionGame;
diff --git a/games/zdoom/zdoom.png b/games/zdoom/zdoom.png
deleted file mode 100644
index 22f9f49f90..0000000000
--- a/games/zdoom/zdoom.png
+++ /dev/null
Binary files differ
diff --git a/games/zennode/README b/games/zennode/README
index 4cbc1c9b0a..32bf96e05d 100644
--- a/games/zennode/README
+++ b/games/zennode/README
@@ -1,4 +1,16 @@
zennode (node builder for Doom and related games)
-Note: the ZenNode "compare" utility is installed as /usr/bin/zn-compare,
-to avoid conflicting with /usr/bin/compare from the imagemagick package.
+ZenNode will read the level description from a .WAD file and create
+either a new BLOCKMAP resource, REJECT resource, and/or NODES, SEGS,
+SSECTOR resources. Levels in a .WAD may be specified on the command
+line, or, if none are specified, all of the maps in a .WAD will be
+rebuilt.
+
+ZenNode supports Doom, Doom II, Heretic, Hexen, and Strife.
+
+Notes:
+
+- ZenNode does NOT create GL nodes. Use glbsp or zdbsp for that.
+
+- The ZenNode compare utility is installed as /usr/games/zn-compare,
+ to avoid conflicting with /usr/bin/compare from ImageMagick.
diff --git a/games/zennode/slack-desc b/games/zennode/slack-desc
index fd7e8c0b5f..605fb5ebe2 100644
--- a/games/zennode/slack-desc
+++ b/games/zennode/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-zennode: zennode (node builder for Doom maps)
-zennode:
-zennode: Node builder for Doom maps.
-zennode:
-zennode:
-zennode:
-zennode:
+zennode: zennode (node builder for Doom and related games)
zennode:
+zennode: ZenNode will read the level description from a .WAD file and create
+zennode: either a new BLOCKMAP resource, REJECT resource, and/or NODES, SEGS,
+zennode: SSECTOR resources. Levels in a .WAD may be specified on the command
+zennode: line, or, if none are specified, all of the maps in a .WAD will be
+zennode: rebuilt.
zennode:
+zennode: ZenNode supports Doom, Doom II, Heretic, Hexen, and Strife.
zennode:
zennode:
diff --git a/games/zennode/zennode-tools.6 b/games/zennode/zennode-tools.6
new file mode 100644
index 0000000000..f8aa491558
--- /dev/null
+++ b/games/zennode/zennode-tools.6
@@ -0,0 +1,88 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "ZENNODE-TOOLS" 6 "2021-10-11" "1.2.1" "SlackBuilds.org"
+.SH NAME
+zennode-tools \- get information on .wad files
+.\" RST source for zennode-tools(6) man page. Convert with:
+.
+.\" rst2man.py zennode-tools.rst > zennode-tools.6
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.nf
+bspdiff \fIfilename1\fP[\fI\&.wad\fP] \fIfilename2\fP[\fI\&.wad\fP] [\fIlevel\fP[\fI+level\fP]]
+bspinfo [\fI\-t\fP] \fIfilename\fP[\fI\&.wad\fP] [\fIlevel\fP[\fI+level\fP]]
+zn\-compare \fIfilename1\fP[\fI\&.wad\fP] \fIfilename2\fP[\fI\&.wad\fP] [\fIlevel\fP[\fI+level\fP]]
+.fi
+.sp
+.SH DESCRIPTION
+.sp
+This man page briefly documents the tools that ship with \fIZenNode\fP(6):
+\fIbspdiff\fP, \fIbspinfo\fP, and \fIzn\-compare\fP\&.
+.sp
+\fIbspdiff\fP compares the BSP trees of two .wad files and displays the
+point at which they differ. Since the BSP is essentially a binary
+tree, a single difference in a partition for a given group of SEGS
+will create a tree that is radically different for all points below
+that node.
+.sp
+\fIbspinfo\fP reports statistics that describe the BSP tree(s) of a
+\&.wad file. It can be used to give you a feel of how particular BSP
+builders are performing.
+.sp
+\fIzn\-compare\fP is a simple utility to compare two REJECT maps and
+display any differences between them. The command line syntax
+is similar to that of ZenNode except that two .wad files must be
+specified. After loading each .wad file, the list of levels in each
+file is compared and for each matching level, the REJECT maps are
+compared and the results displayed.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-t
+display NODE tree (\fIbspinfo\fP only)
+.UNINDENT
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/zennode\-1.2.1/COPYING for license information.
+.SH AUTHORS
+.sp
+\fIZenNode\fP was written by Marc Rousseau.
+.sp
+This man page was written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+\fIzennode\fP(6)
+.sp
+The full documentation at /usr/doc/zennode\-1.2.1/index.html
+.\" Generated by docutils manpage writer.
+.
diff --git a/games/zennode/zennode-tools.rst b/games/zennode/zennode-tools.rst
new file mode 100644
index 0000000000..d29a23977b
--- /dev/null
+++ b/games/zennode/zennode-tools.rst
@@ -0,0 +1,74 @@
+.. RST source for zennode-tools(6) man page. Convert with:
+.. rst2man.py zennode-tools.rst > zennode-tools.6
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 1.2.1
+.. |date| date::
+
+=============
+zennode-tools
+=============
+
+-----------------------------
+get information on .wad files
+-----------------------------
+
+:Manual section: 6
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+| bspdiff *filename1*\[*.wad*] *filename2*\[*.wad*] [*level*\[*+level*]]
+| bspinfo [*-t*] *filename*\[*.wad*] [*level*\[*+level*]]
+| zn-compare *filename1*\[*.wad*] *filename2*\[*.wad*] [*level*\[*+level*]]
+
+DESCRIPTION
+===========
+
+This man page briefly documents the tools that ship with *ZenNode*\(6):
+*bspdiff*, *bspinfo*, and *zn-compare*.
+
+*bspdiff* compares the BSP trees of two .wad files and displays the
+point at which they differ. Since the BSP is essentially a binary
+tree, a single difference in a partition for a given group of SEGS
+will create a tree that is radically different for all points below
+that node.
+
+*bspinfo* reports statistics that describe the BSP tree(s) of a
+.wad file. It can be used to give you a feel of how particular BSP
+builders are performing.
+
+*zn-compare* is a simple utility to compare two REJECT maps and
+display any differences between them. The command line syntax
+is similar to that of ZenNode except that two .wad files must be
+specified. After loading each .wad file, the list of levels in each
+file is compared and for each matching level, the REJECT maps are
+compared and the results displayed.
+
+OPTIONS
+=======
+
+-t display NODE tree (*bspinfo* only)
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/zennode-|version|/COPYING for license information.
+
+AUTHORS
+=======
+
+*ZenNode* was written by Marc Rousseau.
+
+This man page was written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+*zennode*\(6)
+
+The full documentation at /usr/doc/zennode-|version|/index.html
diff --git a/games/zennode/zennode.6 b/games/zennode/zennode.6
index 696d1cfbd6..bfcd68d6b2 100644
--- a/games/zennode/zennode.6
+++ b/games/zennode/zennode.6
@@ -1,4 +1,4 @@
-.TH zennode "6" "March 2012" "SlackBuilds.org" "Games"
+.TH zennode "6" "October 2021" "ZenNode 1.2.1" "SlackBuilds.org"
.SH NAME
zennode \- build nodes for Doom and related games
.SH SYNOPSIS
@@ -62,7 +62,7 @@ Doom, Doom II, Ultimate Doom, Heretic, Hexen, Strife
.SH "SEE ALSO"
The main documentation at
.nh
-.B @DOCDIR@
+.B @DOCDIR@index.html
.hy
.br
The
diff --git a/games/zennode/zennode.SlackBuild b/games/zennode/zennode.SlackBuild
index 58d53c9107..3a8ac56258 100644
--- a/games/zennode/zennode.SlackBuild
+++ b/games/zennode/zennode.SlackBuild
@@ -6,6 +6,10 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211011 bkw: BUILD=3
+# - flesh out slack-desc with some real information.
+# - add man pages for the other tools.
+
# 20180215 bkw: BUILD=2, move binary to /usr/games
cd $(dirname $0) ; CWD=$(pwd)
@@ -24,9 +28,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -59,15 +60,16 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $ZIPNAME-$VERSION
-unzip $CWD/$PRGNAM-$VERSION.zip
+
+# 20211011 bkw: the -x stuff skips extracting the prebuilt binaries
+# and saves ~700KB in /tmp.
+unzip $CWD/$PRGNAM-$VERSION.zip -x '*/linux*/*' '*/win32/*'
cd $ZIPNAME-$VERSION
unzip $PRGNAM-src.zip
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+
+# 20211011 bkw: permissions suck, do not revert to template.
+find . -type d -exec chmod 755 {} + -o -type f -exec chmod 644 {} +
# Don't install "compare" as /usr/bin/compare, it conflicts with imagemagick.
# This patch just adds a note to compare.html explaining the situation.
@@ -84,17 +86,23 @@ cd src/$ZIPNAME
ln -s $PRGNAM $PKG/usr/games/$ZIPNAME
cd -
-# man page written for this SlackBuild
+# Man pages written for this SlackBuild. The main zennode.6 was written
+# in raw troff, because I knew no better way to do it back then. The
+# tools man page is generated from zennode-tools.rst, q.v.
+PKGMAN6=$PKG/usr/man/man6
mkdir -p $PKG/usr/man/man6
sed "s,@DOCDIR@,/usr/doc/$PRGNAM-$VERSION/," < $CWD/$PRGNAM.6 \
- | gzip -c > $PKG/usr/man/man6/$PRGNAM.6.gz
+ | gzip -c > $PKGMAN6/$PRGNAM.6.gz
+ln -s $PRGNAM.6.gz $PKGMAN6/$ZIPNAME.6.gz
-# install docs with "install -m0644" rather than "cp -a" because upstream's
-# permissions aren't what we want.
+gzip -9c < $CWD/zennode-tools.6 > $PKGMAN6/zennode-tools.6.gz
+for i in bspdiff bspinfo zn-compare; do
+ ln -s zennode-tools.6.gz $PKGMAN6/$i.6.gz
+done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/samples
-install -m0644 doc/* src/COPYING $PKG/usr/doc/$PRGNAM-$VERSION
-install -m0644 Samples/* $PKG/usr/doc/$PRGNAM-$VERSION/samples
+cp -a doc/* src/COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Samples/* $PKG/usr/doc/$PRGNAM-$VERSION/samples
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/games/zennode/zennode.info b/games/zennode/zennode.info
index 7d5015334f..128cf9dab6 100644
--- a/games/zennode/zennode.info
+++ b/games/zennode/zennode.info
@@ -1,7 +1,7 @@
PRGNAM="zennode"
VERSION="1.2.1"
-HOMEPAGE="http://mrousseau.org/programs/ZenNode/"
-DOWNLOAD="http://mrousseau.org/programs/ZenNode/archives/zennode-1.2.1.zip"
+HOMEPAGE="https://mrousseau.org/programs/ZenNode/"
+DOWNLOAD="https://mrousseau.org/programs/ZenNode/archives/zennode-1.2.1.zip"
MD5SUM="36d5082b48ef1e4f638a38ba1034d058"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/games/zoom/README b/games/zoom/README
index d9a7e6107b..2004450f54 100644
--- a/games/zoom/README
+++ b/games/zoom/README
@@ -1,7 +1,15 @@
zoom (play interactive fiction games)
-Zoom is a player for Z-Code, TADS and HUGO stories or games. These are
-usually text adventures ('interactive fiction'), and were first created
-by Infocom with the Zork series of games. Throughout the 80's, Infocom
-released many interactive fiction stories before their ambitions to
-enter the database market finally brought them low.
+Zoom is a player for Z-Code stories or games. These are usually text
+adventures ('interactive fiction'), and were first created by Infocom
+with the Zork series of games. Throughout the '80s, Infocom released
+many interactive fiction stories before their ambitions to enter the
+database market finally brought them low.
+
+There is also a selection of freeware Z-Code games here:
+
+https://www.ifarchive.org/if-archive/games/zcode/
+
+Note: This is not video conferencing software! For that, you want
+network/zoom-linux. It's also not a magnifier for X. For that, you
+want accessibility/xzoom.
diff --git a/games/zoom/doinst.sh b/games/zoom/doinst.sh
index 5318469e28..860ac30217 100644
--- a/games/zoom/doinst.sh
+++ b/games/zoom/doinst.sh
@@ -1,17 +1,14 @@
config() {
NEW="$1"
OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
if [ ! -r $OLD ]; then
mv $NEW $OLD
elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
- # toss the redundant copy
rm $NEW
fi
- # Otherwise, we leave the .new copy for the admin to consider...
}
-config usr/share/zoom/zoomrc.new
+config etc/zoom/zoomrc.new
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
diff --git a/games/zoom/zoom.png b/games/zoom/icons/128.png
index bb6d3d1364..bb6d3d1364 100644
--- a/games/zoom/zoom.png
+++ b/games/zoom/icons/128.png
Binary files differ
diff --git a/games/zoom/icons/16.png b/games/zoom/icons/16.png
new file mode 100644
index 0000000000..8c7c4e8842
--- /dev/null
+++ b/games/zoom/icons/16.png
Binary files differ
diff --git a/games/zoom/icons/256.png b/games/zoom/icons/256.png
new file mode 100644
index 0000000000..27f166e2ee
--- /dev/null
+++ b/games/zoom/icons/256.png
Binary files differ
diff --git a/games/zoom/icons/32.png b/games/zoom/icons/32.png
new file mode 100644
index 0000000000..20aad04799
--- /dev/null
+++ b/games/zoom/icons/32.png
Binary files differ
diff --git a/games/zoom/icons/48.png b/games/zoom/icons/48.png
new file mode 100644
index 0000000000..7924b1d325
--- /dev/null
+++ b/games/zoom/icons/48.png
Binary files differ
diff --git a/games/zoom/icons/64.png b/games/zoom/icons/64.png
new file mode 100644
index 0000000000..8e79c22c9f
--- /dev/null
+++ b/games/zoom/icons/64.png
Binary files differ
diff --git a/games/zoom/no_inline.diff b/games/zoom/no_inline.diff
deleted file mode 100644
index d7ff771e81..0000000000
--- a/games/zoom/no_inline.diff
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -Naur zoom-1.1.5/src/interp.c zoom-1.1.5.patched/src/interp.c
---- zoom-1.1.5/src/interp.c 2011-11-05 07:40:53.000000000 -0400
-+++ zoom-1.1.5.patched/src/interp.c 2017-06-21 03:26:42.543594700 -0400
-@@ -101,7 +101,7 @@
- } \
- }
-
--static inline void push(ZStack* stack, const ZWord word)
-+static void push(ZStack* stack, const ZWord word)
- {
- *(stack->stack_top++) = word;
- stack->stack_size--;
-@@ -131,7 +131,7 @@
- #endif
- }
-
--inline ZWord pop(ZStack* stack)
-+ZWord pop(ZStack* stack)
- {
- stack->stack_size++;
-
-@@ -159,7 +159,7 @@
- return *(--stack->stack_top);
- }
-
--inline ZWord top(ZStack* stack)
-+ZWord top(ZStack* stack)
- {
- if (stack->current_frame)
- {
-@@ -232,7 +232,7 @@
- return newframe;
- }
-
--inline void store(ZStack* stack, int var, ZWord value)
-+void store(ZStack* stack, int var, ZWord value)
- {
- #ifdef DEBUG
- printf_debug("Storing %i in Variable #%x\n", value, var);
-@@ -253,7 +253,7 @@
- }
- }
-
--inline void store_nopush(ZStack* stack, int var, ZWord value)
-+void store_nopush(ZStack* stack, int var, ZWord value)
- {
- #ifdef DEBUG
- printf_debug("Storing %i in Variable #%x\n", value, var);
-@@ -313,7 +313,7 @@
- int isdefault;
- };
-
--static inline struct prop* get_object_prop_3(ZUWord object, ZWord property)
-+static struct prop* get_object_prop_3(ZUWord object, ZWord property)
- {
- ZByte* obj;
- ZByte* prop;
-@@ -364,7 +364,7 @@
- int header;
- };
-
--static inline struct propinfo* get_object_propinfo_4(ZByte* prop)
-+static struct propinfo* get_object_propinfo_4(ZByte* prop)
- {
- static struct propinfo pinfo;
-
-@@ -387,7 +387,7 @@
- return &pinfo;
- }
-
--static inline struct prop* get_object_prop_4(ZUWord object, ZWord property)
-+static struct prop* get_object_prop_4(ZUWord object, ZWord property)
- {
- ZByte* obj;
- ZByte* prop;
-@@ -539,7 +539,7 @@
- }
- #endif
-
--inline static int true_colour(int col)
-+static int true_colour(int col)
- {
- switch (col)
- {
-@@ -575,7 +575,7 @@
- }
- }
-
--inline static int convert_colour(int col)
-+static int convert_colour(int col)
- {
- switch (col)
- {
-@@ -1473,7 +1473,7 @@
- return -1;
- }
-
--static inline void zcode_setup_window(int window)
-+static void zcode_setup_window(int window)
- {
- v6_set_window(window);
- v6_define_window(window,
-@@ -1497,7 +1497,7 @@
- #endif
- }
-
--static inline int zcode_v6_push_stack(ZStack* stack,
-+static int zcode_v6_push_stack(ZStack* stack,
- ZUWord stk,
- ZUWord value)
- {
-@@ -1528,7 +1528,7 @@
- return 1;
- }
-
--static inline int v6_window(int win)
-+static int v6_window(int win)
- {
- if (win > 7)
- zmachine_fatal("No such window: %i", win);
diff --git a/games/zoom/patches/acinclude.patch b/games/zoom/patches/acinclude.patch
new file mode 100644
index 0000000000..f605e40ac1
--- /dev/null
+++ b/games/zoom/patches/acinclude.patch
@@ -0,0 +1,9 @@
+Description: add the included m4 files
+Author: Stephen Kitt <skitt@debian.org>
+
+--- /dev/null
++++ b/acinclude.m4
+@@ -0,0 +1,3 @@
++m4_include([m4/carbon.m4])
++m4_include([m4/display.m4])
++m4_include([m4/util.m4])
diff --git a/games/zoom/patches/avoid-v6-set-colours-crash.patch b/games/zoom/patches/avoid-v6-set-colours-crash.patch
new file mode 100644
index 0000000000..75215cc706
--- /dev/null
+++ b/games/zoom/patches/avoid-v6-set-colours-crash.patch
@@ -0,0 +1,18 @@
+Description: Avoid crashing with invalid coordinates
+Author: Alexandre Detiste <alexandre.detiste@gmail.com>
+Bug-Debian: https://bugs.debian.org/813674
+
+--- a/src/v6display.c
++++ b/src/v6display.c
+@@ -498,9 +498,9 @@
+ fg = ACTWIN.fore;
+ if (bg == -2)
+ bg = ACTWIN.back;
+- if (fg == -1)
++ if (fg == -1 || ACTWIN.curx < 0 || ACTWIN.cury < 0)
+ fg = DEFAULT_FORE;
+- if (bg == -1)
++ if (bg == -1 || ACTWIN.curx < 0 || ACTWIN.cury < 0)
+ bg = DEFAULT_BACK;
+
+ if (bg == -3)
diff --git a/games/zoom/config_xft.diff b/games/zoom/patches/config_xft.diff
index 8b1d7100e9..8b1d7100e9 100644
--- a/games/zoom/config_xft.diff
+++ b/games/zoom/patches/config_xft.diff
diff --git a/games/zoom/patches/enable-antialiasing.patch b/games/zoom/patches/enable-antialiasing.patch
new file mode 100644
index 0000000000..f75c600604
--- /dev/null
+++ b/games/zoom/patches/enable-antialiasing.patch
@@ -0,0 +1,15 @@
+Description: Enable anti-aliasing by default
+Author: Stephen Kitt <skitt@debian.org>
+Bug-Debian: https://bugs.debian.org/813715
+
+--- a/src/zoomrc
++++ b/src/zoomrc
+@@ -25,7 +25,7 @@
+ font 9 "font3" symbolic
+
+ size 80,30
+- antialias no
++ antialias yes
+
+ colours (0,0,0), (255,0,0), (0,255,0), (255,255,0), (0,0,255), (255,0,255),
+ (0,255,255), (255,255,204),
diff --git a/games/zoom/remove_rice.diff b/games/zoom/patches/remove_rice.diff
index 1a9e3b7f2f..1a9e3b7f2f 100644
--- a/games/zoom/remove_rice.diff
+++ b/games/zoom/patches/remove_rice.diff
diff --git a/games/zoom/patches/restore-return.patch b/games/zoom/patches/restore-return.patch
new file mode 100644
index 0000000000..9412980e91
--- /dev/null
+++ b/games/zoom/patches/restore-return.patch
@@ -0,0 +1,33 @@
+commit 5ef19e08bbeff74096a1944ec8ba591cdab8cc55
+Author: Andrew Hunter <andrew@logicalshift.co.uk>
+Date: Sun Nov 13 21:20:23 2011 +0000
+
+ Restored a return statement that got deleted way back in changeset 1cd73ed without anybody (well, me) noticing.
+
+ The effect of this missing return statement was to make aread callbacks that return true continue as if they had returned false and randomly crash after they try to write to the (now freed) buffer.
+
+ Amazingly, this hasn't been reported up until now. I suspect that there are few or no cases where aread callbacks return a value other than zero.
+
+ Also added a paranoid buffer check, which is probably unnecessary but looks like good practice in any case.
+
+diff --git a/src/interp.c b/src/interp.c
+index 60b3e13..a5fa8fe 100644
+--- a/src/interp.c
++++ b/src/interp.c
+@@ -1057,6 +1057,7 @@ static void zcode_op_aread_5678(ZDWord* pc,
+ {
+ mem[1] = 0;
+ free(buf);
++ return;
+ }
+ }
+
+@@ -1151,7 +1152,7 @@ static void zcode_op_aread_5678(ZDWord* pc,
+ int x;
+
+ mem[1] = 0;
+- for (x=0; buf[x] != 0; x++)
++ for (x=0; buf[x] != 0 && x < bufLen; x++)
+ {
+ mem[1]++;
+ buf[x] = unicode_to_lower(buf[x]);
diff --git a/games/zoom/patches/series b/games/zoom/patches/series
new file mode 100644
index 0000000000..636b59b5a3
--- /dev/null
+++ b/games/zoom/patches/series
@@ -0,0 +1,8 @@
+config_xft.diff
+remove_rice.diff
+avoid-v6-set-colours-crash.patch
+acinclude.patch
+restore-return.patch
+enable-antialiasing.patch
+static-inline.patch
+zoomrc_in_etc.diff
diff --git a/games/zoom/patches/static-inline.patch b/games/zoom/patches/static-inline.patch
new file mode 100644
index 0000000000..4e5190ef4c
--- /dev/null
+++ b/games/zoom/patches/static-inline.patch
@@ -0,0 +1,45 @@
+commit 6b0ad57dd2c125c9126e9b7913560ad25709a36f
+Author: Andrew Hunter <andrew@logicalshift.co.uk>
+Date: Sat Mar 3 16:31:35 2012 +0000
+
+ Inline functions need to be marked as static in order to compile with LLVM
+
+diff --git a/src/interp.c b/src/interp.c
+index a5fa8fe..3d446fa 100644
+--- a/src/interp.c
++++ b/src/interp.c
+@@ -232,7 +232,7 @@ ZFrame* call_routine(ZDWord* pc, ZStack* stack, ZDWord start)
+ return newframe;
+ }
+
+-inline void store(ZStack* stack, int var, ZWord value)
++static inline void store(ZStack* stack, int var, ZWord value)
+ {
+ #ifdef DEBUG
+ printf_debug("Storing %i in Variable #%x\n", value, var);
+@@ -253,7 +253,7 @@ inline void store(ZStack* stack, int var, ZWord value)
+ }
+ }
+
+-inline void store_nopush(ZStack* stack, int var, ZWord value)
++static inline void store_nopush(ZStack* stack, int var, ZWord value)
+ {
+ #ifdef DEBUG
+ printf_debug("Storing %i in Variable #%x\n", value, var);
+diff --git a/src/tokenise.c b/src/tokenise.c
+index 5925169..fb442d0 100644
+--- a/src/tokenise.c
++++ b/src/tokenise.c
+@@ -154,9 +154,9 @@ ZDictionary* dictionary_cache(const ZUWord dict_pos)
+
+ int cache = 1;
+
+-inline ZUWord lookup_word(unsigned int* word,
+- int wordlen,
+- ZUWord dct)
++static inline ZUWord lookup_word(unsigned int* word,
++ int wordlen,
++ ZUWord dct)
+ {
+ ZByte packed[12];
+ int zscii_len;
diff --git a/games/zoom/patches/zoomrc_in_etc.diff b/games/zoom/patches/zoomrc_in_etc.diff
new file mode 100644
index 0000000000..760fb294a3
--- /dev/null
+++ b/games/zoom/patches/zoomrc_in_etc.diff
@@ -0,0 +1,12 @@
+diff -Naur zoom-1.1.5/src/rc.c zoom-1.1.5.patched/src/rc.c
+--- zoom-1.1.5/src/rc.c 2011-11-05 07:40:53.000000000 -0400
++++ zoom-1.1.5.patched/src/rc.c 2021-10-11 19:43:39.814078341 -0400
+@@ -41,7 +41,7 @@
+ rc_game* rc_defgame = NULL;
+
+ #ifdef DATADIR
+-# define ZOOMRC DATADIR "/zoomrc"
++# define ZOOMRC "/etc/zoom/zoomrc"
+ # define GAMEDIR DATADIR "/games"
+ #else
+ # define ZOOMRC "zoomrc"
diff --git a/games/zoom/slack-desc b/games/zoom/slack-desc
index 012f1d6fec..a675e847f0 100644
--- a/games/zoom/slack-desc
+++ b/games/zoom/slack-desc
@@ -8,10 +8,10 @@
|-----handy-ruler------------------------------------------------------|
zoom: zoom (play interactive fiction games)
zoom:
-zoom: Zoom is a player for Z-Code, TADS and HUGO stories or games. These
-zoom: are usually text adventures ('interactive fiction'), and were first
-zoom: created by Infocom with the Zork series of games. Throughout the
-zoom: 80's, Infocom released many interactive fiction stories before their
+zoom: Zoom is a player for Z-Code stories or games. These are usually
+zoom: text adventures ('interactive fiction'), and were first created
+zoom: by Infocom with the Zork series of games. Throughout the '80s,
+zoom: Infocom released many interactive fiction stories before their
zoom: ambitions to enter the database market finally brought them low.
zoom:
zoom:
diff --git a/games/zoom/zoom.1 b/games/zoom/zoom.1
index 5a6a787924..276fbade73 100644
--- a/games/zoom/zoom.1
+++ b/games/zoom/zoom.1
@@ -1,58 +1,80 @@
-.TH ZOOM "1" "November 2012" "SlackBuilds.org" "User Commands"
+.TH ZOOM "1" "October 2021" "SlackBuilds.org" "User Commands"
.SH NAME
-zoom \- interpreter for interactive fiction games
+zoom \- interpreter for Z\-Code interactive fiction games
.SH SYNOPSIS
.B zoom
-[\fIOPTION\fR...] [\fIstory-file\fR] [\fIsave-file\fR]
+[\fIOPTION\fR ...] [\fIstory-file\fR] [\fIsave-file\fR]
.SH DESCRIPTION
Interactive Fiction is a fancy name for 'text adventures', thought up by
a company called called 'Infocom' circa 1979.
.PP
-Zoom is an advanced player for interactive fiction stories written in four major formats:
-.SS Z\-Code
-The format used by Infocom in the 1980s for games including Zork and Trinity, as well as new games written using the Inform language.
-.SS Glulx
-A modern language intended to be the successor to Z\-Code.
-.SS TADS
-A modern language developed by Mike Roberts.
-.SS HUGO
-A modern language developed by The General Coffee Compnay.
+Zoom is an advanced player for interactive fiction stories written Z\-Code format.
+This is the format used by Infocom in the 1980s for games including Zork and Trinity, as well as new games written using the Inform language.
+.B zoom
+supports all versions of the Z-Machine, including version 6 with graphical resources (converted to Blorb format).
.SH OPTIONS
.TP
\fB\-D\fR, \fB\-\-debugmode\fR
-Enable source\-level debugger (requires gameinfo.dbg)
+Enable source\-level debugger (requires gameinfo.dbg).
.TP
\fB\-w\fR, \fB\-\-warnings\fR
Display interpreter warnings
.TP
\fB\-W\fR, \fB\-\-fatal\fR
-Warnings are fatal
+Make warnings fatal.
.TP
\fB\-?\fR, \fB\-\-help\fR
-Give this help list
+Give a list of command\-line options.
.TP
\fB\-\-usage\fR
-Give a short usage message
+Give a short usage message.
.TP
\fB\-V\fR, \fB\-\-version\fR
-Print program version
+Print program version.
.SH FILES
.TP
\fB/usr/share/zoom/games/\fR
-When zoom is called without a story-file argument, it presents a menu of
+When \fBzoom\fR is called without a story-file argument, it presents a menu of
the games found here, if any.
.TP
-\fB/usr/share/zoom/zoomrc\fR
-System\-wide config file, mostly for setting fonts and colors.
+\fB/etc/zoom/zoomrc\fR
+System\-wide config file, mostly for setting fonts and colors. Only
+used if \fB$HOME/.zoomrc\fR doesn't exist.
.TP
\fB$HOME/.zoomrc\fR
-Per\-user config file.
+Per\-user config file. If this file exists, it is used instead of
+the system config file, above. So for personalizing your settings, you
+will want to start out by copying \fB/etc/zoom/zoomrc\fR to \fB~/.zoomrc\fI.
+.PP
+Note that it's a \fIfatal error\fR if \fBzoom\fR can't read either of these
+config files!
+.SH NOTE
+If you were expecting to be able to play TADS, HUGO, or Glulx games with
+\fBzoom\fR, I hate to disappoint you... but the Linux build of \fBzoom\fR
+only supports Z\-Code. The \fIMacintosh\fR (OSX/Cocoa) build does support
+the other formats, but the support code would be difficult to port to
+Linux \fBzoom\fR. I incorrectly stated that the other formats were
+available in a previous version of this man page. Sorry about that.
+.SH BUGS
+Report bugs to bugs@logicalshift.co.uk.
+.PP
+There's one "bug" with this man page: it's installed in manual section 1.
+It should be section 6 (games), but there's a \fBzoom\fR(6) man page in the
+xscreensaver package, and we don't want to conflict with it.
+.SH AUTHOR
+Zoom was written by Andrew Hunter. See
+.nh
+\fB/usr/doc/zoom-@VERSION@/COPYING\fR
+.hy
+for license information.
+.PP
+This man page was written by B. Watson <yalhcru@gmail.com> for
+the SlackBuilds.org project. It's licensed under the WTFPL, so
+do WTF you want with it.
.SH "SEE ALSO"
+\fBzork\fR(6), \fBfrotz\fR(6), \fBfizmo\fR(6), \fBinform\fR(6).
+.PP
Full documentation is installed in
.nh
\fB/usr/doc/zoom-@VERSION@/manual/index.html\fR
.hy
-.SH BUGS
-Report bugs to bugs@logicalshift.co.uk.
-.SH AUTHOR
-Zoom was written by Andrew Hunter
diff --git a/games/zoom/zoom.SlackBuild b/games/zoom/zoom.SlackBuild
index 7cb57c01b0..70b2eb3495 100644
--- a/games/zoom/zoom.SlackBuild
+++ b/games/zoom/zoom.SlackBuild
@@ -6,6 +6,18 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211011 bkw: BUILD=2
+# - binary in /usr/games.
+# - update man page.
+# - do NOT move man page to section 6, there's already a zoom(6), which
+# is part of xscreensaver.
+# - finally noticed that the Linux build of zoom does *not* play
+# TADS, HUGO, or Glulx games. The Mac OSX Cocoa build does, but the
+# extra code is in Objective C and doesn't look like it's portable
+# to non-Mac platforms. So update README, slack-desc, and the man
+# page to reflect that this is a Z-Code-only interpreter.
+# - add a few bugfix patches from Debian.
+# - new-style icons.
# 20170621 bkw: fix build for -current
cd $(dirname $0) ; CWD=$(pwd)
@@ -24,9 +36,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -55,26 +64,32 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# gcc7 hates all the inline functions in interp.c.
-patch -p1 < $CWD/no_inline.diff
-
-# We don't need -funroll-loops and friends. They break the build on -current.
-patch -p1 < $CWD/remove_rice.diff
-
-# Modern Xft doesn't ship a xft-config script, hack the configure script
-# to use pkg-config.
-patch -p1 < $CWD/config_xft.diff
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20211011 bkw: replace my old no_inline.patch with Debian's.
+# config_xft.diff, remove_rice.diff, zoomrc_in_etc.diff are mine. The
+# rest of patches/ came from Debian's zoom-player patchlevel 6.
+# This includes a couple of fixes for crashing bugs.
+for i in $( cat $CWD/patches/series ); do
+ echo "=== applying $i"
+ patch -p1 < $CWD/patches/$i
+done
+
+# 20211011 bkw: note to self: --enable-new-terp defines HAVE_COMPUTED_GOTOS
+# in config.h. Supposedly this might be faster on some architectures, and
+# slower on others. I don't enable this feature because:
+# - The games already run fast enough.
+# - The Debian packagers didn't enable it, so it's not likely to be
+# well-tested.
+# - I'd have to spend time/effort trying to figure out how to benchmark
+# the interpreter to see if it even made a difference.
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --bindir=/usr/games \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
@@ -84,32 +99,43 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install-strip DESTDIR=$PKG
-# enable antialiasing by default. The comment in the config file
-# doesn't seem to apply (it was written years ago).
-sed -i '/antialias/s,no,yes,' $PKG/usr/share/$PRGNAM/${PRGNAM}rc
-mv $PKG/usr/share/$PRGNAM/${PRGNAM}rc $PKG/usr/share/$PRGNAM/${PRGNAM}rc.new
+# Move config file to /etc, since we patched it for that.
+mkdir -p $PKG/etc/$PRGNAM
+mv $PKG/usr/share/$PRGNAM/${PRGNAM}rc $PKG/etc/$PRGNAM/${PRGNAM}rc.new
# If zoom is run with no arguments, it shows a menu of games from its
# default location. Let's make this the same location inform installs
-# its example games to.
+# its example games to (also, zork installs its games here).
mkdir -p $PKG/usr/share/zcode
ln -s ../zcode $PKG/usr/share/$PRGNAM/games
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
rm -f manual/Makefile*
-cp -a \
- AUTHORS COPYING ChangeLog NEWS README THANKS TODO manual \
+cp -a AUTHORS COPYING ChangeLog NEWS README THANKS TODO manual \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# Icons extracted from src/macos/zoom-app.icns with icns2png from
+# the libicns package. There was no 48x48 or 64x64, so I scaled
+# the 128x128 one down with convert(1). I didn't include the 512x512
+# or 256x256 icons, AFAIK nothing uses icons that large (yet?).
+for i in $CWD/icons/*.png; do
+ px=$( basename $i | cut -d. -f1 )
+ size=${px}x${px}
+ dir=$PKG/usr/share/icons/hicolor/$size/apps
+ mkdir -p $dir
+ cat $i > $dir/$PRGNAM.png
+done
+
mkdir -p $PKG/usr/share/pixmaps/
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../icons/hicolor/64x64/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
mkdir -p $PKG/usr/share/applications/
cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
mkdir -p $PKG/usr/man/man1
-sed "s,@VERSION@,$VERSION,g" < $CWD/$PRGNAM.1 | gzip -9c > $PKG/usr/man/man1/$PRGNAM.1.gz
+sed "s,@VERSION@,$VERSION,g" < $CWD/$PRGNAM.1 \
+ | gzip -9c > $PKG/usr/man/man1/$PRGNAM.1.gz
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/games/zoom/zoom.desktop b/games/zoom/zoom.desktop
index dc8aa96e5f..3092acd3c7 100644
--- a/games/zoom/zoom.desktop
+++ b/games/zoom/zoom.desktop
@@ -4,7 +4,7 @@ Name=Zoom
GenericName=Game Engine
Comment=Player for Interactive Fiction Games
Icon=zoom
-Exec=zoom
+Exec=/usr/games/zoom
Terminal=false
Type=Application
Categories=Game;AdventureGame;
diff --git a/games/zoom/zoom.info b/games/zoom/zoom.info
index 56aa2dfb47..aaa1d552a6 100644
--- a/games/zoom/zoom.info
+++ b/games/zoom/zoom.info
@@ -1,7 +1,7 @@
PRGNAM="zoom"
VERSION="1.1.5"
-HOMEPAGE="http://www.logicalshift.co.uk/unix/zoom/"
-DOWNLOAD="http://www.ifarchive.org/if-archive/infocom/interpreters/zoom/zoom-1.1.5.tar.gz"
+HOMEPAGE="https://www.logicalshift.co.uk/unix/zoom/"
+DOWNLOAD="https://www.ifarchive.org/if-archive/infocom/interpreters/zoom/zoom-1.1.5.tar.gz"
MD5SUM="e24df12fd1bdfd0c4361d465bdceb949"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/games/zork/README b/games/zork/README
index fae4e15202..2294af2b01 100644
--- a/games/zork/README
+++ b/games/zork/README
@@ -8,13 +8,14 @@ Undiscovered Underground (aka "ztuu"). They are owned by Activision,
which released them as free downloads some time ago. The first 3 Zork
games were originally developed by Infocom.
-To actually play the games, you'll need a z-code interpreter. Currently
-available are frotz and fizmo (text) and zoom (X11). See
+To actually play the games, you'll need a z-code interpreter.
+Currently available are frotz and fizmo (text) and zoom (X11). See
README.interpreters for details. This build includes a shell script
wrapper so you can run the games from the XFCE or KDE desktop menu,
or by typing the game name (zork1, zork2, zork3, ztuu) from the shell,
provided you have at least one interpreter installed.
-This package includes the InvisiClues from the original games (as plain
-text, so beware of spoilers). There are also walkthroughs and downloadable
-PDF manuals for the first three games here: http://www.ironrealms.com/zork
+This package includes the InvisiClues from the original games (as
+plain text, so beware of spoilers). There are also walkthroughs
+and downloadable PDF manuals for the first three games here:
+http://www.ironrealms.com/zork
diff --git a/games/zork/desktop/zork1.desktop b/games/zork/desktop/zork1.desktop
index c20e8e4c19..ce9230ba1a 100644
--- a/games/zork/desktop/zork1.desktop
+++ b/games/zork/desktop/zork1.desktop
@@ -4,7 +4,7 @@ Name=Zork I
GenericName=Interactive Fiction Game
Comment=Zork: The Great Underground Empire
Icon=zork
-Exec=zork1
+Exec=/usr/games/zork1
Terminal=true
Type=Application
Categories=Game;AdventureGame;
diff --git a/games/zork/desktop/zork2.desktop b/games/zork/desktop/zork2.desktop
index 6b2100c38e..baa25b0ec3 100644
--- a/games/zork/desktop/zork2.desktop
+++ b/games/zork/desktop/zork2.desktop
@@ -4,7 +4,7 @@ Name=Zork II
GenericName=Interactive Fiction Game
Comment=Zork: The Wizard of Frobozz
Icon=zork
-Exec=zork2
+Exec=/usr/games/zork2
Terminal=true
Type=Application
Categories=Game;AdventureGame;
diff --git a/games/zork/desktop/zork3.desktop b/games/zork/desktop/zork3.desktop
index 8024742bb6..dd8fc76ea4 100644
--- a/games/zork/desktop/zork3.desktop
+++ b/games/zork/desktop/zork3.desktop
@@ -4,7 +4,7 @@ Name=Zork III
GenericName=Interactive Fiction Game
Comment=Zork: The Dungeon Master
Icon=zork
-Exec=zork3
+Exec=/usr/games/zork3
Terminal=true
Type=Application
Categories=Game;AdventureGame;
diff --git a/games/zork/desktop/ztuu.desktop b/games/zork/desktop/ztuu.desktop
index 280f54c1c2..d479fb38cd 100644
--- a/games/zork/desktop/ztuu.desktop
+++ b/games/zork/desktop/ztuu.desktop
@@ -4,7 +4,7 @@ Name=Zork TUU
GenericName=Interactive Fiction Game
Comment=Zork: The Undiscovered Underground
Icon=zork
-Exec=ztuu
+Exec=/usr/games/ztuu
Terminal=true
Type=Application
Categories=Game;AdventureGame;
diff --git a/games/zork/icons/32.png b/games/zork/icons/32.png
new file mode 100644
index 0000000000..86c51f5f18
--- /dev/null
+++ b/games/zork/icons/32.png
Binary files differ
diff --git a/games/zork/icons/48.png b/games/zork/icons/48.png
new file mode 100644
index 0000000000..ab5bee074a
--- /dev/null
+++ b/games/zork/icons/48.png
Binary files differ
diff --git a/games/zork/icons/64.png b/games/zork/icons/64.png
new file mode 100644
index 0000000000..beb5a44b87
--- /dev/null
+++ b/games/zork/icons/64.png
Binary files differ
diff --git a/games/zork/mkicons.sh b/games/zork/mkicons.sh
new file mode 100644
index 0000000000..905e1ab77f
--- /dev/null
+++ b/games/zork/mkicons.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# 20211011 bkw: create zork icon, part of zork.SlackBuild.
+
+set -e
+
+CWD=$( pwd )
+mkdir -p $CWD/icons
+DIR=$( mktemp -d )
+cd $DIR
+
+wget http://www.ifarchive.org/if-archive/infocom/icons/ZorkLetters.zip
+unzip ZorkLetters.zip 'ZORK?.ICO'
+
+convert +append ZORKZ.ICO ZORKO.ICO zo.png
+convert +append ZORKR.ICO ZORKK.ICO rk.png
+convert -append zo.png rk.png $CWD/icons/64.png
+
+convert -resize 48x48 $CWD/icons/64.png $CWD/icons/48.png
+convert -resize 32x32 $CWD/icons/64.png $CWD/icons/32.png
+
+rm *.ICO *.png *.zip
+cd $CWD
+rmdir $DIR
+
+exit 0
diff --git a/games/zork/zork.SlackBuild b/games/zork/zork.SlackBuild
index 39b1cd3c47..9a9458000a 100644
--- a/games/zork/zork.SlackBuild
+++ b/games/zork/zork.SlackBuild
@@ -10,21 +10,24 @@
# files of course have their own version information, but at this late date
# they aren't going to ever change.
+# 20211011 bkw:
+# - move executables to /usr/games.
+# - new-style icons.
+# - man page.
+# - reflow readme-*.txt (with fmt -s).
+
# 20140219 bkw: fix .desktop files so they validate.
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=zork
-VERSION=${VERSION:-20140219}
+VERSION=${VERSION:-20211011}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -43,49 +46,63 @@ rm -rf $PRGNAM-$VERSION
mkdir $PRGNAM-$VERSION
cd $PRGNAM-$VERSION
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
# zork 1/2/3 are z-code version 3 (z3), uu is z5.
-mkdir -p $PKG/usr/share/zcode $PKG/usr/doc/$PRGNAM-$VERSION/invisiclues
+mkdir -p $PKG/usr/share/zcode $PKGDOC/invisiclues
for game in 1 2 3; do
rm -rf *
unzip -a -LL $CWD/zork$game.zip
cat data/zork$game.dat > $PKG/usr/share/zcode/zork$game.z3
- cat readme.txt > $PKG/usr/doc/$PRGNAM-$VERSION/readme-zork$game.txt
+ fmt -s readme.txt > $PKGDOC/readme-zork$game.txt
done
rm -rf *
unzip -a -LL $CWD/ztuu.zip
cat ztuu.z5 > $PKG/usr/share/zcode/ztuu.z5
-cat readme.txt > $PKG/usr/doc/$PRGNAM-$VERSION/readme-ztuu.txt
-cat invisiclues.txt > $PKG/usr/doc/$PRGNAM-$VERSION/invisiclues/ztuu.txt
-cat invisiclues.html > $PKG/usr/doc/$PRGNAM-$VERSION/invisiclues/ztuu.html
+fmt -s readme.txt > $PKGDOC/readme-ztuu.txt
+cat invisiclues.txt > $PKGDOC/invisiclues/ztuu.txt
+cat invisiclues.html > $PKGDOC/invisiclues/ztuu.html
# ztuu has invisiclues in the zip file, add the clues for 1/2/3 also
-cat $CWD/ZorkI.inv > $PKG/usr/doc/$PRGNAM-$VERSION/invisiclues/zork1.txt
-cat $CWD/ZorkII.inv > $PKG/usr/doc/$PRGNAM-$VERSION/invisiclues/zork2.txt
-cat $CWD/ZorkIII.inv > $PKG/usr/doc/$PRGNAM-$VERSION/invisiclues/zork3.txt
+cat $CWD/ZorkI.inv > $PKGDOC/invisiclues/zork1.txt
+cat $CWD/ZorkII.inv > $PKGDOC/invisiclues/zork2.txt
+cat $CWD/ZorkIII.inv > $PKGDOC/invisiclues/zork3.txt
-cat $CWD/README.interpreters > $PKG/usr/doc/$PRGNAM-$VERSION/README.interpreters
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README.interpreters > $PKGDOC/README.interpreters
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
# Script wrapper and .desktop files written for this SlackBuild
mkdir -p \
- $PKG/usr/share/zork \
- $PKG/usr/bin \
- $PKG/usr/share/applications
+ $PKG/usr/share/games/zork \
+ $PKG/usr/games \
+ $PKG/usr/man/man6 \
+ $PKG/usr/share/applications \
+ $PKG/usr/share/pixmaps
-install -m0755 $CWD/zork.sh $PKG/usr/share/zork/zorkwrapper.sh
+install -m0755 $CWD/zorkwrapper.sh $PKG/usr/share/games/zork/zorkwrapper.sh
+gzip -9c < $CWD/zorkwrapper.sh.6 > $PKG/usr/man/man6/zorkwrapper.sh.6.gz
for game in zork1 zork2 zork3 ztuu; do
- ln -s ../share/zork/zorkwrapper.sh $PKG/usr/bin/$game
+ ln -s ../share/games/zork/zorkwrapper.sh $PKG/usr/games/$game
+ ln -s zorkwrapper.sh.6.gz $PKG/usr/man/man6/$game.6.gz
cat $CWD/desktop/$game.desktop > $PKG/usr/share/applications/$game.desktop
done
-ln -s ../share/zork/zorkwrapper.sh $PKG/usr/bin/$PRGNAM
+# zork1 => zork, so we have an exe and a man page matching the package name.
+ln -s zorkwrapper.sh.6.gz $PKG/usr/man/man6/$PRGNAM.6.gz
+ln -s ../share/games/zork/zorkwrapper.sh $PKG/usr/games/$PRGNAM
+
+# Icons created with mkicons.sh, q.v.
+for i in $CWD/icons/*.png; do
+ px=$( basename $i | cut -d. -f1 )
+ size=${px}x${px}
+ dir=$PKG/usr/share/icons/hicolor/$size/apps
+ mkdir -p $dir
+ cat $i > $dir/$PRGNAM.png
+done
-# Icon converted from Z.ICO here:
-# http://www.ifarchive.org/if-archive/infocom/icons/ZorkLetters.zip
-mkdir -p $PKG/usr/share/pixmaps
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
mkdir -p $PKG/install
sed "s,@VERSION@,$VERSION," $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/games/zork/zork.info b/games/zork/zork.info
index 467d955584..4374960e32 100644
--- a/games/zork/zork.info
+++ b/games/zork/zork.info
@@ -1,5 +1,5 @@
PRGNAM="zork"
-VERSION="20140219"
+VERSION="20211011"
HOMEPAGE="http://www.infocom-if.org/"
DOWNLOAD="http://infocom.elsewhere.org/scheyen/Download/zork1.zip \
http://infocom.elsewhere.org/scheyen/Download/zork2.zip \
diff --git a/games/zork/zork.png b/games/zork/zork.png
deleted file mode 100644
index 911641be09..0000000000
--- a/games/zork/zork.png
+++ /dev/null
Binary files differ
diff --git a/games/zork/zork.sh b/games/zork/zorkwrapper.sh
index 507091bbf7..507091bbf7 100644
--- a/games/zork/zork.sh
+++ b/games/zork/zorkwrapper.sh
diff --git a/games/zork/zorkwrapper.sh.6 b/games/zork/zorkwrapper.sh.6
new file mode 100644
index 0000000000..0f576e33bd
--- /dev/null
+++ b/games/zork/zorkwrapper.sh.6
@@ -0,0 +1,103 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "ZORKWRAPPER.SH" 6 "2021-10-11" "20211011" "SlackBuilds.org"
+.SH NAME
+zorkwrapper.sh \- play Infocom Zork games
+.\" RST source for zorkwrapper.sh(6) man page. Convert with:
+.
+.\" rst2man.py zorkwrapper.sh.rst > zorkwrapper.sh.6
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.nf
+\fBzork\fP
+\fBzork2\fP
+\fBzork3\fP
+\fBztuu\fP
+.fi
+.sp
+.SH DESCRIPTION
+.sp
+\fBzorkwrapper.sh\fP runs the Infocom Zork games. It\(aqs installed via
+symlinks in the /usr/games directory, so each game can be run by
+simply typing its name.
+.sp
+Supported games:
+.INDENT 0.0
+.TP
+.B \fBzork\fP
+Zork I: The Great Underground Empire
+.TP
+.B \fBzork2\fP
+Zork II: The Wizard of Frobozz
+.TP
+.B \fBzork3\fP
+Zork III: The Dungeon Master
+.TP
+.B \fBztuu\fP
+Zork: The Undiscovered Underground
+.UNINDENT
+.sp
+The games are run with the first interpreter found, from the following list:
+.INDENT 0.0
+.INDENT 3.5
+\fBfizmo\fP, \fBfrotz\fP, \fBzoom\fP\&.
+.UNINDENT
+.UNINDENT
+.SH OPTIONS
+.sp
+There are no options or arguments.
+.SH FILES
+.sp
+\fB/usr/share/games/zork/zorkwrapper.sh\fP is the master copy of the script,
+which gets symlinked to the game names in \fB/usr/games\fP\&.
+.sp
+\fB/usr/share/zcode/\fP contains the Z\-Machine files:
+.INDENT 0.0
+.INDENT 3.5
+\fBzork1.z3\fP, \fBzork2.z3\fP, \fBzork3.z3\fP, \fBztuu.z5\fP
+.UNINDENT
+.UNINDENT
+.SH AUTHORS
+.sp
+\fBzorkwrapper.sh\fP and this man page were written for the
+SlackBuilds.org project by B. Watson, and are licensed under the WTFPL.
+.sp
+The Zork games are the property of Activision, which released them
+as free\-to\-use downloads. See /usr/doc/zork\-20211011/readme\-*.txt
+for license information.
+.SH SEE ALSO
+.sp
+\fBfizmo\fP(6), \fBfrotz\fP(6), \fBzoom\fP(6)
+.sp
+\fI\%http://www.infocom\-if.org/\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/games/zork/zorkwrapper.sh.rst b/games/zork/zorkwrapper.sh.rst
new file mode 100644
index 0000000000..8c052a0270
--- /dev/null
+++ b/games/zork/zorkwrapper.sh.rst
@@ -0,0 +1,84 @@
+.. RST source for zorkwrapper.sh(6) man page. Convert with:
+.. rst2man.py zorkwrapper.sh.rst > zorkwrapper.sh.6
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 20211011
+.. |date| date::
+
+==============
+zorkwrapper.sh
+==============
+
+-----------------------
+play Infocom Zork games
+-----------------------
+
+:Manual section: 6
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+| **zork**
+| **zork2**
+| **zork3**
+| **ztuu**
+
+DESCRIPTION
+===========
+
+**zorkwrapper.sh** runs the Infocom Zork games. It's installed via
+symlinks in the /usr/games directory, so each game can be run by
+simply typing its name.
+
+Supported games:
+
+**zork**
+ Zork I: The Great Underground Empire
+
+**zork2**
+ Zork II: The Wizard of Frobozz
+
+**zork3**
+ Zork III: The Dungeon Master
+
+**ztuu**
+ Zork: The Undiscovered Underground
+
+The games are run with the first interpreter found, from the following list:
+
+ **fizmo**, **frotz**, **zoom**.
+
+OPTIONS
+=======
+
+There are no options or arguments.
+
+FILES
+=====
+
+**/usr/share/games/zork/zorkwrapper.sh** is the master copy of the script,
+which gets symlinked to the game names in **/usr/games**.
+
+**/usr/share/zcode/** contains the Z-Machine files:
+
+ **zork1.z3**, **zork2.z3**, **zork3.z3**, **ztuu.z5**
+
+AUTHORS
+=======
+
+**zorkwrapper.sh** and this man page were written for the
+SlackBuilds.org project by B. Watson, and are licensed under the WTFPL.
+
+The Zork games are the property of Activision, which released them
+as free-to-use downloads. See /usr/doc/zork-|version|/readme-\*.txt
+for license information.
+
+SEE ALSO
+========
+
+**fizmo**\(6), **frotz**\(6), **zoom**\(6)
+
+http://www.infocom-if.org/
diff --git a/games/ztools/README b/games/ztools/README
index 2c17e52536..4497c3c99d 100644
--- a/games/ztools/README
+++ b/games/ztools/README
@@ -11,6 +11,6 @@ zrename - rename z-code story files according to their z-machine version
zcheck and zdebugtool have been renamed, as "check" and "debugtool" are
very generic names, likely to conflict with some other package.
-zcut, zdebugtool, and zrename are normally distributed separately. They're
-included in this build because they're too small to justify separate
-builds, yet too useful for a Z-Code developer to do without.
+zcut, zdebugtool, and zrename are normally distributed separately.
+They're included in this build because they're too small to justify
+separate builds, yet too useful for a Z-Code developer to do without.
diff --git a/games/ztools/ztools.SlackBuild b/games/ztools/ztools.SlackBuild
index 5ce982c46e..88dd2f47c6 100644
--- a/games/ztools/ztools.SlackBuild
+++ b/games/ztools/ztools.SlackBuild
@@ -6,11 +6,13 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20211010 bkw: BUILD=2, fix -current build (lha => lhasa caused breakage)
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=ztools
VERSION=${VERSION:-7.3.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +24,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -62,19 +61,15 @@ mkdir -p $PRGNAM-$VERSION
cd $PRGNAM-$VERSION
# extract 'em all first. None of these have a top-level dir in
-# their archive. Also DebugTools was lha'ed on an Amiga, causing
-# filename weirdness (Makefile => srcMakefile, etc).
+# their archive.
mkdir -p $PRGNAM zcut zdebugtool
( cd $PRGNAM && tar xvf $CWD/$PRGNAM$TARVER.tar.gz )
( cd zcut && unzip $CWD/zcut$ZCUTVER.zip )
-( cd zdebugtool && lha x $CWD/DebugTool_$ZDEBUGVER.lha && rename src '' src* )
+( cd zdebugtool && lha x $CWD/DebugTool_$ZDEBUGVER.lha )
chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
BINDIR=$PKG/usr/bin
DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
@@ -111,13 +106,13 @@ cd zcut
ln -s zcut.1.gz $MANDIR/unmfm.1.gz
cd ..
-cd zdebugtool
+cd zdebugtool/src
patch -p1 < $PATCHDIR/zdebugtool-compilefix.diff
make CFLAGS="$SLKCFLAGS"
install -s -m0755 zdebugtool $BINDIR
- # man page reconstituted from preformatted DebugTools.man
+ # man page reconstituted from preformatted DebugTool.man
gzip -9c < $CWD/zdebugtool.1 > $MANDIR/zdebugtool.1.gz
-cd ..
+cd ../..
# Also include my own modest z-code utility. It replaces the zren.exe
# that ships with zcut.
diff --git a/games/ztools/ztools.info b/games/ztools/ztools.info
index 97115177b6..a41f1fe083 100644
--- a/games/ztools/ztools.info
+++ b/games/ztools/ztools.info
@@ -1,9 +1,9 @@
PRGNAM="ztools"
VERSION="7.3.1"
-HOMEPAGE="http://ifarchive.org/indexes/if-archiveXinfocomXtoolsXztools.html"
-DOWNLOAD="http://ifarchive.org/if-archive/infocom/tools/ztools/ztools731.tar.gz \
- http://www.ifarchive.org/if-archive/infocom/tools/zcut12.zip \
- http://www.ifarchive.org/if-archive/infocom/tools/DebugTool_111.lha \
+HOMEPAGE="https://ifarchive.org/indexes/if-archiveXinfocomXtoolsXztools.html"
+DOWNLOAD="https://ifarchive.org/if-archive/infocom/tools/ztools/ztools731.tar.gz \
+ https://www.ifarchive.org/if-archive/infocom/tools/zcut12.zip \
+ https://www.ifarchive.org/if-archive/infocom/tools/DebugTool_111.lha \
https://slackware.uk/~urchlay/src/zrename"
MD5SUM="f5e6abb7011817e48debee828895a500 \
c815ced0706fc6454bea18d0046c5afe \