games/doomseeker: Updated for version 1.3.2.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 41 insertions, 22 deletions

diff --git a/games/doomseeker/1.3+20200119_b623ab1.diff.gz b/games/doomseeker/1.3+20200119_b623ab1.diff.gz
deleted file mode 100644
index 4fe218194b..0000000000
--- a/games/doomseeker/1.3+20200119_b623ab1.diff.gz
+++ /dev/null
diff --git a/games/doomseeker/doinst.sh b/games/doomseeker/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/games/doomseeker/doinst.sh
+++ b/games/doomseeker/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/doomseeker/doomseeker.SlackBuild b/games/doomseeker/doomseeker.SlackBuild
index 12624c8b64..f1b58039e7 100644
--- a/games/doomseeker/doomseeker.SlackBuild
+++ b/games/doomseeker/doomseeker.SlackBuild
@@ -6,6 +6,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211102 bkw:
+# - updated for v1.3.2.
+# - new-style icons.
+# - /usr/share/doomseeker => /usr/share/games/doomseeker.
+
 # 20201030 bkw: updated for v1.3.1
 # 20200122 bkw: updated for v1.3+20200119_b623ab1. Latest git fixes
 # a segfault issue that normally only occurs when starting doomseeker
@@ -18,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=doomseeker
-VERSION=${VERSION:-1.3.1}
+VERSION=${VERSION:-1.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -33,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
@@ -73,12 +75,9 @@ 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 {} \+
 
-# 20200122 bkw: sorry, rworkman, I know you hate gzipped diffs, but
-# this one has mixed \r\n and \n line endings, git would eat it.
-# 20201030 bkw: leaving the diff in the repo for a while, in case
-# 1.3.1 has issues and someone needs to build the previous version.
-# It'll be removed at next update.
-[ -e "$CWD/$VERSION.diff.gz" ] && zcat "$CWD/$VERSION.diff.gz" | patch -p1
+sed -i 's,Exec=,&/usr/games/,' media/*.desktop
+
+sed -i 's,share/doomseeker,share/games/doomseeker,' src/core/datapaths.cpp
 
 mkdir -p build
 cd build
@@ -94,30 +93,44 @@ cd build
   make install/strip DESTDIR=$PKG
 cd ..
 
+mkdir $PKG/usr/share/games
+mv $PKG/usr/share/$PRGNAM $PKG/usr/share/games
+
 # Shared lib gets installed to wrong place, easier to fix it here than patch.
 [ "$LIBDIRSUFFIX" != "" ] && \
   [ -e "$PKG/usr/lib" ] && \
   mv $PKG/usr/lib $PKG/usr/lib$LIBDIRSUFFIX
 
-# This is a game (or anyway a game utility, the binary
+# This is a game (or anyway a game utility), the binary
 # belongs in /usr/games. cmake accepts and totally ignores
 # "-DCMAKE_INSTALL_BINDIR=games" so just move the damn thing after
 # install.
 mv $PKG/usr/bin $PKG/usr/games
 
 # cmake is also ignoring -DCMAKE_INSTALL_DOCDIR.
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+mv $PKG/usr/share/doc/$PRGNAM/* $PKGDOC
 rm -rf $PKG/usr/share/doc
 
 chmod 755 $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/engines/*.so
 strip $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/engines/*.so
 
-# only got the one PNG icon here
-mv $PKG/usr/share/icons $PKG/usr/share/pixmaps
-
-cp -a LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# upstream installs their *giant* icon directly in /usr/share/icons...
+rm -rf $PKG/usr/share/icons
+for px in 16 32 48 64 128; do
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  convert -resize $size media/icon.png $dir/$PRGNAM.png
+done
+
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+cp -a LICENSE *.md $PKGDOC
+sed -i 's,\r,,' $PKGDOC/*
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/games/doomseeker/doomseeker.info b/games/doomseeker/doomseeker.info
index f0d98bd7e0..aec01c8c15 100644
--- a/games/doomseeker/doomseeker.info
+++ b/games/doomseeker/doomseeker.info
@@ -1,8 +1,8 @@
 PRGNAM="doomseeker"
-VERSION="1.3.1"
-HOMEPAGE="http://doomseeker.drdteam.org/"
-DOWNLOAD="http://doomseeker.drdteam.org/files/doomseeker-1.3.1.tar.xz"
-MD5SUM="a6c3bdc32ad95cc60a6fa43719eac27c"
+VERSION="1.3.2"
+HOMEPAGE="https://doomseeker.drdteam.org/"
+DOWNLOAD="https://doomseeker.drdteam.org/files/doomseeker-1.3.2.tar.xz"
+MD5SUM="445fe0dab269f31a0d0460c28831dea3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""