4 files changed, 46 insertions, 30 deletions
diff --git a/audio/qmidiroute/doinst.sh b/audio/qmidiroute/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/audio/qmidiroute/doinst.sh
+++ b/audio/qmidiroute/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/audio/qmidiroute/qmidiroute.SlackBuild b/audio/qmidiroute/qmidiroute.SlackBuild
index 6c44d61770..c703e5a455 100644
--- a/audio/qmidiroute/qmidiroute.SlackBuild
+++ b/audio/qmidiroute/qmidiroute.SlackBuild
@@ -1,15 +1,23 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for qmidiroute
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211217 bkw: BUILD=2
+# - fix build on -current (by compiling with --enable-qt5).
+# - use upstream's .desktop (slightly modified) instead of our own.
+# - new-style icons.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=qmidiroute
 VERSION=${VERSION:-0.4.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +27,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}
@@ -47,15 +59,23 @@ 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 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 {} \+
+
+# Use upstream's .desktop, but fix it some. The Spanish translation
+# comes from shonudo, of libera.chat's ##slackware channel.
+sed -i \
+    -e '/^Comment/d' \
+    -e '/^Encoding/d' \
+    -e '$aGenericName[es]=MIDI Router y Processor para ALSA' \
+    -e '/^GenericName\[fr\]/s,=,=MIDI ,' \
+    -e '/^StartupNotify/s,true,false,' \
+    $PRGNAM.desktop
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
+  --enable-qt5 \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -66,20 +86,20 @@ CXXFLAGS="$SLKCFLAGS" \
 
 make
 make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/{,*}/man1/*.1
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+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 -background none -resize $size $PRGNAM.svg $dir/$PRGNAM.png
+done
 
 mkdir -p $PKG/usr/share/pixmaps
-cp src/pixmaps/qmidiroute_48.xpm $PKG/usr/share/pixmaps/$PRGNAM.xpm
-
-# .desktop file borrowed from Debian with thanks
-mkdir -p $PKG/usr/share/applications
-cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS ChangeLog COPYING NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -87,4 +107,4 @@ 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}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/audio/qmidiroute/qmidiroute.desktop b/audio/qmidiroute/qmidiroute.desktop
deleted file mode 100644
index 4201b7d05a..0000000000
--- a/audio/qmidiroute/qmidiroute.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=qmidiroute
-GenericName=qmidiroute
-Comment=Midi Router
-Icon=qmidiroute
-TryExec=qmidiroute
-Exec=qmidiroute
-Terminal=false
-Categories=AudioVideo;AudioVideoEditing;Music;
diff --git a/audio/qmidiroute/qmidiroute.info b/audio/qmidiroute/qmidiroute.info
index a4d50eb77e..7cedbfefa8 100644
--- a/audio/qmidiroute/qmidiroute.info
+++ b/audio/qmidiroute/qmidiroute.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"