1 files changed, 22 insertions, 14 deletions
diff --git a/audio/japa/japa.SlackBuild b/audio/japa/japa.SlackBuild
index 0e4bfc60f6..dfdfc502fe 100644
--- a/audio/japa/japa.SlackBuild
+++ b/audio/japa/japa.SlackBuild
@@ -2,15 +2,17 @@
 
 # Slackware build script for japa
 
-# 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=2, new-style icons, update man page.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=japa
 VERSION=${VERSION:-0.9.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -22,9 +24,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
@@ -73,21 +72,30 @@ make -C source PREFIX=/usr
 make -C source install PREFIX=$PKG/usr
 strip $PKG/usr/bin/$PRGNAM
 
-# man page borrowed from debian, edited a bit
-sed "s,@VERSION@,$VERSION,g" < $CWD/$PRGNAM.1 | gzip -c9 - > $PKG/usr/man/man1/$PRGNAM.1.gz
+# man page written for this SlackBuild.
+gzip -c9 < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+# the 32x32 icon comes from Debian.
+# the 48x48 icon is the 32x32 one, centered in a 48x48 transparent PNG.
+mkdir -p $PKG/usr/share/icons/hicolor/{32x32,48x48}/apps
+convert $CWD/$PRGNAM.xpm \
+        $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png
+convert -background none -extent 48x48 -gravity center \
+        $CWD/$PRGNAM.xpm \
+        $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
 
-# icon grabbed from old web site
 mkdir -p $PKG/usr/share/pixmaps
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+cat $CWD/$PRGNAM.xpm > $PKG/usr/share/pixmaps/$PRGNAM.xpm
 
-# desktop file written for this SlackBuild
+# desktop files written for this SlackBuild
 mkdir -p $PKG/usr/share/applications
-cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+for i in $PRGNAM $PRGNAM-alsa; do
+  cat $CWD/$i.desktop > $PKG/usr/share/applications/$i.desktop
+done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install