Merge pull request #12494 from simonvandel/qbittorrent-3.3.2

qbittorrent: 3.3.1 -> 3.3.3
This commit is contained in:
Arseniy Seroka 2016-01-21 23:47:24 +03:00
commit 48ea0c5e45
2 changed files with 9 additions and 4 deletions

View File

@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null);
with stdenv.lib;
stdenv.mkDerivation rec {
name = "qbittorrent-${version}";
version = "3.3.1";
version = "3.3.3";
src = fetchurl {
url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
sha256 = "1li9law732n4vc7sn6i92pwxn8li7ypqaxcmfpm17kk978immlfs";
sha256 = "0lyv230vqwb77isjqm6fwwgv8hdap88zir9yrccj0qxj7zf8p3cw";
};
nativeBuildInputs = [ pkgconfig which ];

View File

@ -1,12 +1,17 @@
diff --git a/qm_gen.pri b/qm_gen.pri
index ed29b76..2d5990c 100644
index 5454440..2d5990c 100644
--- a/qm_gen.pri
+++ b/qm_gen.pri
@@ -5,7 +5,7 @@ isEmpty(QMAKE_LRELEASE) {
@@ -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 }