Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cdb01d9d1f4ddc0bc4b72ad996b20a693dd55b21
commit cdb01d9d1f4ddc0bc4b72ad996b20a693dd55b21 Author: DeX77 <[email protected]> Date: Fri Dec 23 21:12:51 2016 +0100 qbittorrent-3.3.10-1-x86_64 * version bump diff --git a/source/xapps-extra/qbittorrent/FrugalBuild b/source/xapps-extra/qbittorrent/FrugalBuild index 1c08aaf..423dce5 100644 --- a/source/xapps-extra/qbittorrent/FrugalBuild +++ b/source/xapps-extra/qbittorrent/FrugalBuild @@ -3,18 +3,21 @@ # Contributor: centuri0 <achevaux at gmail dot com> pkgname=qbittorrent -pkgver=3.3.7 -pkgrel=2 +pkgver=3.3.10 +pkgrel=1 pkgdesc="A Bittorrent client." depends=('libtorrent-rasterbar>=1.1.1-2' 'qt5-base>=5.7.0-2' 'libboost>=1.61.0') rodepends=('geoip' 'python') makedepends=('boost>=1.60.0' 'qt5-tools') groups=('xapps-extra') -archs=('i686' 'x86_64') +archs=('x86_64') _F_gnome_iconcache="y" Finclude sourceforge url="http://www.$pkgname.org/"; -sha1sums=('837e5f0032641636dac397f64c11a8e3646ffba8') +source=("${source[@]}" \ + qbittorrent-libtorrent-1.1.1.patch ) +sha1sums=('73eb11afa3757e144ee6f1b03000cf2e1a531d4d' \ + '43ab2f48dcc1ab9fd5fcf3e3237b58d0dfff33c9') replaces=('libktorrent' 'ktorrent') provides=('libktorrent' 'ktorrent') diff --git a/source/xapps-extra/qbittorrent/qbittorrent-libtorrent-1.1.1.patch b/source/xapps-extra/qbittorrent/qbittorrent-libtorrent-1.1.1.patch new file mode 100644 index 0000000..237835f --- /dev/null +++ b/source/xapps-extra/qbittorrent/qbittorrent-libtorrent-1.1.1.patch @@ -0,0 +1,61 @@ +--- 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); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
