3 files changed, 29 insertions, 20 deletions
diff --git a/games/KAdventure/KAdventure.SlackBuild b/games/KAdventure/KAdventure.SlackBuild
index 0adfb3ccbb..38145d7a00 100644
--- a/games/KAdventure/KAdventure.SlackBuild
+++ b/games/KAdventure/KAdventure.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for KAdventure
 
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220219 bkw: Modified by SlackBuilds.org, for Slackware 15.0:
+# - add qt4 dependency (and use qmake-qt4).
+# - more binary to /usr/games ('cause it's a game).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=KAdventure
 VERSION=${VERSION:-gitfdc9579}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,33 +76,31 @@ cd $PRGNAM-master
 
 #we'll patch the qml files to remove a runtime warning
 #upstream will be fixing this eventually.
-sed -i "s/Qt 4.7/QtQuick 1.1/" src/*.qml
-sed -i "s/Qt 4.7/QtQuick 1.1/" levels/BouncingBall.qml
-sed -i "s/Qt 4.7/QtQuick 1.1/" objects/*.qml
+
+# 20220219 bkw: well, I wouldn't hold my breath...
+
+sed -i "s/Qt 4.7/QtQuick 1.1/" \
+       src/*.qml levels/BouncingBall.qml objects/*.qml
+
 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 \
+  -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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-#mkdir -p build
-qmake QMAKE_CFLAGS="$SLKCFLAGS" QMAKE_CXXFLAGS="$SLKCFLAGS" -config release
+qmake-qt4 QMAKE_CFLAGS="$SLKCFLAGS" QMAKE_CXXFLAGS="$SLKCFLAGS" -config release
 make
 
 #the make file has no install info so we do things ourselves
-mkdir -p $PKG/usr/bin  $PKG/usr/share/applications/
-cp $PRGNAM $PKG/usr/bin
+mkdir -p $PKG/usr/games  $PKG/usr/share/applications/
+install -s -m0755 $PRGNAM $PKG/usr/games
 mkdir -p $PKG/usr/share/applications/ $PKG/usr/share/icons/hicolor/{128x128,48x48,16x16}/apps
 cp images/player.png $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
 convert images/player.png -resize 128x128 $PKG/usr/share/icons/hicolor/128x128/apps/$PRGNAM.png
 convert images/player.png -resize 16x16 $PKG/usr/share/icons/hicolor/16x16/apps/$PRGNAM.png
 cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 
-#lets strip the executable
-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
 cp README.md $PKG/usr/doc/$PRGNAM-$VERSION/
 cd ..
@@ -103,4 +112,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 #now make the package
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/games/KAdventure/KAdventure.desktop b/games/KAdventure/KAdventure.desktop
index 56475141ca..5c5e3efcdf 100644
--- a/games/KAdventure/KAdventure.desktop
+++ b/games/KAdventure/KAdventure.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=KAdventure
-Comment=Simple 2D puzzle Game. Guide the man to the exit
-Exec=KAdventure
+Comment=Simple 2D puzzle game: guide the man to the exit.
+Exec=/usr/games/KAdventure
 Icon=KAdventure
 Terminal=false
 StartupNotify=false
diff --git a/games/KAdventure/KAdventure.info b/games/KAdventure/KAdventure.info
index de0bfc8613..e75f811264 100644
--- a/games/KAdventure/KAdventure.info
+++ b/games/KAdventure/KAdventure.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/KAdventur
 MD5SUM="a089f6a795190fcd570edecd3e4b5460"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt4"
 MAINTAINER="Tim Dickson"
 EMAIL="dickson.tim@googlemail.com"