From bc334e1599dc4658a029b42b80e524173ea489e8 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Sat, 30 Sep 2017 23:38:28 +0000
Subject: [PATCH] qbittorrent: 3.3.15 -> 3.3.16, drop patch, enable parallel
 build

---
 .../networking/p2p/qbittorrent/default.nix     | 12 ++++--------
 .../p2p/qbittorrent/fix-lrelease.patch         | 18 ------------------
 2 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 3baa5a8e480d..9b6f2f1f1bb1 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -6,15 +6,15 @@
 }:
 
 assert guiSupport -> (dbus_libs != null);
-
 with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "3.3.15";
+  version = "3.3.16";
 
   src = fetchurl {
     url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
-    sha256 = "1bnfnbkdg0088h25zzhlpcdh30y0k1m76bkhjsj1aali765c1fx7";
+    sha256 = "0mxyn2pajvb55bhcaz55v64p2xzy15p0yy174s62b5y3f8cac27a";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
@@ -33,11 +33,7 @@ stdenv.mkDerivation rec {
     (if webuiSupport then "" else "--disable-webui")
   ] ++ optional debugSupport "--enable-debug";
 
-  # The lrelease binary is named lrelease instead of lrelease-qt4
-  patches = [ ./fix-lrelease.patch ];
-
-  # https://github.com/qbittorrent/qBittorrent/issues/1992
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   meta = {
     description = "Free Software alternative to µtorrent";
diff --git a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
deleted file mode 100644
index a906803e4336..000000000000
--- a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/qm_gen.pri b/qm_gen.pri
-index 5454440..2d5990c 100644
---- a/qm_gen.pri
-+++ b/qm_gen.pri
-@@ -5,12 +5,7 @@ isEmpty(QMAKE_LRELEASE) {
-     win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
-     else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
-     unix {
--      equals(QT_MAJOR_VERSION, 4) {
--        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }
--      } 
--      equals(QT_MAJOR_VERSION, 5) {
--        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt5 }
--      }
-+        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
-     } else {
-         !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
-     }