6 files changed, 90 insertions, 70 deletions
diff --git a/network/qbittorrent/README b/network/qbittorrent/README
index 01571412e3..d95396d99f 100644
--- a/network/qbittorrent/README
+++ b/network/qbittorrent/README
@@ -1,5 +1,9 @@
-qBittorrent is an easy to use, good looking, and featureful but
-lightweight C++ / Qt4 Bittorrent Client.
+qBittorrent is a bittorrent client programmed in C++ / Qt5 that uses
+libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
+
+It aims to be a good alternative to all other bittorrent clients out
+there. qBittorrent is fast, stable, and provides unicode supports as
+well as many features.
 
 Note that from version 3.3.15 you will get a warning on startup that
 qbittorrent has a new way of saving things. If you want to backup your
@@ -7,10 +11,4 @@ old config directory first, you will find it here:
 
 ~/.config/qBittorrent
 
-That way you can return to an older version by swapping directories
-around.
-
-This is the last version of qBittorrent that will build with Qt4
-libraries.  You might want to embrace the future with Qt5 and newer
-versions of qBittorrent. See the qbittorrent-qt5 SlackBuild for more
-information.
+You can return to an older version by swapping directories around.
diff --git a/network/qbittorrent/README.nox b/network/qbittorrent/README.SBo
index 15193a85ab..04fd92c833 100644
--- a/network/qbittorrent/README.nox
+++ b/network/qbittorrent/README.SBo
@@ -9,9 +9,15 @@ Port defaults to 8080 if not provided.
 To run this script from rc.local you must run it as a non-root user.
 
 Example:
-/bin/su - david -c /etc/rc.d/rc.qbittorrent-nox start 9000
+/bin/su - david -c "/etc/rc.d/rc.qbittorrent-nox start 9000"
 
 Program output is sent to /tmp/qbittorrent-nox-$USER
 
 The status command can be run as root, in which case you should see
 all process of qbittorrent-nox, otherwise you will just see $USER's.
+
+** UPDATE **
+
+An alternative way to run this is with the daemon program (included in
+Slackware since 15.0). Check `man daemon` for details, but you can
+avoid root completely with the daemon approach.
diff --git a/network/qbittorrent/qbittorrent.SlackBuild b/network/qbittorrent/qbittorrent.SlackBuild
index e4490f4a59..e6a61244d4 100644
--- a/network/qbittorrent/qbittorrent.SlackBuild
+++ b/network/qbittorrent/qbittorrent.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for qbittorrent
 
-# Copyright 2009-2010 David Woodfall <dave@slackbuilds.org>
+# Copyright 2022 David O'Shaughnessy
+# Copyright 2019-2021 Donald Cooley South Haven, Indiana USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +23,18 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230630 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - BUILD needed to be bumped due to the .desktop file change.
+# - Install README.SBo with correct ownership.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=qbittorrent
-SRCNAM=qBittorrent-release
-VERSION=${VERSION:-3.3.16}
+#SRCNAM=qBittorrent
+VERSION=${VERSION:-4.6.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +44,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}
@@ -60,56 +72,60 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/release-$VERSION.tar.?z*
-cd $SRCNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --with-qt4
-
-make
-make install INSTALL_ROOT=$PKG
-make clean
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --with-qt4 \
-  --disable-gui
-
-make
-mv src/qbittorrent-nox $PKG/usr/bin
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ \( -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 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
+
+# Build graphical version by default
+gui="-DGUI=ON"; [[ "${GUI:-yes}" != "yes" ]] && gui="-DGUI=OFF"
+
+cmake -B build -G "Ninja" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_INSTALL_LIBDIR:PATH=lib${LIBDIRSUFFIX} \
+  -DCMAKE_INSTALL_MANDIR=/usr/man \
+  -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+  -DCMAKE_BUILD_TYPE=Release \
+  $gui \
+  -DSYSTEMD=OFF
+cmake --build build
+DESTDIR=$PKG cmake --install build --strip
+
+# adjust .desktop file to be compliant with Slackware 15.0 supported
+# version of desktop spec (1.4) (SingleMainWindow was added to version
+# 1.5 Desktop Entry Specification).
+# https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
+[[ "${GUI:-yes}" != "yes" ]] || sed -i '/^SingleMainWindow/d' $PKG/usr/share/applications/*.desktop
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+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
 
-
-mv $PKG/usr/share/man $PKG/usr
 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
 
 mkdir -p $PKG/etc/rc.d
 cp $CWD/rc.qbittorrent-nox.new $PKG/etc/rc.d/.
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS Changelog NEWS TODO COPYING INSTALL README.md \
-    $CWD/README.nox \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS Changelog COPYING COPYING.GPLv? README.md $PKGDOC
+# 20230630 bkw: use cat instead of "cp -a" to install files from $CWD,
+# there's no way to tell what the $CWD ownership/permission is.
+cat $CWD/README.SBo > $PKGDOC/README.SBo
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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/network/qbittorrent/qbittorrent.info b/network/qbittorrent/qbittorrent.info
index 061d931f26..06c0e31186 100644
--- a/network/qbittorrent/qbittorrent.info
+++ b/network/qbittorrent/qbittorrent.info
@@ -1,10 +1,10 @@
 PRGNAM="qbittorrent"
-VERSION="3.3.16"
-HOMEPAGE="http://qbittorrent.sourceforge.net"
-DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-3.3.16.tar.gz"
-MD5SUM="28852012dbd3f3bbec400279935b88d1"
+VERSION="4.6.4"
+HOMEPAGE="https://www.qbittorrent.org/"
+DOWNLOAD="https://sourceforge.net/projects/qbittorrent/files/qbittorrent/qbittorrent-4.6.4/qbittorrent-4.6.4.tar.xz"
+MD5SUM="ffc528cbdf1ab4ff40a51753e5e9b030"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libtorrent-rasterbar-legacy"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+REQUIRES="libtorrent2"
+MAINTAINER="David O'Shaughnessy"
+EMAIL="dev@osh.id.au"
diff --git a/network/qbittorrent/rc.qbittorrent-nox.new b/network/qbittorrent/rc.qbittorrent-nox.new
index 9b78744ba4..aa916d8096 100644
--- a/network/qbittorrent/rc.qbittorrent-nox.new
+++ b/network/qbittorrent/rc.qbittorrent-nox.new
@@ -8,12 +8,12 @@
 # To run this script from rc.local you must run it as a non-root user.
 #
 # Example:
-# /bin/su - david -c /etc/rc.d/rc.qbittorrent-nox start 9000
+# /bin/su - david -c "/etc/rc.d/rc.qbittorrent-nox start 9000"
 # Program output is sent to /tmp/qbittorrent-nox-$USER
 
 # First some checks to see what's what.
 
-if [ "$USER" = "root" ] && [ "$1" = "start" ]; then
+if [ "$USER" = "root" ] && [[ "$1" =~ start ]]; then
     echo "Do not start the daemon as root." >/dev/stderr
     exit 1
 fi
diff --git a/network/qbittorrent/slack-desc b/network/qbittorrent/slack-desc
index 2a54c14312..ed330143c3 100644
--- a/network/qbittorrent/slack-desc
+++ b/network/qbittorrent/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
            |-----handy-ruler------------------------------------------------------|
-qbittorrent: qbittorrent (a C++ / Qt4 Bittorrent Client)
+qbittorrent: qbittorrent (a C++ / Qt5 Bittorrent Client)
 qbittorrent:
-qbittorrent: The qBittorrent project was created in March 2006 with the idea
-qbittorrent: of developing a new Bittorrent client for Linux (and possibly
-qbittorrent: other systems) that would be easy to use, good looking, and
-qbittorrent: featureful but lightweight.
-qbittorrent: qBittorrent is a Free Software released under the GNU GPL license.
-qbittorrent: The author is Christophe Dumez, a French student in an engineer
-qbittorrent: school (UTBM), in IT departement.
+qbittorrent: qBittorrent is a bittorrent client programmed in C++ / Qt5 that uses
+qbittorrent: libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
 qbittorrent:
-qbittorrent: Homepage: http://qbittorrent.sourceforge.net
+qbittorrent: It aims to be a good alternative to all other bittorrent clients out
+qbittorrent: there. qBittorrent is fast, stable, and provides unicode support as
+qbittorrent: well as many features.
+qbittorrent:
+qbittorrent:
+qbittorrent: Homepage: https://www.qbittorrent.org/