From 9594d78dd0a8aadaa1173fb9f6679cb410241a36 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 5 Jan 2016 17:57:00 +0300 Subject: qbittorrent: consolidate patches --- ...bittorrent-1-do-not-check-qmake-existance.patch | 33 ---- plugins/apps/qbittorrent-1-fixes.patch | 220 +++++++++++++++++++++ ...t-2-convert-windows-includes-to-lowercase.patch | 98 --------- ...3-remove-unused-members-of-peerlistwidget.patch | 32 --- plugins/apps/qbittorrent-4-fix-library-list.patch | 92 --------- 5 files changed, 220 insertions(+), 255 deletions(-) delete mode 100644 plugins/apps/qbittorrent-1-do-not-check-qmake-existance.patch create mode 100644 plugins/apps/qbittorrent-1-fixes.patch delete mode 100644 plugins/apps/qbittorrent-2-convert-windows-includes-to-lowercase.patch delete mode 100644 plugins/apps/qbittorrent-3-remove-unused-members-of-peerlistwidget.patch delete mode 100644 plugins/apps/qbittorrent-4-fix-library-list.patch diff --git a/plugins/apps/qbittorrent-1-do-not-check-qmake-existance.patch b/plugins/apps/qbittorrent-1-do-not-check-qmake-existance.patch deleted file mode 100644 index a5df669..0000000 --- a/plugins/apps/qbittorrent-1-do-not-check-qmake-existance.patch +++ /dev/null @@ -1,33 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From 6f6377091a12ed3fe749fe646674be921d2c648c Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 30 Aug 2015 00:28:50 +0200 -Subject: [PATCH] do not check qmake existance - -Fix ./configure error: - -checking for mxe/usr/i686-w64-mingw32.static/qt/bin/qmake... -configure: error: cannot check for file existence when -cross compiling ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index f28d1b0..a414bd6 100755 ---- a/configure -+++ b/configure -@@ -4540,7 +4540,7 @@ if eval \${$as_ac_File+:} false; then : - $as_echo_n "(cached) " >&6 - else - test "$cross_compiling" = yes && -- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -+ echo "cannot check for file existence when cross compiling" "$LINENO" 5 - if test -r "$QT_QMAKE/qmake"; then - eval "$as_ac_File=yes" - else --- -1.7.10.4 - diff --git a/plugins/apps/qbittorrent-1-fixes.patch b/plugins/apps/qbittorrent-1-fixes.patch new file mode 100644 index 0000000..08534e4 --- /dev/null +++ b/plugins/apps/qbittorrent-1-fixes.patch @@ -0,0 +1,220 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sun, 30 Aug 2015 00:28:50 +0200 +Subject: [PATCH] do not check qmake existance + +Fix ./configure error: + +checking for mxe/usr/i686-w64-mingw32.static/qt/bin/qmake... +configure: error: cannot check for file existence when +cross compiling + +diff --git a/configure b/configure +index 1111111..2222222 100755 +--- a/configure ++++ b/configure +@@ -4540,7 +4540,7 @@ if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 + else + test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 ++ echo "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "$QT_QMAKE/qmake"; 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 +@@ -35,7 +35,7 @@ + + #ifndef DISABLE_GUI + #ifdef Q_OS_WIN +-#include ++#include + #include + #include + #endif // Q_OS_WIN +diff --git a/src/core/misc.cpp b/src/core/misc.cpp +index 1111111..2222222 100644 +--- a/src/core/misc.cpp ++++ b/src/core/misc.cpp +@@ -54,7 +54,7 @@ + + #ifdef Q_OS_WIN + #include +-#include ++#include + const int UNLEN = 256; + #else + #include +diff --git a/src/core/preferences.cpp b/src/core/preferences.cpp +index 1111111..2222222 100644 +--- a/src/core/preferences.cpp ++++ b/src/core/preferences.cpp +@@ -46,7 +46,7 @@ + #endif + + #ifdef Q_OS_WIN +-#include ++#include + #include + #endif + +diff --git a/src/core/qtlibtorrent/filterparserthread.h b/src/core/qtlibtorrent/filterparserthread.h +index 1111111..2222222 100644 +--- a/src/core/qtlibtorrent/filterparserthread.h ++++ b/src/core/qtlibtorrent/filterparserthread.h +@@ -45,7 +45,7 @@ using namespace std; + // P2B Stuff + #include + #ifdef Q_OS_WIN +-#include ++#include + #else + #include + #endif +diff --git a/src/core/qtlibtorrent/qtorrenthandle.cpp b/src/core/qtlibtorrent/qtorrenthandle.cpp +index 1111111..2222222 100644 +--- a/src/core/qtlibtorrent/qtorrenthandle.cpp ++++ b/src/core/qtlibtorrent/qtorrenthandle.cpp +@@ -48,7 +48,7 @@ + #include + + #ifdef Q_OS_WIN +-#include ++#include + #endif + + using namespace libtorrent; +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 01:59:15 +0200 +Subject: [PATCH] remove unused members of peerlistwidget + +They were still generated by MOC and caused compilation errors + +diff --git a/src/gui/properties/peerlistwidget.h b/src/gui/properties/peerlistwidget.h +index 1111111..2222222 100644 +--- a/src/gui/properties/peerlistwidget.h ++++ b/src/gui/properties/peerlistwidget.h +@@ -83,11 +83,6 @@ protected slots: + void saveSettings() const; + void showPeerListMenu(const QPoint&); + +-#if LIBTORRENT_VERSION_NUM < 10000 +- void limitUpRateSelectedPeers(const QStringList& peer_ips); +- void limitDlRateSelectedPeers(const QStringList& peer_ips); +-#endif +- + void banSelectedPeers(const QStringList& peer_ips); + void handleSortColumnChanged(int col); + + +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 +@@ -8469,7 +8469,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 +@@ -17,19 +17,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 +@@ -47,12 +38,7 @@ 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) + + DEFINES += WITH_GEOIP_EMBEDDED + message("On Windows, GeoIP database must be embedded.") diff --git a/plugins/apps/qbittorrent-2-convert-windows-includes-to-lowercase.patch b/plugins/apps/qbittorrent-2-convert-windows-includes-to-lowercase.patch deleted file mode 100644 index 0c45286..0000000 --- a/plugins/apps/qbittorrent-2-convert-windows-includes-to-lowercase.patch +++ /dev/null @@ -1,98 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From 8976424272266837b7bf7574e555d13694d244e3 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 30 Aug 2015 01:58:17 +0200 -Subject: [PATCH 1/3] convert includes like to lowercase - ---- - src/app/application.cpp | 2 +- - src/core/misc.cpp | 2 +- - src/core/preferences.cpp | 2 +- - src/core/qtlibtorrent/filterparserthread.h | 2 +- - src/core/qtlibtorrent/qtorrenthandle.cpp | 2 +- - src/gui/powermanagement/powermanagement.cpp | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/app/application.cpp b/src/app/application.cpp -index 2594e9a..90a43e1 100644 ---- a/src/app/application.cpp -+++ b/src/app/application.cpp -@@ -35,7 +35,7 @@ - - #ifndef DISABLE_GUI - #ifdef Q_OS_WIN --#include -+#include - #include - #include - #endif // Q_OS_WIN -diff --git a/src/core/misc.cpp b/src/core/misc.cpp -index 5e551ff..632b5ee 100644 ---- a/src/core/misc.cpp -+++ b/src/core/misc.cpp -@@ -54,7 +54,7 @@ - - #ifdef Q_OS_WIN - #include --#include -+#include - const int UNLEN = 256; - #else - #include -diff --git a/src/core/preferences.cpp b/src/core/preferences.cpp -index 1c43927..0759b5a 100644 ---- a/src/core/preferences.cpp -+++ b/src/core/preferences.cpp -@@ -46,7 +46,7 @@ - #endif - - #ifdef Q_OS_WIN --#include -+#include - #include - #endif - -diff --git a/src/core/qtlibtorrent/filterparserthread.h b/src/core/qtlibtorrent/filterparserthread.h -index a950865..36536df 100644 ---- a/src/core/qtlibtorrent/filterparserthread.h -+++ b/src/core/qtlibtorrent/filterparserthread.h -@@ -45,7 +45,7 @@ using namespace std; - // P2B Stuff - #include - #ifdef Q_OS_WIN --#include -+#include - #else - #include - #endif -diff --git a/src/core/qtlibtorrent/qtorrenthandle.cpp b/src/core/qtlibtorrent/qtorrenthandle.cpp -index a1cf5a3..bbe7bfb 100644 ---- a/src/core/qtlibtorrent/qtorrenthandle.cpp -+++ b/src/core/qtlibtorrent/qtorrenthandle.cpp -@@ -48,7 +48,7 @@ - #include - - #ifdef Q_OS_WIN --#include -+#include - #endif - - using namespace libtorrent; -diff --git a/src/gui/powermanagement/powermanagement.cpp b/src/gui/powermanagement/powermanagement.cpp -index ec07aa8..c51b229 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) --- -1.7.10.4 - diff --git a/plugins/apps/qbittorrent-3-remove-unused-members-of-peerlistwidget.patch b/plugins/apps/qbittorrent-3-remove-unused-members-of-peerlistwidget.patch deleted file mode 100644 index 940cbc3..0000000 --- a/plugins/apps/qbittorrent-3-remove-unused-members-of-peerlistwidget.patch +++ /dev/null @@ -1,32 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From 9e74dc0c9cda72506303a276a0a6174b500fae15 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 30 Aug 2015 01:59:15 +0200 -Subject: [PATCH 2/3] remove unused members of peerlistwidget - -They were still generated by MOC and caused compilation errors ---- - src/gui/properties/peerlistwidget.h | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/gui/properties/peerlistwidget.h b/src/gui/properties/peerlistwidget.h -index 0771555..7f5f771 100644 ---- a/src/gui/properties/peerlistwidget.h -+++ b/src/gui/properties/peerlistwidget.h -@@ -83,11 +83,6 @@ protected slots: - void saveSettings() const; - void showPeerListMenu(const QPoint&); - --#if LIBTORRENT_VERSION_NUM < 10000 -- void limitUpRateSelectedPeers(const QStringList& peer_ips); -- void limitDlRateSelectedPeers(const QStringList& peer_ips); --#endif -- - void banSelectedPeers(const QStringList& peer_ips); - void handleSortColumnChanged(int col); - --- -1.7.10.4 - diff --git a/plugins/apps/qbittorrent-4-fix-library-list.patch b/plugins/apps/qbittorrent-4-fix-library-list.patch deleted file mode 100644 index d149311..0000000 --- a/plugins/apps/qbittorrent-4-fix-library-list.patch +++ /dev/null @@ -1,92 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From f581b0bec9286cc9e2cb450a79a77e325f070fcb Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 30 Aug 2015 02:02:39 +0200 -Subject: [PATCH 3/3] fix library list - -Replace library list hardcoded in qmake files with -libraries found by autotools. ---- - configure | 2 +- - winconf-mingw.pri | 15 ++------------- - winconf.pri | 16 +--------------- - 3 files changed, 4 insertions(+), 29 deletions(-) - -diff --git a/configure b/configure -index a414bd6..7417654 100755 ---- a/configure -+++ b/configure -@@ -8469,7 +8469,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 4507000..39d30dd 100644 ---- a/winconf-mingw.pri -+++ b/winconf-mingw.pri -@@ -17,19 +17,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 3818cca..ede8535 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 -@@ -47,12 +38,7 @@ 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) - - DEFINES += WITH_GEOIP_EMBEDDED - message("On Windows, GeoIP database must be embedded.") --- -1.7.10.4 - -- cgit v0.12 From 8e207b6df77db12f5233a40cdad611e6d7ce340a Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 5 Jan 2016 18:17:42 +0300 Subject: qbittorrent: update from 3.2.3 to 3.3.1 * many files were renamed * file filterparserthread.h no longer include Winsock2.h * patch "remove unused members of peerlistwidget" was removed because peerlistwidget no longer has these members * embeded GeoIP.dat is not needed https://github.com/qbittorrent/qBittorrent/pull/3186 remove geoip-database from dependencies * --with-qt4=yes (now Qt5 is the default if both present) * patch "do not check qmake existance" was improved: its target file has multiple equal contexts for the diff and it was applied to wrong section; now applying to all --- plugins/apps/qbittorrent-1-fixes.patch | 99 +++++++++++++++------------------- plugins/apps/qbittorrent.mk | 10 ++-- 2 files changed, 47 insertions(+), 62 deletions(-) diff --git a/plugins/apps/qbittorrent-1-fixes.patch b/plugins/apps/qbittorrent-1-fixes.patch index 08534e4..b2c7e6f 100644 --- a/plugins/apps/qbittorrent-1-fixes.patch +++ b/plugins/apps/qbittorrent-1-fixes.patch @@ -27,6 +27,33 @@ index 1111111..2222222 100755 if test -r "$QT_QMAKE/qmake"; then eval "$as_ac_File=yes" else +@@ -4520,7 +4520,7 @@ if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 + else + test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 ++ echo "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "$QT_QMAKE/qmake-qt5"; then + eval "$as_ac_File=yes" + else +@@ -4617,7 +4617,7 @@ if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 + else + test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 ++ echo "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "$QT_QMAKE/qmake"; then + eval "$as_ac_File=yes" + else +@@ -4637,7 +4637,7 @@ if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 + else + test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 ++ echo "cannot check for file existence when cross compiling" "$LINENO" 5 + 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 @@ -38,19 +65,19 @@ 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 -@@ -35,7 +35,7 @@ - +@@ -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/core/misc.cpp b/src/core/misc.cpp +diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp index 1111111..2222222 100644 ---- a/src/core/misc.cpp -+++ b/src/core/misc.cpp +--- a/src/base/utils/misc.cpp ++++ b/src/base/utils/misc.cpp @@ -54,7 +54,7 @@ #ifdef Q_OS_WIN @@ -60,10 +87,10 @@ index 1111111..2222222 100644 const int UNLEN = 256; #else #include -diff --git a/src/core/preferences.cpp b/src/core/preferences.cpp +diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp index 1111111..2222222 100644 ---- a/src/core/preferences.cpp -+++ b/src/core/preferences.cpp +--- a/src/base/preferences.cpp ++++ b/src/base/preferences.cpp @@ -46,7 +46,7 @@ #endif @@ -73,32 +100,19 @@ index 1111111..2222222 100644 #include #endif -diff --git a/src/core/qtlibtorrent/filterparserthread.h b/src/core/qtlibtorrent/filterparserthread.h -index 1111111..2222222 100644 ---- a/src/core/qtlibtorrent/filterparserthread.h -+++ b/src/core/qtlibtorrent/filterparserthread.h -@@ -45,7 +45,7 @@ using namespace std; - // P2B Stuff - #include - #ifdef Q_OS_WIN --#include -+#include - #else - #include - #endif -diff --git a/src/core/qtlibtorrent/qtorrenthandle.cpp b/src/core/qtlibtorrent/qtorrenthandle.cpp -index 1111111..2222222 100644 ---- a/src/core/qtlibtorrent/qtorrenthandle.cpp -+++ b/src/core/qtlibtorrent/qtorrenthandle.cpp -@@ -48,7 +48,7 @@ - #include +diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp +index de6ca9c..40b2498 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 - using namespace libtorrent; + #include "base/logger.h" diff --git a/src/gui/powermanagement/powermanagement.cpp b/src/gui/powermanagement/powermanagement.cpp index 1111111..2222222 100644 --- a/src/gui/powermanagement/powermanagement.cpp @@ -115,30 +129,6 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev -Date: Sun, 30 Aug 2015 01:59:15 +0200 -Subject: [PATCH] remove unused members of peerlistwidget - -They were still generated by MOC and caused compilation errors - -diff --git a/src/gui/properties/peerlistwidget.h b/src/gui/properties/peerlistwidget.h -index 1111111..2222222 100644 ---- a/src/gui/properties/peerlistwidget.h -+++ b/src/gui/properties/peerlistwidget.h -@@ -83,11 +83,6 @@ protected slots: - void saveSettings() const; - void showPeerListMenu(const QPoint&); - --#if LIBTORRENT_VERSION_NUM < 10000 -- void limitUpRateSelectedPeers(const QStringList& peer_ips); -- void limitDlRateSelectedPeers(const QStringList& peer_ips); --#endif -- - void banSelectedPeers(const QStringList& peer_ips); - void handleSortColumnChanged(int col); - - -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 @@ -204,7 +194,7 @@ index 1111111..2222222 100644 # LIBTORRENT DEFINES DEFINES += BOOST_ALL_NO_LIB DEFINES += BOOST_ASIO_HASH_MAP_BUCKETS=1021 -@@ -47,12 +38,7 @@ CONFIG(debug, debug|release) { +@@ -47,9 +38,4 @@ CONFIG(debug, debug|release) { # Enable backtrace support CONFIG += strace_win @@ -215,6 +205,3 @@ index 1111111..2222222 100644 - include(winconf-msvc.pri) -} +include(winconf-mingw.pri) - - DEFINES += WITH_GEOIP_EMBEDDED - message("On Windows, GeoIP database must be embedded.") diff --git a/plugins/apps/qbittorrent.mk b/plugins/apps/qbittorrent.mk index 2ef4b1b..6049487 100644 --- a/plugins/apps/qbittorrent.mk +++ b/plugins/apps/qbittorrent.mk @@ -3,12 +3,12 @@ PKG := qbittorrent $(PKG)_IGNORE := -$(PKG)_VERSION := 3.2.3 -$(PKG)_CHECKSUM := 86a79f3772bd06736a4be104180187d76c5c8feb2c1cdf1054135b4ba602a914 +$(PKG)_VERSION := 3.3.1 +$(PKG)_CHECKSUM := dad15a233a69ce13ea75957585af3f9122dbf915291aab0fdbc48a71b8a229d2 $(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) -$(PKG)_DEPS := gcc libtorrent-rasterbar qt boost geoip-database +$(PKG)_DEPS := gcc libtorrent-rasterbar qt boost define $(PKG)_UPDATE $(WGET) -q -O- 'http://www.qbittorrent.org/download.php' | \ @@ -17,13 +17,11 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # On Windows, GeoIP database must be embedded - cp '$(PREFIX)/$(BUILD)/share/GeoIP/GeoIP.dat' \ - '$(1)'/src/gui/geoip/GeoIP.dat cd '$(1)' && \ QMAKE_LRELEASE='$(PREFIX)/$(TARGET)/qt/bin/lrelease' \ ./configure \ $(MXE_CONFIGURE_OPTS) \ + --with-qt4=yes \ --with-boost='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' cp '$(1)'/src/release/qbittorrent.exe '$(PREFIX)/$(TARGET)/bin/' -- cgit v0.12 From b853064a34deb506cd09ba5ac4b6f368062ef0b4 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 5 Jan 2016 23:55:04 +0300 Subject: qbittorrent: import/export patch This commit was not ammended into previous commit to keep diff of previous commit simple. --- plugins/apps/qbittorrent-1-fixes.patch | 52 +++++++++++++++++----------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/plugins/apps/qbittorrent-1-fixes.patch b/plugins/apps/qbittorrent-1-fixes.patch index b2c7e6f..af1cb2a 100644 --- a/plugins/apps/qbittorrent-1-fixes.patch +++ b/plugins/apps/qbittorrent-1-fixes.patch @@ -18,7 +18,7 @@ diff --git a/configure b/configure index 1111111..2222222 100755 --- a/configure +++ b/configure -@@ -4540,7 +4540,7 @@ if eval \${$as_ac_File+:} false; then : +@@ -4500,7 +4500,7 @@ if eval \${$as_ac_File+:} false; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && @@ -74,24 +74,24 @@ index 1111111..2222222 100644 #include #include #endif // Q_OS_WIN -diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp +diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp index 1111111..2222222 100644 ---- a/src/base/utils/misc.cpp -+++ b/src/base/utils/misc.cpp -@@ -54,7 +54,7 @@ +--- a/src/base/bittorrent/torrenthandle.cpp ++++ b/src/base/bittorrent/torrenthandle.cpp +@@ -43,7 +43,7 @@ + #include #ifdef Q_OS_WIN - #include --#include -+#include - const int UNLEN = 256; - #else - #include +-#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 -@@ -46,7 +46,7 @@ +@@ -47,7 +47,7 @@ #endif #ifdef Q_OS_WIN @@ -100,19 +100,19 @@ index 1111111..2222222 100644 #include #endif -diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp -index de6ca9c..40b2498 100644 ---- a/src/base/bittorrent/torrenthandle.cpp -+++ b/src/base/bittorrent/torrenthandle.cpp -@@ -43,7 +43,7 @@ - #include +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 - #endif - - #include "base/logger.h" + #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 @@ -139,7 +139,7 @@ diff --git a/configure b/configure index 1111111..2222222 100755 --- a/configure +++ b/configure -@@ -8469,7 +8469,7 @@ fi +@@ -8345,7 +8345,7 @@ fi $as_echo "$as_me: Running qmake to generate the makefile..." >&6;} CONFDIR="$( cd "$( dirname "$0" )" && pwd )" @@ -152,7 +152,7 @@ diff --git a/winconf-mingw.pri b/winconf-mingw.pri index 1111111..2222222 100644 --- a/winconf-mingw.pri +++ b/winconf-mingw.pri -@@ -17,19 +17,8 @@ CONFIG(debug, debug|release) { +@@ -20,19 +20,8 @@ CONFIG(debug, debug|release) { RC_FILE = qbittorrent_mingw.rc @@ -194,7 +194,7 @@ index 1111111..2222222 100644 # LIBTORRENT DEFINES DEFINES += BOOST_ALL_NO_LIB DEFINES += BOOST_ASIO_HASH_MAP_BUCKETS=1021 -@@ -47,9 +38,4 @@ CONFIG(debug, debug|release) { +@@ -46,9 +37,4 @@ CONFIG(debug, debug|release) { # Enable backtrace support CONFIG += strace_win -- cgit v0.12