diff options
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 9 | ||||
-rw-r--r-- | qbittorrent-libtorrent-1.1.1.patch | 61 |
3 files changed, 4 insertions, 70 deletions
@@ -1,6 +1,6 @@ pkgbase = qbittorrent-nogui-git pkgdesc = Bittorrent client based on libtorrent-rasterbar (without X support) - pkgver = .7189 + pkgver = .7653 pkgrel = 1 url = http://www.qbittorrent.org/ arch = i686 @@ -14,11 +14,9 @@ pkgbase = qbittorrent-nogui-git source = git://github.com/qbittorrent/qBittorrent.git source = qbittorrent.service source = qbittorrent@.service - source = qbittorrent-libtorrent-1.1.1.patch md5sums = SKIP md5sums = 98ac5dd1f2a5ab78ece106ac2df1ec1c md5sums = 375b80818026e6cdd586fca37379b0ab - md5sums = 1da24b5e84f642a2f2790a77e36d496c pkgname = qbittorrent-nogui-git @@ -2,7 +2,7 @@ #Contributor: Martin Villagra <mvillagra0@gmail.com> pkgname=qbittorrent-nogui-git -pkgver=.7189 +pkgver=.7653 pkgrel=1 pkgdesc="Bittorrent client based on libtorrent-rasterbar (without X support)" arch=('i686' 'x86_64') @@ -13,12 +13,10 @@ makedepends=('boost' 'qt5-tools') conflicts=('qbittorrent-nogui') source=("git://github.com/qbittorrent/qBittorrent.git" "qbittorrent.service" - "qbittorrent@.service" - "qbittorrent-libtorrent-1.1.1.patch") + "qbittorrent@.service") md5sums=('SKIP' '98ac5dd1f2a5ab78ece106ac2df1ec1c' - '375b80818026e6cdd586fca37379b0ab' - '1da24b5e84f642a2f2790a77e36d496c') + '375b80818026e6cdd586fca37379b0ab') pkgver() { cd ${srcdir}/qBittorrent @@ -35,7 +33,6 @@ if [[ -d ${srcdir}/build ]]; then build() { cd ${srcdir}/build - patch -Np1 -i "$srcdir/qbittorrent-libtorrent-1.1.1.patch" ./configure --prefix=/usr --disable-gui make } diff --git a/qbittorrent-libtorrent-1.1.1.patch b/qbittorrent-libtorrent-1.1.1.patch deleted file mode 100644 index 237835f0597f..000000000000 --- a/qbittorrent-libtorrent-1.1.1.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- a/src/base/bittorrent/session.cpp -+++ b/src/base/bittorrent/session.cpp -@@ -45,6 +45,9 @@ - #include <QTimer> - - #include <cstdlib> -+#if LIBTORRENT_VERSION_NUM >= 10100 && LIBTORRENT_VERSION_NUM < 10102 -+#include <sstream> -+#endif - #include <queue> - #include <vector> - -@@ -194,6 +197,36 @@ namespace - - template <typename T> - LowerLimited<T> lowerLimited(T limit, T ret) { return LowerLimited<T>(limit, ret); } -+ -+#if LIBTORRENT_VERSION_NUM >= 10100 && LIBTORRENT_VERSION_NUM < 10102 -+ std::string makeFingerprint(const char* peerId, int major, int minor, int revision, int tag) -+ { -+ Q_ASSERT(peerId); -+ Q_ASSERT(major >= 0); -+ Q_ASSERT(minor >= 0); -+ Q_ASSERT(revision >= 0); -+ Q_ASSERT(tag >= 0); -+ Q_ASSERT(std::strlen(peerId) == 2); -+ -+ auto versionToChar = [](int v) -> char -+ { -+ if (v >= 0 && v < 10) return static_cast<char>('0' + v); -+ if (v >= 10) return static_cast<char>('A' + (v - 10)); -+ Q_ASSERT(false); -+ return '0'; -+ }; -+ -+ std::ostringstream buf; -+ buf << '-' -+ << peerId -+ << versionToChar(major) -+ << versionToChar(minor) -+ << versionToChar(revision) -+ << versionToChar(tag) -+ << '-'; -+ return buf.str(); -+ } -+#endif - } - - // Session -@@ -334,7 +367,11 @@ Session::Session(QObject *parent) - dispatchAlerts(alertPtr.release()); - }); - #else -+#if LIBTORRENT_VERSION_NUM < 10102 -+ std::string peerId = makeFingerprint(PEER_ID, VERSION_MAJOR, VERSION_MINOR, VERSION_BUGFIX, VERSION_BUILD); -+#else - std::string peerId = libt::generate_fingerprint(PEER_ID, VERSION_MAJOR, VERSION_MINOR, VERSION_BUGFIX, VERSION_BUILD); -+#endif - libt::settings_pack pack; - pack.set_int(libt::settings_pack::alert_mask, alertMask); - pack.set_str(libt::settings_pack::peer_fingerprint, peerId); |