5 files changed, 58 insertions, 25 deletions
diff --git a/system/gnome-commander/README b/system/gnome-commander/README
index 31bcc609f6..e0ce213ede 100644
--- a/system/gnome-commander/README
+++ b/system/gnome-commander/README
@@ -1,4 +1,6 @@
-GNOME Commander is a "two-pane" graphical file manager for the GNOME desktop 
-environment. GNOME Commander aims to fulfill the demands of more advanced 
-users who like to focus on file management, their work through special 
-applications, and running smart commands.
+gnome-commander (nc-like file manager for gnome)
+
+GNOME Commander is a "two-pane" graphical file manager for the GNOME
+desktop environment. GNOME Commander aims to fulfill the demands of
+more advanced users who like to focus on file management, their work
+through special applications, and running smart commands.
diff --git a/system/gnome-commander/doinst.sh b/system/gnome-commander/doinst.sh
index 6fa145a19f..0254ea06d8 100644
--- a/system/gnome-commander/doinst.sh
+++ b/system/gnome-commander/doinst.sh
@@ -2,6 +2,12 @@ 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
+
 if [ -e usr/share/glib-2.0/schemas ]; then
   if [ -x /usr/bin/glib-compile-schemas ]; then
     /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
diff --git a/system/gnome-commander/gnome-commander.SlackBuild b/system/gnome-commander/gnome-commander.SlackBuild
index dcf67e63fc..209758e956 100644
--- a/system/gnome-commander/gnome-commander.SlackBuild
+++ b/system/gnome-commander/gnome-commander.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for gnome-commander
 #
@@ -22,26 +22,41 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix icon sizes.
+# - relative symlinks in /usr/share/help.
+# 20220211 bkw: Modified by SlackBuilds.org
+# - updated for latest release, 1.14.0, since the old version wouldn't
+#   build on 15.0.
+# - new-style icons.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gnome-commander
-VERSION=${VERSION:-1.4.3}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.14.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   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}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,9 +80,9 @@ 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 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -82,16 +97,26 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
+
+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 -geometry $size pixmaps/gnome-commander.svg $dir/$PRGNAM.png
+done
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# 20220411 bkw: convert absolute symlinks to relative. ugh.
+for i in $( find $PKG/usr/share/help/?? -type l -lname /usr/share/help/C/\* ); do
+  rm -f $i
+  ln -s ../../../C/$PRGNAM/figures/$( basename $i ) $i
+done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS BUGS COPYING ChangeLog INSTALL README README.commits TODO \
+cp -a AUTHORS BUGS COPYING ChangeLog README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -100,4 +125,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
diff --git a/system/gnome-commander/gnome-commander.info b/system/gnome-commander/gnome-commander.info
index f88d57d652..514647050e 100644
--- a/system/gnome-commander/gnome-commander.info
+++ b/system/gnome-commander/gnome-commander.info
@@ -1,8 +1,8 @@
 PRGNAM="gnome-commander"
-VERSION="1.4.3"
+VERSION="1.14.0"
 HOMEPAGE="https://gcmd.github.io/"
-DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.4/gnome-commander-1.4.3.tar.xz"
-MD5SUM="19672fef5fc72276fbfd3a5b4bc47941"
+DOWNLOAD="https://download.gnome.org/sources/gnome-commander/1.14/gnome-commander-1.14.0.tar.xz"
+MD5SUM="4c74efb40b28ab7e9d189c807c04ca32"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libgnomeui rarian libunique"
diff --git a/system/gnome-commander/slack-desc b/system/gnome-commander/slack-desc
index 746cc3620a..535cecdf8c 100644
--- a/system/gnome-commander/slack-desc
+++ b/system/gnome-commander/slack-desc
@@ -6,10 +6,10 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                |-----handy-ruler------------------------------------------------------|
-gnome-commander: gnome-commander (NC-like file manager for gnome)
+gnome-commander: gnome-commander (nc-like file manager for gnome)
 gnome-commander:
 gnome-commander: GNOME Commander is a "two-pane" graphical file manager for the
-gnome-commander: GNOME desktop environment.  GNOME Commander aims to fulfill the
+gnome-commander: GNOME desktop environment. GNOME Commander aims to fulfill the
 gnome-commander: demands of more advanced users who like to focus on file management,
 gnome-commander: their work through special applications, and running smart commands.
 gnome-commander: