audio/waon: Fix icons.

Signed-off-by: B. Watson <yalhcru@gmail.com>

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

5 files changed, 19 insertions, 16 deletions

diff --git a/audio/waon/README b/audio/waon/README
index 85f3d2af19..e64d93b900 100644
--- a/audio/waon/README
+++ b/audio/waon/README
@@ -1,3 +1,5 @@
+waon (Wave-to-Notes transcriber)
+
 WaoN is a Wave-to-Notes transcriber, that is, the inverse of timidity
 by Tuukka Toivonen (and its descendants timidity++). ("WaoN" also has
 a meaning of harmony of notes or chord in Japanese!)
diff --git a/audio/waon/doinst.sh b/audio/waon/doinst.sh
index 4a25de5e6f..65c7e2eeb9 100644
--- a/audio/waon/doinst.sh
+++ b/audio/waon/doinst.sh
@@ -7,4 +7,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
-
diff --git a/audio/waon/waon.SlackBuild b/audio/waon/waon.SlackBuild
index e1c2ebc443..4ec4488572 100644
--- a/audio/waon/waon.SlackBuild
+++ b/audio/waon/waon.SlackBuild
@@ -6,11 +6,14 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20211127 bkw: BUILD=2
+# - new-style (and actually square) icons.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=waon
 VERSION=${VERSION:-0.10}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -22,9 +25,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
@@ -57,11 +57,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 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 {} \+
 
 # We will install pv as waon-pv, to avoid clashing with the existing SBo pv
 # package, so change references in all man pages from pv to waon-pv.
@@ -84,15 +81,20 @@ gzip -9c pv.1 > $PKG/usr/man/man1/$PRGNAM-pv.1.gz
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
-# Icon converted from WaoN.gif in the source (anyone care to design a better
+# Icon based on WaoN.gif in the source (anyone care to design a better
 # looking icon & send it upstream?)
+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
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README COPYING ChangeLog TIPS TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README COPYING ChangeLog TIPS TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/waon/waon.info b/audio/waon/waon.info
index 2c13ddff03..46fbb678ea 100644
--- a/audio/waon/waon.info
+++ b/audio/waon/waon.info
@@ -1,7 +1,7 @@
 PRGNAM="waon"
 VERSION="0.10"
 HOMEPAGE="http://waon.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/waon/waon/0.10/waon-0.10.tar.gz"
+DOWNLOAD="https://downloads.sourceforge.net/project/waon/waon/0.10/waon-0.10.tar.gz"
 MD5SUM="fc36842882449274ff90e3f6b55b3daa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/audio/waon/waon.png b/audio/waon/waon.png
index a25a6a89ac..c678ed0bd5 100644
--- a/audio/waon/waon.png
+++ b/audio/waon/waon.png