network/qbittorrent-qt5: Update to 4.1.4

4 files changed, 130 insertions, 35 deletions

diff --git a/network/qbittorrent-qt5/] b/network/qbittorrent-qt5/]
new file mode 100644
index 0000000000..7bd5a15890
--- /dev/null
+++ b/network/qbittorrent-qt5/]
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+# Slackware build script for qbittorrent-qt5
+
+# Copyright 2009-2010 David Woodfall <dave@dawoodfall.net>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=qbittorrent-qt5
+SRCNAM=qBittorrent
+VERSION=${VERSION:-4.1.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+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 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+#patch -p1 --verbose <$CWD/desktop-fix.patch
+
+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 \
+  --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
+
+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
+
+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.SBo $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$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}
diff --git a/network/qbittorrent-qt5/desktop-fix.patch b/network/qbittorrent-qt5/desktop-fix.patch
deleted file mode 100644
index 6f1d4b11a2..0000000000
--- a/network/qbittorrent-qt5/desktop-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From acdf9061fe5539c75604d2b7919cc434b2cebb02 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Sun, 12 Aug 2018 23:14:44 -0400
-Subject: [PATCH] Fix regression that broke installing desktop file
-
-In commit 5d94db9c7940aee9af769ce314c1dd1be9ddc18c the desktop file was
-moved from src/ to dist/ but the relative path from src/src.pro was
-switched to an absolute path from the repository root. This broke
-detection of the file from within qmake.
-
-Fix by using the same $DIST_PATH used elsewhere for consistency, which
-uses ../dist/.
----
- unixconf.pri | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/unixconf.pri b/unixconf.pri
-index 3bb51975ff..164b835ef9 100644
---- a/unixconf.pri
-+++ b/unixconf.pri
-@@ -36,7 +36,7 @@ nogui:systemd {
- 
- # Menu Icon
- !nogui {
--    menuicon.files = dist/unix/qbittorrent.desktop
-+    menuicon.files = $$DIST_PATH/qbittorrent.desktop
-     menuicon.path = $$DATADIR/applications/
-     INSTALLS += menuicon
- 
diff --git a/network/qbittorrent-qt5/qbittorrent-qt5.SlackBuild b/network/qbittorrent-qt5/qbittorrent-qt5.SlackBuild
index a9e186175a..5e05fa539b 100644
--- a/network/qbittorrent-qt5/qbittorrent-qt5.SlackBuild
+++ b/network/qbittorrent-qt5/qbittorrent-qt5.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=qbittorrent-qt5
 SRCNAM=qBittorrent
-VERSION=${VERSION:-4.1.2}
+VERSION=${VERSION:-4.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,8 +70,6 @@ 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 {} \;
 
-patch -p1 --verbose <$CWD/desktop-fix.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/network/qbittorrent-qt5/qbittorrent-qt5.info b/network/qbittorrent-qt5/qbittorrent-qt5.info
index 32c7685b77..c2cba5e435 100644
--- a/network/qbittorrent-qt5/qbittorrent-qt5.info
+++ b/network/qbittorrent-qt5/qbittorrent-qt5.info
@@ -1,8 +1,8 @@
 PRGNAM="qbittorrent-qt5"
-VERSION="4.1.2"
+VERSION="4.1.4"
 HOMEPAGE="http://qbittorrent.sourceforge.net"
-DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-4.1.2/qBittorrent-release-4.1.2.tar.gz"
-MD5SUM="0534d8c16c581ff0b8e07ca4860dcc13"
+DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-4.1.4/qBittorrent-release-4.1.4.tar.gz"
+MD5SUM="91a72012fbb813c0104aedb2dfac3f61"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libtorrent-rasterbar qt5"