From fecea0b305940e92234218e27fede564518569c5 Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Fri, 1 Jan 2016 22:23:51 +0100
Subject: [PATCH] qbittorrent: 3.2.3 -> 3.3.1

* upstream has switched to qt5 as default, so also done here
* Adds a patch to use the qt lrelease tool correct
---
 .../networking/p2p/qbittorrent/default.nix          | 11 +++++++----
 .../networking/p2p/qbittorrent/fix-lrelease.patch   | 13 +++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)
 create 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 f8c025ba241..bc5289f8093 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, which
-, boost, libtorrentRasterbar, qt4
+, boost, libtorrentRasterbar, qt5
 , debugSupport ? false # Debugging
 , guiSupport ? true, dbus_libs ? null # GUI (disable to run headless)
 , webuiSupport ? true # WebUI
@@ -10,16 +10,16 @@ assert guiSupport -> (dbus_libs != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "3.2.3";
+  version = "3.3.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
-    sha256 = "05590ak4nnqkah8dy71cxf7mqv6phw0ih1719dm761mxf8vrz9w6";
+    sha256 = "1li9law732n4vc7sn6i92pwxn8li7ypqaxcmfpm17kk978immlfs";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
 
-  buildInputs = [ boost libtorrentRasterbar qt4 ]
+  buildInputs = [ boost libtorrentRasterbar qt5.qtbase qt5.qttools ]
     ++ optional guiSupport dbus_libs;
 
   configureFlags = [
@@ -29,6 +29,9 @@ 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;
 
diff --git a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
new file mode 100644
index 00000000000..9e3e484667f
--- /dev/null
+++ b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
@@ -0,0 +1,13 @@
+diff --git a/qm_gen.pri b/qm_gen.pri
+index ed29b76..2d5990c 100644
+--- a/qm_gen.pri
++++ b/qm_gen.pri
+@@ -5,7 +5,7 @@ isEmpty(QMAKE_LRELEASE) {
+     win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
+     else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+     unix {
+-        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }
++        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
+     } else {
+         !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
+     }