diff options
Diffstat (limited to 'plugins/apps/qbittorrent-1-fixes.patch')
| -rw-r--r-- | plugins/apps/qbittorrent-1-fixes.patch | 99 |
1 files changed, 43 insertions, 56 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 <bnagaev@gmail.com> @@ -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 <Windows.h> +#include <windows.h> #include <QSharedMemory> #include <QSessionManager> #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 <unistd.h> -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 <winreg.h> #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 <string.h> - #ifdef Q_OS_WIN --#include <Winsock2.h> -+#include <winsock2.h> - #else - #include <arpa/inet.h> - #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 <libtorrent/entry.hpp> +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 <boost/bind.hpp> #ifdef Q_OS_WIN -#include <Windows.h> +#include <windows.h> #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 <bnagaev@gmail.com> -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 <bnagaev@gmail.com> 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.") |