1 files changed, 38 insertions, 8 deletions
diff --git a/audio/ncspot/ncspot.SlackBuild b/audio/ncspot/ncspot.SlackBuild
index 279550a735..40d7d93c19 100644
--- a/audio/ncspot/ncspot.SlackBuild
+++ b/audio/ncspot/ncspot.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ncspot
 
-# Copyright 2021-2022 K. Eugene Carlson  Tsukuba, Japan
+# Copyright 2021-2024 K. Eugene Carlson  Tsukuba, Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ncspot
-VERSION=${VERSION:-0.10.0}
+VERSION=${VERSION:-1.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -59,21 +59,25 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   CARGOTARGET="--target i586-unknown-linux-gnu"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   CARGOTARGET="--target i686-unknown-linux-gnu"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   CARGOTARGET="--target x86_64-unknown-linux-gnu"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   CARGOTARGET=""
+  LIBDIRSUFFIX=""
 fi
 
 unset DRAWCOVER
 
 # Use COVERS=yes to compile ncspot with cover-drawing capabilities. Requires
-# ueberzug.
+# ueberzug or ueberzugpp.
 [ ${COVERS:-no} = yes ] && DRAWCOVER="--features cover"
 
 set -e
@@ -83,14 +87,14 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-
-# For cargo-1.58 incompatibilities
-patch -p1 < $CWD/cargo-lock.patch
+cd $PRGNAM-$VERSION/misc
+tar xvf $CWD/ncspot-misc-$VERSION.tar
+cd ..
 
 # build offline
 # configuration tells cargo to use the configured directory
 # for dependencies instead of downloading from crates.io
+rm -rf $TMP/$PRGNAM-$VERSION/.cargo
 mkdir .cargo
 cat << EOF >> .cargo/config
 [source.crates-io]
@@ -145,6 +149,13 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
 CARGO_HOME=.cargo \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -159,13 +170,32 @@ install -m 644 misc/$PRGNAM.desktop $PKG/usr/share/applications/
 mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps
 install -m 644 images/logo.svg $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg
 
+mkdir -p $PKG/usr/man/man1
+install -m 644 misc/ncspot.1 $PKG/usr/man/man1/
+gzip -9 $PKG/usr/man/man1/*
+
 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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md CHANGELOG.md doc/users.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# Completions
+mkdir -p $PKG/usr/share/bash-completion/completions
+install -m 644 misc/$PRGNAM.bash $PKG/usr/share/bash-completion/completions
+mkdir -p $PKG/usr/share/zsh/site-functions
+install -m 644 misc/_$PRGNAM $PKG/usr/share/zsh/site-functions
+# Only install the fish completions if fish is installed.
+if [ -x /usr/bin/fish ]; then
+  mkdir -p $PKG/usr/share/fish/vendor_completions.d
+  install -m 644 misc/$PRGNAM.fish $PKG/usr/share/fish/vendor_completions.d
+fi
+# Keep files for fish, PowerShell and Elvish completions in the doc directory.
+install -m 644 misc/$PRGNAM.fish $PKG/usr/doc/$PRGNAM-$VERSION
+install -m 644 misc/_$PRGNAM.ps1 $PKG/usr/doc/$PRGNAM-$VERSION
+install -m 644 misc/$PRGNAM.elv $PKG/usr/doc/$PRGNAM-$VERSION
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh