From 2ad80c24c5431d59f1c657756396fecebc5e1e38 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 18 Apr 2016 09:17:42 +0300 Subject: update qbittorrent to 3.3.4 The following patches were included in the upstream: * convert includes like to lowercase https://github.com/qbittorrent/qBittorrent/pull/4505 * fix library list https://github.com/qbittorrent/qBittorrent/pull/4824 --- plugins/apps/qbittorrent-1-fixes.patch | 151 --------------------------------- plugins/apps/qbittorrent.mk | 4 +- 2 files changed, 2 insertions(+), 153 deletions(-) diff --git a/plugins/apps/qbittorrent-1-fixes.patch b/plugins/apps/qbittorrent-1-fixes.patch index af1cb2a..e5e19c6 100644 --- a/plugins/apps/qbittorrent-1-fixes.patch +++ b/plugins/apps/qbittorrent-1-fixes.patch @@ -54,154 +54,3 @@ index 1111111..2222222 100755 if test -r "$QT_QMAKE/qmake-qt4"; then eval "$as_ac_File=yes" else - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 30 Aug 2015 01:58:17 +0200 -Subject: [PATCH] convert includes like to lowercase - - -diff --git a/src/app/application.cpp b/src/app/application.cpp -index 1111111..2222222 100644 ---- a/src/app/application.cpp -+++ b/src/app/application.cpp -@@ -37,7 +37,7 @@ - #ifndef DISABLE_GUI - #include "gui/guiiconprovider.h" - #ifdef Q_OS_WIN --#include -+#include - #include - #include - #endif // Q_OS_WIN -diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp -index 1111111..2222222 100644 ---- a/src/base/bittorrent/torrenthandle.cpp -+++ b/src/base/bittorrent/torrenthandle.cpp -@@ -43,7 +43,7 @@ - #include - - #ifdef Q_OS_WIN --#include -+#include - #endif - - #include "base/logger.h" -diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp -index 1111111..2222222 100644 ---- a/src/base/preferences.cpp -+++ b/src/base/preferences.cpp -@@ -47,7 +47,7 @@ - #endif - - #ifdef Q_OS_WIN --#include -+#include - #include - #endif - -diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp -index 1111111..2222222 100644 ---- a/src/base/utils/misc.cpp -+++ b/src/base/utils/misc.cpp -@@ -48,7 +48,7 @@ - - #ifdef Q_OS_WIN - #include --#include -+#include - const int UNLEN = 256; - #else - #include -diff --git a/src/gui/powermanagement/powermanagement.cpp b/src/gui/powermanagement/powermanagement.cpp -index 1111111..2222222 100644 ---- a/src/gui/powermanagement/powermanagement.cpp -+++ b/src/gui/powermanagement/powermanagement.cpp -@@ -40,7 +40,7 @@ - #endif - - #ifdef Q_OS_WIN --#include -+#include - #endif - - PowerManagement::PowerManagement(QObject *parent) : QObject(parent), m_busy(false) - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 30 Aug 2015 02:02:39 +0200 -Subject: [PATCH] fix library list - -Replace library list hardcoded in qmake files with -libraries found by autotools. - -diff --git a/configure b/configure -index 1111111..2222222 100755 ---- a/configure -+++ b/configure -@@ -8345,7 +8345,7 @@ fi - $as_echo "$as_me: Running qmake to generate the makefile..." >&6;} - CONFDIR="$( cd "$( dirname "$0" )" && pwd )" - --$QT_QMAKE -r $CONFDIR/qbittorrent.pro -+$QT_QMAKE -r $CONFDIR/qbittorrent.pro "QMAKE_LRELEASE=$QMAKE_LRELEASE" "CONF_LIBS=$LIBS" - - ret="$?" - -diff --git a/winconf-mingw.pri b/winconf-mingw.pri -index 1111111..2222222 100644 ---- a/winconf-mingw.pri -+++ b/winconf-mingw.pri -@@ -20,19 +20,8 @@ CONFIG(debug, debug|release) { - - RC_FILE = qbittorrent_mingw.rc - --# Adapt the lib names/versions accordingly --CONFIG(debug, debug|release) { -- LIBS += libtorrent \ -- libboost_system-mgw45-mt-d-1_47 \ -- libboost_filesystem-mgw45-mt-d-1_47 \ -- libboost_thread-mgw45-mt-d-1_47 --} else { -- LIBS += libtorrent \ -- libboost_system-mgw45-mt-1_47 \ -- libboost_filesystem-mgw45-mt-1_47 \ -- libboost_thread-mgw45-mt-1_47 --} -+LIBS += $$CONF_LIBS - - LIBS += libadvapi32 libshell32 libuser32 --LIBS += libcrypto.dll libssl.dll libwsock32 libws2_32 libz libiconv.dll -+LIBS += libcrypto libssl libwsock32 libws2_32 libz libiconv - LIBS += libpowrprof -diff --git a/winconf.pri b/winconf.pri -index 1111111..2222222 100644 ---- a/winconf.pri -+++ b/winconf.pri -@@ -9,15 +9,6 @@ INCLUDEPATH += $$quote(C:/qBittorrent/Zlib/include) - # Point this to the openssl include folder - INCLUDEPATH += $$quote(C:/qBittorrent/openssl/include) - --# Point this to the boost lib folder --LIBS += $$quote(-LC:/qBittorrent/boost_1_51_0/stage/lib) --# Point this to the libtorrent lib folder --LIBS += $$quote(-LC:/qBittorrent/RC_0_16/bin/) --# Point this to the zlib lib folder --LIBS += $$quote(-LC:/qBittorrent/Zlib/lib) --# Point this to the openssl lib folder --LIBS += $$quote(-LC:/qBittorrent/openssl/lib) -- - # LIBTORRENT DEFINES - DEFINES += BOOST_ALL_NO_LIB - DEFINES += BOOST_ASIO_HASH_MAP_BUCKETS=1021 -@@ -46,9 +37,4 @@ CONFIG(debug, debug|release) { - # Enable backtrace support - CONFIG += strace_win - --win32-g++ { -- include(winconf-mingw.pri) --} --else { -- include(winconf-msvc.pri) --} -+include(winconf-mingw.pri) diff --git a/plugins/apps/qbittorrent.mk b/plugins/apps/qbittorrent.mk index 6049487..00a4019 100644 --- a/plugins/apps/qbittorrent.mk +++ b/plugins/apps/qbittorrent.mk @@ -3,8 +3,8 @@ PKG := qbittorrent $(PKG)_IGNORE := -$(PKG)_VERSION := 3.3.1 -$(PKG)_CHECKSUM := dad15a233a69ce13ea75957585af3f9122dbf915291aab0fdbc48a71b8a229d2 +$(PKG)_VERSION := 3.3.4 +$(PKG)_CHECKSUM := c0d0d4b72c240f113b59a061146803bc1b7926d3d7f39b06b50a4d26f5ad91b8 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) -- cgit v0.12