From 4e3e014764b47f92eff1f3df9e022b81a16b9451 Mon Sep 17 00:00:00 2001 From: Donald Cooley Date: Wed, 3 Mar 2021 14:10:03 +0100 Subject: network/qbittorrent: Updated for version 4.3.0.1 (switch to qt5). Signed-off-by: Matteo Bernardini Signed-off-by: Willy Sudiarto Raharjo --- network/qbittorrent/README | 16 +++++------ network/qbittorrent/README.SBo | 17 +++++++++++ network/qbittorrent/README.nox | 17 ----------- network/qbittorrent/qbittorrent.SlackBuild | 46 ++++++++++++++++++------------ network/qbittorrent/qbittorrent.info | 8 +++--- network/qbittorrent/rc.qbittorrent-nox.new | 4 +-- network/qbittorrent/slack-desc | 18 ++++++------ 7 files changed, 67 insertions(+), 59 deletions(-) create mode 100644 network/qbittorrent/README.SBo delete mode 100644 network/qbittorrent/README.nox 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.SBo b/network/qbittorrent/README.SBo new file mode 100644 index 0000000000..56683cfced --- /dev/null +++ b/network/qbittorrent/README.SBo @@ -0,0 +1,17 @@ +An rc init script is provided and has the following features: + +Runs qbittorrent-nox webui under user who started the script. + +Usage: +/etc/rc.d/rc.qbittorrent-nox start [PORT]|stop|restart [PORT]|status +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" + +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. diff --git a/network/qbittorrent/README.nox b/network/qbittorrent/README.nox deleted file mode 100644 index 15193a85ab..0000000000 --- a/network/qbittorrent/README.nox +++ /dev/null @@ -1,17 +0,0 @@ -An rc init script is provided and has the following features: - -Runs qbittorrent-nox webui under user who started the script. - -Usage: -/etc/rc.d/rc.qbittorrent-nox start [PORT]|stop|restart [PORT]|status -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 - -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. diff --git a/network/qbittorrent/qbittorrent.SlackBuild b/network/qbittorrent/qbittorrent.SlackBuild index e4490f4a59..be95c82b27 100644 --- a/network/qbittorrent/qbittorrent.SlackBuild +++ b/network/qbittorrent/qbittorrent.SlackBuild @@ -2,6 +2,7 @@ # Slackware build script for qbittorrent +# Copyright 2019-2020 Donald Cooley South Haven, Indiana USA # Copyright 2009-2010 David Woodfall # All rights reserved. # @@ -23,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qbittorrent -SRCNAM=qBittorrent-release -VERSION=${VERSION:-3.3.16} +SRCNAM=qBittorrent +VERSION=${VERSION:-4.3.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,21 +61,27 @@ 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 $SRCNAM-release-$VERSION +tar xvf $CWD/$SRCNAM-release-$VERSION.tar.?z* +cd $SRCNAM-release-$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 {} \; + \( -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 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++14" \ ./configure \ --prefix=/usr \ - --with-qt4 + --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 @@ -84,17 +91,21 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --with-qt4 \ - --disable-gui + --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 -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 @@ -103,8 +114,7 @@ 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 + $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 061d931f26..f7e0dc3732 100644 --- a/network/qbittorrent/qbittorrent.info +++ b/network/qbittorrent/qbittorrent.info @@ -1,10 +1,10 @@ PRGNAM="qbittorrent" -VERSION="3.3.16" +VERSION="4.3.0.1" HOMEPAGE="http://qbittorrent.sourceforge.net" -DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-3.3.16.tar.gz" -MD5SUM="28852012dbd3f3bbec400279935b88d1" +DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-4.3.0.1/qBittorrent-release-4.3.0.1.tar.gz" +MD5SUM="62f17f635592b481ecd56921a96fc767" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libtorrent-rasterbar-legacy" +REQUIRES="libtorrent-rasterbar qt5" MAINTAINER="Donald Cooley" EMAIL="chytraeu@sdf.org" 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..1a83a98147 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://qbittorrent.sourceforge.net -- cgit v1.2.3