Date: Saturday, May 20, 2017 @ 10:23:14 Author: arojas Revision: 228764
boost 1.64 rebuild Modified: qbittorrent/trunk/PKGBUILD Deleted: qbittorrent/trunk/qbittorrent-libtorrent-1.1.1.patch ------------------------------------+ PKGBUILD | 12 +----- qbittorrent-libtorrent-1.1.1.patch | 61 ----------------------------------- 2 files changed, 2 insertions(+), 71 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-05-20 10:00:28 UTC (rev 228763) +++ PKGBUILD 2017-05-20 10:23:14 UTC (rev 228764) @@ -8,7 +8,7 @@ pkgbase=qbittorrent pkgname=(qbittorrent qbittorrent-nox) -pkgver=3.3.11 +pkgver=3.3.12 pkgrel=1 arch=('i686' 'x86_64') url="http://www.qbittorrent.org" @@ -15,22 +15,14 @@ license=('custom' 'GPL') makedepends=('libtorrent-rasterbar' 'qt5-base' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'boost' 'qt5-tools') source=(http://downloads.sourceforge.net/sourceforge/qbittorrent/$pkgname-$pkgver.tar.xz{,.asc} - 'qbittorrent-libtorrent-1.1.1.patch' 'qbittorrent.service' 'qbittorrent@.service') -sha256sums=('4892ac5ed4bde2ed325fb67456698e703bb933b9eb1d146598259f4e2154a760' +sha256sums=('56528c47f09b316ecf682e3896157c76c18898ef996728b0c5186e05a711466f' 'SKIP' - 'c7642755dbc72567e04326b362eb862a62fc225984934d08fd808727d3bd6578' '8c5879673c66368ada97f6d70a1d8fe3b6a4995f79aab4fc6bf54fbdcbe811d0' '12dfd06104eaf302b79328c8096248c051208f69348e33f7fb2e4a2fb49caa29') validpgpkeys=('D8F3DA77AAC6741053599C136E4A2D025B7CC9A2') -prepare() { - cd $pkgbase-$pkgver - - patch -Np1 -i "$srcdir/qbittorrent-libtorrent-1.1.1.patch" -} - build() { cd $pkgbase-$pkgver Deleted: qbittorrent-libtorrent-1.1.1.patch =================================================================== --- qbittorrent-libtorrent-1.1.1.patch 2017-05-20 10:00:28 UTC (rev 228763) +++ qbittorrent-libtorrent-1.1.1.patch 2017-05-20 10:23:14 UTC (rev 228764) @@ -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);