1 files changed, 33 insertions, 14 deletions
diff --git a/multimedia/vkeybd/vkeybd.SlackBuild b/multimedia/vkeybd/vkeybd.SlackBuild
index 663056859c..fe32c4c606 100644
--- a/multimedia/vkeybd/vkeybd.SlackBuild
+++ b/multimedia/vkeybd/vkeybd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for vkeybd
 
@@ -8,22 +8,27 @@
 # Check https://help.ubuntu.com/community/HowToVirtualKeyboardKeymapping for
 # more information.
 
-# Now maintained by B. Watson <yalhcru@gmail.com>. Original version
+# Now maintained by B. Watson <urchlay@slackware.uk>. Original version
 # of this script had no license. Modified version licensed under the
 # WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230103 bkw: BUILD=4, new-style icons, fix .desktop file.
+
 # 20180103 bkw:
 # - take over maintenance.
 # - i486 => i586.
 # - determine tcl version from system, instead of hardcoding.
 # - simplify script a bit.
-# - fix grammer in README and slack-desc.
+# - fix grammar in README and slack-desc.
 # - 'virtual keyboard' => 'virtual piano keyboard' in slack-desc.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=vkeybd
 VERSION=${VERSION:-0.1.18d}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -33,7 +38,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}
@@ -55,14 +64,14 @@ rm -rf $PRGNAM
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM
 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 {} \+
 
-# make .desktop file validate
-sed -i -e '/^Encoding/d' -e '/^Cat/s,Application;,,' $PRGNAM.desktop
+# make .desktop file validate, use correct icon name.
+sed -i -e '/^Encoding/d' \
+       -e '/^Cat/s,Application;,,' \
+       -e '/^Icon/s,_.*,,' \
+       $PRGNAM.desktop
 
 # grab tcl version from the system
 TCLVER="$( basename $( readlink /usr/bin/tclsh|sed 's,tclsh,,' ) )"
@@ -77,7 +86,17 @@ make \
 
 gzip -9 $PKG/usr/man/man?/*.?
 strip $PKG/usr/bin/*
-ln -s ${PRGNAM}_48x48.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+for i in pixmaps/${PRGNAM}_*x*.png; do
+  size=$( basename $i .png | cut -d_ -f2 )
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  cp -a $i $dir/$PRGNAM.png
+done
+
+( cd $PKG/usr/share/pixmaps
+  rm -f *
+  ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png . )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION
@@ -88,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