3 files changed, 35 insertions, 12 deletions
diff --git a/multimedia/vkeybd/doinst.sh b/multimedia/vkeybd/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/multimedia/vkeybd/doinst.sh
+++ b/multimedia/vkeybd/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/multimedia/vkeybd/vkeybd.SlackBuild b/multimedia/vkeybd/vkeybd.SlackBuild
index d81cc11eab..c22bd9a692 100644
--- a/multimedia/vkeybd/vkeybd.SlackBuild
+++ b/multimedia/vkeybd/vkeybd.SlackBuild
@@ -12,19 +12,23 @@
 # of this script had no license. Modified version licensed under the
 # WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20240808 bkw: update for v0.1.18e.
+
+# 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}
+VERSION=${VERSION:-0.1.18e}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -58,15 +62,18 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 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,,' ) )"
@@ -81,7 +88,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
diff --git a/multimedia/vkeybd/vkeybd.info b/multimedia/vkeybd/vkeybd.info
index 6a69ec8f88..b8607bf994 100644
--- a/multimedia/vkeybd/vkeybd.info
+++ b/multimedia/vkeybd/vkeybd.info
@@ -1,8 +1,8 @@
 PRGNAM="vkeybd"
-VERSION="0.1.18d"
+VERSION="0.1.18e"
 HOMEPAGE="https://github.com/tiwai/vkeybd"
-DOWNLOAD="https://ftp.osuosl.org/pub/gentoo/distfiles/vkeybd-0.1.18d.tar.bz2"
-MD5SUM="5c7bd16e2903866f949879b885953a2b"
+DOWNLOAD="https://github.com/tiwai/vkeybd/archive/v0.1.18e/vkeybd-0.1.18e.tar.gz"
+MD5SUM="ccbd80667a03b8dcf9415545f022bcb8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""