From 2d8af6392b79f23bed753136f54c45a12ad5c542 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Fri, 18 Dec 2020 16:28:12 -0500 Subject: games/frotz: Updated for version 2.52, desktop stuff. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- games/frotz/README | 5 +- games/frotz/doinst.sh | 13 ++++ games/frotz/frotz-infocom.png | Bin 0 -> 553 bytes games/frotz/frotz.SlackBuild | 119 +++++++++++++++++++++++++++++-------- games/frotz/frotz.desktop | 16 +++++ games/frotz/frotz.info | 8 +-- games/frotz/frotz.png | Bin 0 -> 387 bytes games/frotz/frotz.xml | 18 ++++++ games/frotz/sfrotz.desktop | 16 +++++ games/frotz/sfrotz.memcorrupt.diff | 19 ++++++ games/frotz/slack-desc | 4 +- 11 files changed, 185 insertions(+), 33 deletions(-) create mode 100644 games/frotz/doinst.sh create mode 100644 games/frotz/frotz-infocom.png create mode 100644 games/frotz/frotz.desktop create mode 100644 games/frotz/frotz.png create mode 100644 games/frotz/frotz.xml create mode 100644 games/frotz/sfrotz.desktop create mode 100644 games/frotz/sfrotz.memcorrupt.diff (limited to 'games/frotz') diff --git a/games/frotz/README b/games/frotz/README index 303e7f63bc..11b9f1eeec 100644 --- a/games/frotz/README +++ b/games/frotz/README @@ -2,4 +2,7 @@ frotz (Z-machine interpreter) 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/ . +be found at: http://www.ifarchive.org/ + +Optional dependencies: SDL2 and SDL2_mixer. If these are installed, +the SDL build of frotz (sfrotz) will be included in the package. diff --git a/games/frotz/doinst.sh b/games/frotz/doinst.sh new file mode 100644 index 0000000000..9424ce43ff --- /dev/null +++ b/games/frotz/doinst.sh @@ -0,0 +1,13 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/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/frotz/frotz-infocom.png b/games/frotz/frotz-infocom.png new file mode 100644 index 0000000000..9085ab83aa Binary files /dev/null and b/games/frotz/frotz-infocom.png differ diff --git a/games/frotz/frotz.SlackBuild b/games/frotz/frotz.SlackBuild index 22e3911fac..06f5ac9b81 100644 --- a/games/frotz/frotz.SlackBuild +++ b/games/frotz/frotz.SlackBuild @@ -2,16 +2,29 @@ # # Slackware build script for frotz -# Written by Beej Jorgensen +# Originally written for Slackware 12.2 by Beej Jorgensen , heavily modified by B. Watson since +# then. -# Modified by B. Watson -# - updated for Slackware 14 and frotz 2.43d -# - include dumb terminal frotz in build +# Original had no license. This modified version is released under the +# WTFPL. See http://www.wtfpl.net/txt/copying/ for details. -# 20150904 bkw: updated for frotz 2.44 +# 20201212 bkw: too many changes, can't build older versions. +# - updated for v2.52. +# - new homepage. +# - include sfrotz if sdl2 and SDL2_mixer are installed. +# - fix man page typos. +# - patch to prevent sfrotz crashes with long pathnames. +# - add desktop stuff. + +# 20150904 bkw: updated for frotz 2.44. + +# 20121216 bkw: +# - updated for Slackware 14 and frotz 2.43d. +# - include dumb terminal frotz in build. PRGNAM=frotz -VERSION=${VERSION:-2.44} +VERSION=${VERSION:-2.52} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -45,37 +58,91 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* 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 {} \+ + +# Fix typos: +sed -i "s/\\(Unlike it\\)'s/\1s/" doc/dfrotz.6 +sed -i 's,forground,foreground,' doc/frotz.6 +sed -i -e 's,invocatio$,&n.,' \ + -e 's,intead,instead,' \ + -e 's,chunck,chunk,' \ + doc/sfrotz.6 + +# 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 \ + SYSCONFDIR=/etc \ + MANDIR=/usr/man \ + MAN_PREFIX=/usr \ + BINDIR=/usr/games \ + DESTDIR=$PKG \ + $1 +} + +# No autodetection for SDL2, help it out. +pkg-config --exists sdl2 SDL2_mixer && extra="clean sdl install_sdl" + +sed -i "s,-O3.*,$SLKCFLAGS," Makefile +for target in $PRGNAM install clean dumb install_dumb $extra; do + run_make $target +done -make OPTS="$SLKCFLAGS" PREFIX=/usr CONFIG_DIR=/etc -strip $PRGNAM -make PREFIX=$PKG/usr CONFIG_DIR=/etc install +strip $PKG/usr/games/* +gzip -9 $PKG/usr/man/man?/*.* -# include dumb terminal version (it's small and maybe useful). -sed -i 's/getline/dumb_getline/g' src/dumb/dumb_input.c -make OPTS="$SLKCFLAGS" PREFIX=/usr CONFIG_DIR=/etc dfrotz -install -s -m0755 dfrotz $PKG/usr/bin -cat doc/dfrotz.6 > $PKG/usr/man/man6/dfrotz.6 +# desktop files by SlackBuild author. The icons came from WinFrotz. They're +# only available in 32x32 size, sorry. +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 +cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png +ln -s ../../../../pixmaps/$PRGNAM.png \ + $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png +mkdir -p $PKG/usr/share/icons/hicolor/32x32/mimetypes +cat $CWD/frotz-infocom.png > \ + $PKG/usr/share/icons/hicolor/32x32/mimetypes/frotz-infocom.png -gzip $PKG/usr/man/man?/*.? +# MIME stuff for desktops. Causes KDE and XFCE to display story +# files with an Infocom icon, and they double-click open with either +# terminal or SDL frotz. +mkdir -p $PKG/usr/share/mime/packages +cat $CWD/$PRGNAM.xml > $PKG/usr/share/mime/packages/$PRGNAM.xml mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS BUGS COPYING ChangeLog DUMB HOW_TO_PLAY INSTALL \ - PACKAGING PORTING README README.1st SPEECH TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION -cp -a doc/frotz.conf-{big,small} $PKG/usr/doc/$PRGNAM-$VERSION +rm -f README.1st # don't need this in the package. +cp -a AUTHORS CO* ChangeLog DUMB HOW_TO_PLAY README* TODO *.lsm \ + doc/$PRGNAM.conf* doc/$PRGNAM.txt \ + $PKG/usr/doc/$PRGNAM-$VERSION 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:-tgz} diff --git a/games/frotz/frotz.desktop b/games/frotz/frotz.desktop new file mode 100644 index 0000000000..ab2f8e3d4e --- /dev/null +++ b/games/frotz/frotz.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Name=Frotz +GenericName=Z-Code Interpreter +Comment=Terminal Player for Interactive Fiction Games +Exec=frotz %f +Icon=frotz +Terminal=true +Type=Application +Categories=Game;AdventureGame; +MimeType=application/x-zmachine; +NoDisplay=true +Actions=Play; + +[Desktop Action Play] +Name=Play +Exec=frotz %f diff --git a/games/frotz/frotz.info b/games/frotz/frotz.info index a14a402164..3c08902a6b 100644 --- a/games/frotz/frotz.info +++ b/games/frotz/frotz.info @@ -1,8 +1,8 @@ PRGNAM="frotz" -VERSION="2.44" -HOMEPAGE="http://frotz.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/project/frotz/frotz/frotz-2.44.tar.gz" -MD5SUM="705457af0e2cf745ce7f6bc243f05968" +VERSION="2.52" +HOMEPAGE="https://davidgriffith.gitlab.io/frotz/" +DOWNLOAD="https://gitlab.com/DavidGriffith/frotz/-/archive/2.52/frotz-2.52.tar.bz2" +MD5SUM="99aeba254257d0ceb2b6bf51650b9d2a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/frotz/frotz.png b/games/frotz/frotz.png new file mode 100644 index 0000000000..45babf88c0 Binary files /dev/null and b/games/frotz/frotz.png differ diff --git a/games/frotz/frotz.xml b/games/frotz/frotz.xml new file mode 100644 index 0000000000..ec743855db --- /dev/null +++ b/games/frotz/frotz.xml @@ -0,0 +1,18 @@ + + + + Z-Machine Story File + + + + + + + + + + + + + + diff --git a/games/frotz/sfrotz.desktop b/games/frotz/sfrotz.desktop new file mode 100644 index 0000000000..f82697571f --- /dev/null +++ b/games/frotz/sfrotz.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Name=SFrotz +GenericName=Z-Code Interpreter +Comment=SDL Player for Interactive Fiction Games +Exec=sfrotz %f +Icon=frotz +Terminal=false +Type=Application +Categories=Game;AdventureGame; +MimeType=application/x-zmachine; +NoDisplay=true +Actions=Play; + +[Desktop Action Play] +Name=Play +Exec=sfrotz %f diff --git a/games/frotz/sfrotz.memcorrupt.diff b/games/frotz/sfrotz.memcorrupt.diff new file mode 100644 index 0000000000..a7d49a1ac7 --- /dev/null +++ b/games/frotz/sfrotz.memcorrupt.diff @@ -0,0 +1,19 @@ +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 8a98788cb5..1dde07b4ec 100644 --- a/games/frotz/slack-desc +++ b/games/frotz/slack-desc @@ -10,9 +10,9 @@ frotz: frotz (Z-machine interpreter) frotz: 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: Games can be found at: http://www.ifarchive.org/ +frotz: frotz: -frotz: http://frotz.sourceforge.net/ frotz: frotz: frotz: -- cgit v1.2.3