5 files changed, 47 insertions, 25 deletions
diff --git a/audio/foo-yc20/README b/audio/foo-yc20/README
index 4cea340315..81279b1463 100644
--- a/audio/foo-yc20/README
+++ b/audio/foo-yc20/README
@@ -1,12 +1,13 @@
 foo-yc20 (Yamaha YC-20 organ emulator for JACK and LV2)
 
-This is an implementation of a 1969 designed Yamaha combo organ, the YC-20.
+This is an implementation of a 1969 designed Yamaha combo organ,
+the YC-20.
 
 Original YC-20 organs have a touch vibrato control, which is vibrato
-induced by horizontal movement of the keys. As there are very few (almost
-no) MIDI keyboards which produce such information, this feature has
-been left out of the emulation. Instead of the touch vibrato control,
-the control panel hosts a "realism" switch.
+induced by horizontal movement of the keys. As there are very few
+(almost no) MIDI keyboards which produce such information, this
+feature has been left out of the emulation. Instead of the touch
+vibrato control, the control panel hosts a "realism" switch.
 
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for realtime audio processing). This
@@ -14,15 +15,15 @@ may be considered a security/stability risk. Please read
 http://www.slackbuilds.org/caps/ for more information. To disable
 capabilities, pass SETCAP=no to the script.
 
-Since audio synthesis is compute-intensive, compiler optimizations might
-actually make a noticeable difference. The environment variable OPTIMIZE
-can be set to:
+Since audio synthesis is compute-intensive, compiler optimizations
+might actually make a noticeable difference. The environment variable
+OPTIMIZE can be set to:
 
 - OPTIMIZE="default" (or, unset) builds with -O2 -march=native.
 
-- OPTIMIZE="slack" builds with standard Slackware flags. Use this if you're
-  going to e.g. build a package on a system with SSE2 that you're going to
-  install on a system without SSE2).
+- OPTIMIZE="slack" builds with standard Slackware flags. Use if you're
+  going to e.g. build a package on a system with SSE2 that you're going
+  to install on a system without SSE2.
 
-- OPTIMIZE="upstream" builds with -O3 -march=native. This requires up to
-  6GB of memory (ram + swap) and takes up to 10 times as long to build.
+- OPTIMIZE="upstream" builds with -O3 -march=native. This requires up
+  to 6GB of memory (ram+swap) and takes up to 10 times as long to build.
diff --git a/audio/foo-yc20/doinst.sh b/audio/foo-yc20/doinst.sh
index 4e8ba7071d..3e5691a052 100644
--- a/audio/foo-yc20/doinst.sh
+++ b/audio/foo-yc20/doinst.sh
@@ -2,3 +2,8 @@ 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/foo-yc20/foo-yc20.SlackBuild b/audio/foo-yc20/foo-yc20.SlackBuild
index b2ad258341..474850f007 100644
--- a/audio/foo-yc20/foo-yc20.SlackBuild
+++ b/audio/foo-yc20/foo-yc20.SlackBuild
@@ -1,18 +1,22 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for foo-yc20
 
-# 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.
 
+# 20211129 bkw: BUILD=3, new-style icons.
 # 20170621 bkw: Rework optimization options. Needed because -current's
 # gcc7 requires massive amounts of memory to build this.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=foo-yc20
 VERSION=${VERSION:-1.3.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -22,7 +26,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}
@@ -50,11 +58,8 @@ 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 {} \+
 
 sed -i "s,\<lib\>,lib$LIBDIRSUFFIX,g" Makefile
 
@@ -72,10 +77,21 @@ esac
 
 make install DESTDIR=$PKG PREFIX=/usr
 
-# make the .desktop file pass desktop-file-validate
+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 $CWD/$PRGNAM.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
+
+# make the .desktop file pass desktop-file-validate, and use our icon.
 sed -i \
   -e '/^Encoding/d' \
   -e '/^Categories/s/$/;/' \
+  -e '/^Icon/s,=.*,='$PRGNAM',' \
   $PKG/usr/share/applications/$PRGNAM.desktop
 
 strip $PKG/usr/bin/* $PKG/usr/lib$LIBDIRSUFFIX/lv2/$PRGNAM.lv2/*.so
@@ -96,4 +112,4 @@ if [ "${SETCAP:-yes}" = "yes" ]; then
 fi
 
 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/foo-yc20/foo-yc20.info b/audio/foo-yc20/foo-yc20.info
index dc18b46a3b..ee57b15613 100644
--- a/audio/foo-yc20/foo-yc20.info
+++ b/audio/foo-yc20/foo-yc20.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack slv2"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/audio/foo-yc20/foo-yc20.png b/audio/foo-yc20/foo-yc20.png
new file mode 100644
index 0000000000..a36bf6925a
--- /dev/null
+++ b/audio/foo-yc20/foo-yc20.png