qbittorrent: update to 3.3.12
This commit is contained in:
parent
6844f1431c
commit
979a5dba00
2 changed files with 2 additions and 64 deletions
|
@ -1,62 +0,0 @@
|
||||||
--- src/base/bittorrent/session.cpp
|
|
||||||
+++ 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);
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'qbittorrent'
|
# Template file for 'qbittorrent'
|
||||||
pkgname=qbittorrent
|
pkgname=qbittorrent
|
||||||
version=3.3.11
|
version=3.3.12
|
||||||
revision=1
|
revision=1
|
||||||
build_style=qmake
|
build_style=qmake
|
||||||
hostmakedepends="automake libtool pkg-config qt5-qmake qt5-tools
|
hostmakedepends="automake libtool pkg-config qt5-qmake qt5-tools
|
||||||
|
@ -11,7 +11,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
|
||||||
license="GPL-2"
|
license="GPL-2"
|
||||||
homepage="http://www.qbittorrent.org/"
|
homepage="http://www.qbittorrent.org/"
|
||||||
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
|
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
|
||||||
checksum=4892ac5ed4bde2ed325fb67456698e703bb933b9eb1d146598259f4e2154a760
|
checksum=56528c47f09b316ecf682e3896157c76c18898ef996728b0c5186e05a711466f
|
||||||
nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/1349/steps/shell_3/logs/stdio
|
nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/1349/steps/shell_3/logs/stdio
|
||||||
|
|
||||||
build_options="gui webui"
|
build_options="gui webui"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue