diff --git a/srcpkgs/qbittorrent/patches/libtorrent-1.1.1.patch b/srcpkgs/qbittorrent/patches/libtorrent-1.1.1.patch deleted file mode 100644 index 7d26c8d347..0000000000 --- a/srcpkgs/qbittorrent/patches/libtorrent-1.1.1.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- src/base/bittorrent/session.cpp -+++ src/base/bittorrent/session.cpp -@@ -45,6 +45,9 @@ - #include - - #include -+#if LIBTORRENT_VERSION_NUM >= 10100 && LIBTORRENT_VERSION_NUM < 10102 -+#include -+#endif - #include - #include - -@@ -194,6 +197,36 @@ namespace - - template - LowerLimited lowerLimited(T limit, T ret) { return LowerLimited(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('0' + v); -+ if (v >= 10) return static_cast('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); - diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template index a5a5b166ef..b0eca1247c 100644 --- a/srcpkgs/qbittorrent/template +++ b/srcpkgs/qbittorrent/template @@ -1,6 +1,6 @@ # Template file for 'qbittorrent' pkgname=qbittorrent -version=3.3.11 +version=3.3.12 revision=1 build_style=qmake hostmakedepends="automake libtool pkg-config qt5-qmake qt5-tools @@ -11,7 +11,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="http://www.qbittorrent.org/" 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 build_options="gui webui"