games/mrboom: Updated for version 5.2.

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

6 files changed, 26 insertions, 57 deletions

diff --git a/games/mrboom/Makefile.patch b/games/mrboom/Makefile.patch
deleted file mode 100644
index 0a240e9275ad..000000000000
--- a/games/mrboom/Makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.orig	2020-05-09 23:50:56.489976161 +0200
-+++ Makefile	2020-05-09 23:51:30.250975839 +0200
-@@ -500,11 +500,11 @@
- 	rm -f *.d */*.d */*/*.d */*/*/*.d */*/*/*/*.d */*/*/*/*/*.d
- 
- strip:
--	$(STRIP) $(TARGET_NAME).out
-+	$(STRIP) $(TARGET_NAME)
- 
- install: strip
- 	$(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/$(BINDIR)
--	$(INSTALL) -m 555 $(TARGET_NAME).out $(DESTDIR)$(PREFIX)/$(BINDIR)/$(TARGET_NAME)
-+	$(INSTALL) -m 555 $(TARGET_NAME) $(DESTDIR)$(PREFIX)/$(BINDIR)/$(TARGET_NAME)
- 	$(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/$(MANDIR)
- 	$(INSTALL) -m 644 Assets/$(TARGET_NAME).6 $(DESTDIR)$(PREFIX)/$(MANDIR) 
- 
diff --git a/games/mrboom/README b/games/mrboom/README
index 1d6c3eaa053d..5697e769a6f5 100644
--- a/games/mrboom/README
+++ b/games/mrboom/README
@@ -1,5 +1,3 @@
 Mr.Boom is an 8 players Bomberman clone. This is an SDL2 version of the
 original 1999 version of Mr. Boom. The goal of the game is to bomb away
 your enemies and other players.
-
-RetroArch is an optional dependency required to run the libretro core.
diff --git a/games/mrboom/doinst.sh b/games/mrboom/doinst.sh
index 5fb28930db0b..0fa754f75eb7 100644
--- a/games/mrboom/doinst.sh
+++ b/games/mrboom/doinst.sh
@@ -1,3 +1,11 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+# If other icon themes are installed, then add to/modify this as needed
+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 -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/games/mrboom/mrboom.SlackBuild b/games/mrboom/mrboom.SlackBuild
index 82f113fc0d9c..ad380ac5713a 100644
--- a/games/mrboom/mrboom.SlackBuild
+++ b/games/mrboom/mrboom.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mrboom
 
-# Copyright 2017-2020 Thibaut Notteboom, Paris, FRANCE
+# Copyright 2017-2022 Thibaut Notteboom, Paris, FRANCE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,20 +22,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# 20220222 bkw: Modified by SlackBuilds.org:
-# - fix build on 15.0.
-# - actually use SLKCFLAGS.
-
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mrboom
-VERSION=${VERSION:-4.9}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-5.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-SRCNAM=mrboom-libretro
-LIBNAM=mrboom_libretro
+SRCNAM=MrBoom-src
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -83,38 +78,24 @@ 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 -p0 < $CWD/Makefile.patch
 sed -i "s,-O3,$SLKCFLAGS -fcommon," Makefile
 
-sed -i "s|^GIT_VERSION :=.*|GIT_VERSION := \" ${VERSION}\"|" Makefile
-
-if pkg-config --exists sdl2; then
-  make mrboom LIBSDL2=1
-
-  mkdir -p $PKG/usr/games $PKG/usr/man/man6 $PKG/usr/share/applications $PKG/usr/share/pixmaps
+make mrboom LIBSDL2=1
+make install PREFIX=/usr BINDIR=games DESTDIR=$PKG
 
-  make install PREFIX=/usr BINDIR=games DESTDIR=$PKG
+install -D -m 644 Assets/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+install -D -m 644 $CWD/mrboom.svg $PKG/usr/share/pixmaps/mrboom.svg
 
-  install -m 0644 Assets/$PRGNAM.desktop $PKG/usr/share/applications
-  install -m 0644 $CWD/mrboom.svg $PKG/usr/share/pixmaps
-
-  for i in 16x16 32x32 48x48 256x256; do
-    install -D -m0644 Assets/hicolor/$i/apps/$PRGNAM.png $PKG/usr/share/icons/hicolor/$i/apps/$PRGNAM.png
-  done
-
-  find $PKG/usr/man -type f -exec gzip -9 {} \;
-  for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-fi
-
-make clean
-make
-
-install -D -m 0644 $LIBNAM.so $PKG/usr/lib${LIBDIRSUFFIX}/libretro/$LIBNAM.so
-install -D -m 0644 $CWD/$LIBNAM.info $PKG/usr/lib${LIBDIRSUFFIX}/libretro/info/$LIBNAM.info
+for i in 16x16 32x32 48x48 256x256; do
+  install -D -m 644 Assets/hicolor/$i/apps/$PRGNAM.png $PKG/usr/share/icons/hicolor/$i/apps/$PRGNAM.png
+done
 
 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
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   LICENSE README.md \
diff --git a/games/mrboom/mrboom.info b/games/mrboom/mrboom.info
index 8d40fb4f76f6..ace8ae9b2441 100644
--- a/games/mrboom/mrboom.info
+++ b/games/mrboom/mrboom.info
@@ -1,10 +1,8 @@
 PRGNAM="mrboom"
-VERSION="4.9"
+VERSION="5.2"
 HOMEPAGE="http://mrboom.mumblecore.org/"
-DOWNLOAD="https://github.com/Javanaise/mrboom-libretro/archive/4.9/mrboom-libretro-4.9.tar.gz \
-          https://raw.githubusercontent.com/libretro/libretro-super/7371094f35d2e51788e4da4a9350fcfacce364d1/dist/info/mrboom_libretro.info"
-MD5SUM="872747a290cf52a89aa1542d9a40771e \
-        31198676678443eb83ad7ec33f356966"
+DOWNLOAD="https://github.com/Javanaise/mrboom-libretro/releases/download/5.2/MrBoom-src-5.2.tar.gz"
+MD5SUM="5ce669d236a0f14166918caf9f5cc04d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libmodplug libminizip"
diff --git a/games/mrboom/slack-desc b/games/mrboom/slack-desc
index 9cf93e41ae72..0ca7e4ddeaa4 100644
--- a/games/mrboom/slack-desc
+++ b/games/mrboom/slack-desc
@@ -12,7 +12,7 @@ mrboom: Mr.Boom is an 8 players Bomberman clone. This is an SDL2 version of
 mrboom: the original 1999 version of Mr. Boom. The goal of the game is to
 mrboom: bomb away your enemies and other players.
 mrboom:
-mrboom: RetroArch is an optional dependency required to run the libretro core.
+mrboom:
 mrboom:
 mrboom:
 mrboom: