network/qbittorrent-qt5: Update to 4.1.2

5 files changed, 38 insertions, 7 deletions

diff --git a/network/qbittorrent-qt5/README.SBo b/network/qbittorrent-qt5/README.SBo
index 15193a85ab..56683cfced 100644
--- a/network/qbittorrent-qt5/README.SBo
+++ b/network/qbittorrent-qt5/README.SBo
@@ -9,7 +9,7 @@ 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
 
diff --git a/network/qbittorrent-qt5/desktop-fix.patch b/network/qbittorrent-qt5/desktop-fix.patch
new file mode 100644
index 0000000000..6f1d4b11a2
--- /dev/null
+++ b/network/qbittorrent-qt5/desktop-fix.patch
@@ -0,0 +1,29 @@
+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 4f176aad1e..a9e186175a 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.0}
+VERSION=${VERSION:-4.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,6 +70,8 @@ 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 d7a115e789..32c7685b77 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.0"
+VERSION="4.1.2"
 HOMEPAGE="http://qbittorrent.sourceforge.net"
-DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-4.1.0/qBittorrent-release-4.1.0.tar.gz"
-MD5SUM="b7362f74d216051b191cf42bcd4722e3"
+DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-4.1.2/qBittorrent-release-4.1.2.tar.gz"
+MD5SUM="0534d8c16c581ff0b8e07ca4860dcc13"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libtorrent-rasterbar qt5"
diff --git a/network/qbittorrent-qt5/rc.qbittorrent-nox.new b/network/qbittorrent-qt5/rc.qbittorrent-nox.new
index 9b78744ba4..aa916d8096 100644
--- a/network/qbittorrent-qt5/rc.qbittorrent-nox.new
+++ b/network/qbittorrent-qt5/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