network/qbittorrent: Updated for version 4.4.2. New maintainer.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 34 insertions, 41 deletions

diff --git a/network/qbittorrent/README.SBo b/network/qbittorrent/README.SBo
index 56683cfced..04fd92c833 100644
--- a/network/qbittorrent/README.SBo
+++ b/network/qbittorrent/README.SBo
@@ -15,3 +15,9 @@ 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 21cd6f434d..5432307d34 100644
--- a/network/qbittorrent/qbittorrent.SlackBuild
+++ b/network/qbittorrent/qbittorrent.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for qbittorrent
 
+# Copyright 2022 David O'Shaughnessy
 # Copyright 2019-2021 Donald Cooley South Haven, Indiana USA
 # Copyright 2009-2010 David Woodfall <dave@slackbuilds.org>
 # All rights reserved.
@@ -27,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=qbittorrent
 SRCNAM=qBittorrent
-VERSION=${VERSION:-4.3.1}
+VERSION=${VERSION:-4.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -81,37 +82,23 @@ 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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -std=c++14" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install INSTALL_ROOT=$PKG
-make clean
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-gui \
-  --build=$ARCH-slackware-linux
-
-make
-mv src/qbittorrent-nox $PKG/usr/bin
+# 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
+
+# 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
@@ -123,8 +110,8 @@ 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.SBo $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS Changelog NEWS TODO COPYING README.md \
+   $CWD/README.SBo $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/qbittorrent/qbittorrent.info b/network/qbittorrent/qbittorrent.info
index 72270f7e5d..8fd1f10f95 100644
--- a/network/qbittorrent/qbittorrent.info
+++ b/network/qbittorrent/qbittorrent.info
@@ -1,10 +1,10 @@
 PRGNAM="qbittorrent"
-VERSION="4.3.1"
-HOMEPAGE="http://qbittorrent.sourceforge.net"
-DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-4.3.1/qBittorrent-release-4.3.1.tar.gz"
-MD5SUM="4e72cfa5dc637b53ab86fdc0ebf97c9f"
+VERSION="4.4.2"
+HOMEPAGE="https://www.qbittorrent.org/"
+DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-4.4.2/qBittorrent-release-4.4.2.tar.gz"
+MD5SUM="b26499a296e5da53730f8d019514745a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libtorrent-rasterbar"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+MAINTAINER="David O'Shaughnessy"
+EMAIL="dev@osh.id.au"
diff --git a/network/qbittorrent/slack-desc b/network/qbittorrent/slack-desc
index 1a83a98147..ed330143c3 100644
--- a/network/qbittorrent/slack-desc
+++ b/network/qbittorrent/slack-desc
@@ -16,4 +16,4 @@ qbittorrent: there. qBittorrent is fast, stable, and provides unicode support as
 qbittorrent: well as many features.
 qbittorrent:
 qbittorrent:
-qbittorrent: Homepage: https://qbittorrent.sourceforge.net
+qbittorrent: Homepage: https://www.qbittorrent.org/