games/openmortal: Fix -current build.

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

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

6 files changed, 33 insertions, 13 deletions

diff --git a/games/openmortal/README b/games/openmortal/README
index 98eec54b70..ae3ca25280 100644
--- a/games/openmortal/README
+++ b/games/openmortal/README
@@ -1,6 +1,6 @@
 openmortal (2D fighting game)
 
-Open Mortal is a parody of the once popular coin-up fighting game,
+Open Mortal is a parody of the once popular coin-op fighting game,
 Mortal Kombat, for Windows and Linux. It is currently playable, has
 16 playable characters, some more in the making. New characters can be
 added, so be an Open Mortal actor today!
diff --git a/games/openmortal/doinst.sh b/games/openmortal/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/games/openmortal/doinst.sh
+++ b/games/openmortal/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/openmortal/openmortal.SlackBuild b/games/openmortal/openmortal.SlackBuild
index ff67914e31..aef85a9523 100644
--- a/games/openmortal/openmortal.SlackBuild
+++ b/games/openmortal/openmortal.SlackBuild
@@ -6,11 +6,16 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211026 bkw: BUILD=2
+# - at some point, this quit working due to a perl upgrade. fix.
+# - new-style icons.
+# - /usr/games/openmortal => /usr/share/games/openmortal.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=openmortal
 VERSION=${VERSION:-0.7}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 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,17 +59,19 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.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 {} \+
+
+# 20211026 bkw: this worked on 14.2 without this dirty hack...
+# Broke during -current cycle with some perl upgrade or another?
+sed -i '/srand(/aputenv("PERL5LIB=/usr/share/games/openmortal/script");' src/main.cpp
 
 autoreconf -if
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -fpermissive" \
 ./configure \
   --bindir=/usr/games \
+  --datadir=/usr/share/games \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -83,8 +87,18 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# there's a 32x32 icon as data/gfx/icon.png, but it's got some junk
+# pixels around the edges. this one was made by cutting the logo out
+# of data/gfx/Mortal-en.jpg, gives us a bigger version of the logo.
+for px in 16 32 48 64; do
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  convert -resize $size! $CWD/$PRGNAM.png $dir/$PRGNAM.png
+done
+
 mkdir -p $PKG/usr/share/pixmaps
-cat data/gfx/icon.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 # .desktop from rpm.pbone.net openmortal-0.7-1.i386.rpm, edited to make
 # it validate.
diff --git a/games/openmortal/openmortal.info b/games/openmortal/openmortal.info
index 37625dadb1..3a224892ff 100644
--- a/games/openmortal/openmortal.info
+++ b/games/openmortal/openmortal.info
@@ -1,7 +1,7 @@
 PRGNAM="openmortal"
 VERSION="0.7"
 HOMEPAGE="http://openmortal.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/openmortal/openmortal/0.7/openmortal-0.7.tar.bz2"
+DOWNLOAD="https://downloads.sourceforge.net/project/openmortal/openmortal/0.7/openmortal-0.7.tar.bz2"
 MD5SUM="95278382bb563906fce624d833a845cf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/games/openmortal/openmortal.png b/games/openmortal/openmortal.png
new file mode 100644
index 0000000000..2448ecab73
--- /dev/null
+++ b/games/openmortal/openmortal.png
diff --git a/games/openmortal/slack-desc b/games/openmortal/slack-desc
index 6ec214c5f4..8c09851355 100644
--- a/games/openmortal/slack-desc
+++ b/games/openmortal/slack-desc
@@ -8,7 +8,7 @@
           |-----handy-ruler------------------------------------------------------|
 openmortal: openmortal (2D fighting game)
 openmortal:
-openmortal: Open Mortal is a parody of the once popular coin-up fighting game,
+openmortal: Open Mortal is a parody of the once popular coin-op fighting game,
 openmortal: Mortal Kombat, for Windows and Linux. It is currently playable,
 openmortal: has 16 playable characters, some more in the making. New characters
 openmortal: can be added, so be an Open Mortal actor today!