Date: Monday, December 19, 2016 @ 11:02:48 Author: tredaelli Revision: 200293
archrelease: copy trunk to community-i686, community-x86_64 Added: qbittorrent/repos/community-i686/PKGBUILD (from rev 200292, qbittorrent/trunk/PKGBUILD) qbittorrent/repos/community-i686/qbittorrent-libtorrent-1.1.1.patch (from rev 200292, qbittorrent/trunk/qbittorrent-libtorrent-1.1.1.patch) qbittorrent/repos/community-i686/qbittorrent.service (from rev 200292, qbittorrent/trunk/qbittorrent.service) qbittorrent/repos/community-i686/qbittorrent@.service (from rev 200292, qbittorrent/trunk/qbittorrent@.service) qbittorrent/repos/community-x86_64/PKGBUILD (from rev 200292, qbittorrent/trunk/PKGBUILD) qbittorrent/repos/community-x86_64/qbittorrent-libtorrent-1.1.1.patch (from rev 200292, qbittorrent/trunk/qbittorrent-libtorrent-1.1.1.patch) qbittorrent/repos/community-x86_64/qbittorrent.service (from rev 200292, qbittorrent/trunk/qbittorrent.service) qbittorrent/repos/community-x86_64/qbittorrent@.service (from rev 200292, qbittorrent/trunk/qbittorrent@.service) Deleted: qbittorrent/repos/community-i686/PKGBUILD qbittorrent/repos/community-i686/qbittorrent.service qbittorrent/repos/community-i686/qbittorrent@.service qbittorrent/repos/community-x86_64/PKGBUILD qbittorrent/repos/community-x86_64/qbittorrent.service qbittorrent/repos/community-x86_64/qbittorrent@.service -----------------------------------------------------+ /PKGBUILD | 142 ++++++++++++++++++ /qbittorrent.service | 22 ++ /qbittorrent@.service | 24 +++ community-i686/PKGBUILD | 71 --------- community-i686/qbittorrent-libtorrent-1.1.1.patch | 61 +++++++ community-i686/qbittorrent.service | 11 - community-i686/qbittorrent@.service | 12 - community-x86_64/PKGBUILD | 71 --------- community-x86_64/qbittorrent-libtorrent-1.1.1.patch | 61 +++++++ community-x86_64/qbittorrent.service | 11 - community-x86_64/qbittorrent@.service | 12 - 11 files changed, 310 insertions(+), 188 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-12-19 11:02:42 UTC (rev 200292) +++ community-i686/PKGBUILD 2016-12-19 11:02:48 UTC (rev 200293) @@ -1,71 +0,0 @@ -# $Id$ -# Maintainer: Timothy Redaelli <timothy.redae...@gmail.com> -# Contributor: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG -# Contributor: Jkkyll Wu <adaptee at gmail [dot] com> -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> -# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr> - -pkgbase=qbittorrent -pkgname=(qbittorrent qbittorrent-nox) -pkgver=3.3.9 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.qbittorrent.org" -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=('dbe256921ff1d8c3868e868925de7417dd04d11b65b45ff4b032ff4096113162' - 'SKIP' - 'c7642755dbc72567e04326b362eb862a62fc225984934d08fd808727d3bd6578' - '8c5879673c66368ada97f6d70a1d8fe3b6a4995f79aab4fc6bf54fbdcbe811d0' - '12dfd06104eaf302b79328c8096248c051208f69348e33f7fb2e4a2fb49caa29') -validpgpkeys=('D8F3DA77AAC6741053599C136E4A2D025B7CC9A2') - -prepare() { - cd $pkgbase-$pkgver - - patch -Np1 -i "$srcdir/qbittorrent-libtorrent-1.1.1.patch" -} - -build() { - cd $pkgbase-$pkgver - - mkdir $pkgbase - pushd $pkgbase - ../configure --prefix=/usr - make - - # Build nox variant - popd - mkdir "$pkgbase-nox" - pushd "$pkgbase-nox" - ../configure --prefix=/usr --disable-gui -} - -package_qbittorrent() { - pkgdesc="An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar." - depends=('libtorrent-rasterbar' 'qt5-base' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils') - optdepends=('python: needed for torrent search tab') - - cd $pkgbase-$pkgver/$pkgbase - - make INSTALL_ROOT="$pkgdir/" install - install -Dm644 "$srcdir/$pkgbase-$pkgver/COPYING" "$pkgdir"/usr/share/licenses/$pkgname/COPYING -} - -package_qbittorrent-nox() { - pkgdesc="An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar, w/o gui" - depends=('libtorrent-rasterbar' 'qt5-base') - - cd $pkgbase-$pkgver/$pkgbase-nox - - make INSTALL_ROOT="$pkgdir/" install - install -Dm644 "$srcdir/$pkgbase-$pkgver/COPYING" "$pkgdir"/usr/share/licenses/$pkgname/COPYING - - install -Dm644 "$srcdir/qbittorrent.service" "$pkgdir/usr/lib/systemd/user/qbittorrent.service" - install -Dm644 "$srcdir/qbittorrent@.service" "$pkgdir/usr/lib/systemd/system/qbittorrent@.service" -} Copied: qbittorrent/repos/community-i686/PKGBUILD (from rev 200292, qbittorrent/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-12-19 11:02:48 UTC (rev 200293) @@ -0,0 +1,71 @@ +# $Id$ +# Maintainer: Timothy Redaelli <timothy.redae...@gmail.com> +# Contributor: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG +# Contributor: Jkkyll Wu <adaptee at gmail [dot] com> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> +# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr> + +pkgbase=qbittorrent +pkgname=(qbittorrent qbittorrent-nox) +pkgver=3.3.9 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.qbittorrent.org" +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=('dbe256921ff1d8c3868e868925de7417dd04d11b65b45ff4b032ff4096113162' + 'SKIP' + 'c7642755dbc72567e04326b362eb862a62fc225984934d08fd808727d3bd6578' + '8c5879673c66368ada97f6d70a1d8fe3b6a4995f79aab4fc6bf54fbdcbe811d0' + '12dfd06104eaf302b79328c8096248c051208f69348e33f7fb2e4a2fb49caa29') +validpgpkeys=('D8F3DA77AAC6741053599C136E4A2D025B7CC9A2') + +prepare() { + cd $pkgbase-$pkgver + + patch -Np1 -i "$srcdir/qbittorrent-libtorrent-1.1.1.patch" +} + +build() { + cd $pkgbase-$pkgver + + mkdir $pkgbase + pushd $pkgbase + ../configure --prefix=/usr + make + + # Build nox variant + popd + mkdir "$pkgbase-nox" + pushd "$pkgbase-nox" + ../configure --prefix=/usr --disable-gui +} + +package_qbittorrent() { + pkgdesc="An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar." + depends=('libtorrent-rasterbar' 'qt5-base' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils') + optdepends=('python: needed for torrent search tab') + + cd $pkgbase-$pkgver/$pkgbase + + make INSTALL_ROOT="$pkgdir/" install + install -Dm644 "$srcdir/$pkgbase-$pkgver/COPYING" "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} + +package_qbittorrent-nox() { + pkgdesc="An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar, w/o gui" + depends=('libtorrent-rasterbar' 'qt5-base') + + cd $pkgbase-$pkgver/$pkgbase-nox + + make INSTALL_ROOT="$pkgdir/" install + install -Dm644 "$srcdir/$pkgbase-$pkgver/COPYING" "$pkgdir"/usr/share/licenses/$pkgname/COPYING + + install -Dm644 "$srcdir/qbittorrent.service" "$pkgdir/usr/lib/systemd/user/qbittorrent.service" + install -Dm644 "$srcdir/qbittorrent@.service" "$pkgdir/usr/lib/systemd/system/qbittorrent@.service" +} Copied: qbittorrent/repos/community-i686/qbittorrent-libtorrent-1.1.1.patch (from rev 200292, qbittorrent/trunk/qbittorrent-libtorrent-1.1.1.patch) =================================================================== --- community-i686/qbittorrent-libtorrent-1.1.1.patch (rev 0) +++ community-i686/qbittorrent-libtorrent-1.1.1.patch 2016-12-19 11:02:48 UTC (rev 200293) @@ -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); Deleted: community-i686/qbittorrent.service =================================================================== --- community-i686/qbittorrent.service 2016-12-19 11:02:42 UTC (rev 200292) +++ community-i686/qbittorrent.service 2016-12-19 11:02:48 UTC (rev 200293) @@ -1,11 +0,0 @@ -[Unit] -Description=qbittorrent-nox Daemon -Documentation=https://github.com/qbittorrent/qBittorrent/wiki -After=network.target - -[Service] -Type=forking -ExecStart=/usr/bin/qbittorrent-nox --daemon --webui-port=8080 - -[Install] -WantedBy=default.target Copied: qbittorrent/repos/community-i686/qbittorrent.service (from rev 200292, qbittorrent/trunk/qbittorrent.service) =================================================================== --- community-i686/qbittorrent.service (rev 0) +++ community-i686/qbittorrent.service 2016-12-19 11:02:48 UTC (rev 200293) @@ -0,0 +1,11 @@ +[Unit] +Description=qbittorrent-nox Daemon +Documentation=https://github.com/qbittorrent/qBittorrent/wiki +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/qbittorrent-nox --daemon --webui-port=8080 + +[Install] +WantedBy=default.target Deleted: community-i686/qbittorrent@.service =================================================================== --- community-i686/qbittorrent@.service 2016-12-19 11:02:42 UTC (rev 200292) +++ community-i686/qbittorrent@.service 2016-12-19 11:02:48 UTC (rev 200293) @@ -1,12 +0,0 @@ -[Unit] -Description=qbittorrent-nox Daemon -Documentation=https://github.com/qbittorrent/qBittorrent/wiki -After=network.target - -[Service] -User=%i -Type=forking -ExecStart=/usr/bin/qbittorrent-nox --daemon --webui-port=8080 - -[Install] -WantedBy=multi-user.target Copied: qbittorrent/repos/community-i686/qbittorrent@.service (from rev 200292, qbittorrent/trunk/qbittorrent@.service) =================================================================== --- community-i686/qbittorrent@.service (rev 0) +++ community-i686/qbittorrent@.service 2016-12-19 11:02:48 UTC (rev 200293) @@ -0,0 +1,12 @@ +[Unit] +Description=qbittorrent-nox Daemon +Documentation=https://github.com/qbittorrent/qBittorrent/wiki +After=network.target + +[Service] +User=%i +Type=forking +ExecStart=/usr/bin/qbittorrent-nox --daemon --webui-port=8080 + +[Install] +WantedBy=multi-user.target Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-12-19 11:02:42 UTC (rev 200292) +++ community-x86_64/PKGBUILD 2016-12-19 11:02:48 UTC (rev 200293) @@ -1,71 +0,0 @@ -# $Id$ -# Maintainer: Timothy Redaelli <timothy.redae...@gmail.com> -# Contributor: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG -# Contributor: Jkkyll Wu <adaptee at gmail [dot] com> -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> -# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr> - -pkgbase=qbittorrent -pkgname=(qbittorrent qbittorrent-nox) -pkgver=3.3.9 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.qbittorrent.org" -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=('dbe256921ff1d8c3868e868925de7417dd04d11b65b45ff4b032ff4096113162' - 'SKIP' - 'c7642755dbc72567e04326b362eb862a62fc225984934d08fd808727d3bd6578' - '8c5879673c66368ada97f6d70a1d8fe3b6a4995f79aab4fc6bf54fbdcbe811d0' - '12dfd06104eaf302b79328c8096248c051208f69348e33f7fb2e4a2fb49caa29') -validpgpkeys=('D8F3DA77AAC6741053599C136E4A2D025B7CC9A2') - -prepare() { - cd $pkgbase-$pkgver - - patch -Np1 -i "$srcdir/qbittorrent-libtorrent-1.1.1.patch" -} - -build() { - cd $pkgbase-$pkgver - - mkdir $pkgbase - pushd $pkgbase - ../configure --prefix=/usr - make - - # Build nox variant - popd - mkdir "$pkgbase-nox" - pushd "$pkgbase-nox" - ../configure --prefix=/usr --disable-gui -} - -package_qbittorrent() { - pkgdesc="An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar." - depends=('libtorrent-rasterbar' 'qt5-base' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils') - optdepends=('python: needed for torrent search tab') - - cd $pkgbase-$pkgver/$pkgbase - - make INSTALL_ROOT="$pkgdir/" install - install -Dm644 "$srcdir/$pkgbase-$pkgver/COPYING" "$pkgdir"/usr/share/licenses/$pkgname/COPYING -} - -package_qbittorrent-nox() { - pkgdesc="An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar, w/o gui" - depends=('libtorrent-rasterbar' 'qt5-base') - - cd $pkgbase-$pkgver/$pkgbase-nox - - make INSTALL_ROOT="$pkgdir/" install - install -Dm644 "$srcdir/$pkgbase-$pkgver/COPYING" "$pkgdir"/usr/share/licenses/$pkgname/COPYING - - install -Dm644 "$srcdir/qbittorrent.service" "$pkgdir/usr/lib/systemd/user/qbittorrent.service" - install -Dm644 "$srcdir/qbittorrent@.service" "$pkgdir/usr/lib/systemd/system/qbittorrent@.service" -} Copied: qbittorrent/repos/community-x86_64/PKGBUILD (from rev 200292, qbittorrent/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-12-19 11:02:48 UTC (rev 200293) @@ -0,0 +1,71 @@ +# $Id$ +# Maintainer: Timothy Redaelli <timothy.redae...@gmail.com> +# Contributor: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG +# Contributor: Jkkyll Wu <adaptee at gmail [dot] com> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> +# Contributor: Geoffroy Carrier <geoffroy.carr...@koon.fr> + +pkgbase=qbittorrent +pkgname=(qbittorrent qbittorrent-nox) +pkgver=3.3.9 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.qbittorrent.org" +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=('dbe256921ff1d8c3868e868925de7417dd04d11b65b45ff4b032ff4096113162' + 'SKIP' + 'c7642755dbc72567e04326b362eb862a62fc225984934d08fd808727d3bd6578' + '8c5879673c66368ada97f6d70a1d8fe3b6a4995f79aab4fc6bf54fbdcbe811d0' + '12dfd06104eaf302b79328c8096248c051208f69348e33f7fb2e4a2fb49caa29') +validpgpkeys=('D8F3DA77AAC6741053599C136E4A2D025B7CC9A2') + +prepare() { + cd $pkgbase-$pkgver + + patch -Np1 -i "$srcdir/qbittorrent-libtorrent-1.1.1.patch" +} + +build() { + cd $pkgbase-$pkgver + + mkdir $pkgbase + pushd $pkgbase + ../configure --prefix=/usr + make + + # Build nox variant + popd + mkdir "$pkgbase-nox" + pushd "$pkgbase-nox" + ../configure --prefix=/usr --disable-gui +} + +package_qbittorrent() { + pkgdesc="An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar." + depends=('libtorrent-rasterbar' 'qt5-base' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils') + optdepends=('python: needed for torrent search tab') + + cd $pkgbase-$pkgver/$pkgbase + + make INSTALL_ROOT="$pkgdir/" install + install -Dm644 "$srcdir/$pkgbase-$pkgver/COPYING" "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} + +package_qbittorrent-nox() { + pkgdesc="An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar, w/o gui" + depends=('libtorrent-rasterbar' 'qt5-base') + + cd $pkgbase-$pkgver/$pkgbase-nox + + make INSTALL_ROOT="$pkgdir/" install + install -Dm644 "$srcdir/$pkgbase-$pkgver/COPYING" "$pkgdir"/usr/share/licenses/$pkgname/COPYING + + install -Dm644 "$srcdir/qbittorrent.service" "$pkgdir/usr/lib/systemd/user/qbittorrent.service" + install -Dm644 "$srcdir/qbittorrent@.service" "$pkgdir/usr/lib/systemd/system/qbittorrent@.service" +} Copied: qbittorrent/repos/community-x86_64/qbittorrent-libtorrent-1.1.1.patch (from rev 200292, qbittorrent/trunk/qbittorrent-libtorrent-1.1.1.patch) =================================================================== --- community-x86_64/qbittorrent-libtorrent-1.1.1.patch (rev 0) +++ community-x86_64/qbittorrent-libtorrent-1.1.1.patch 2016-12-19 11:02:48 UTC (rev 200293) @@ -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); Deleted: community-x86_64/qbittorrent.service =================================================================== --- community-x86_64/qbittorrent.service 2016-12-19 11:02:42 UTC (rev 200292) +++ community-x86_64/qbittorrent.service 2016-12-19 11:02:48 UTC (rev 200293) @@ -1,11 +0,0 @@ -[Unit] -Description=qbittorrent-nox Daemon -Documentation=https://github.com/qbittorrent/qBittorrent/wiki -After=network.target - -[Service] -Type=forking -ExecStart=/usr/bin/qbittorrent-nox --daemon --webui-port=8080 - -[Install] -WantedBy=default.target Copied: qbittorrent/repos/community-x86_64/qbittorrent.service (from rev 200292, qbittorrent/trunk/qbittorrent.service) =================================================================== --- community-x86_64/qbittorrent.service (rev 0) +++ community-x86_64/qbittorrent.service 2016-12-19 11:02:48 UTC (rev 200293) @@ -0,0 +1,11 @@ +[Unit] +Description=qbittorrent-nox Daemon +Documentation=https://github.com/qbittorrent/qBittorrent/wiki +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/qbittorrent-nox --daemon --webui-port=8080 + +[Install] +WantedBy=default.target Deleted: community-x86_64/qbittorrent@.service =================================================================== --- community-x86_64/qbittorrent@.service 2016-12-19 11:02:42 UTC (rev 200292) +++ community-x86_64/qbittorrent@.service 2016-12-19 11:02:48 UTC (rev 200293) @@ -1,12 +0,0 @@ -[Unit] -Description=qbittorrent-nox Daemon -Documentation=https://github.com/qbittorrent/qBittorrent/wiki -After=network.target - -[Service] -User=%i -Type=forking -ExecStart=/usr/bin/qbittorrent-nox --daemon --webui-port=8080 - -[Install] -WantedBy=multi-user.target Copied: qbittorrent/repos/community-x86_64/qbittorrent@.service (from rev 200292, qbittorrent/trunk/qbittorrent@.service) =================================================================== --- community-x86_64/qbittorrent@.service (rev 0) +++ community-x86_64/qbittorrent@.service 2016-12-19 11:02:48 UTC (rev 200293) @@ -0,0 +1,12 @@ +[Unit] +Description=qbittorrent-nox Daemon +Documentation=https://github.com/qbittorrent/qBittorrent/wiki +After=network.target + +[Service] +User=%i +Type=forking +ExecStart=/usr/bin/qbittorrent-nox --daemon --webui-port=8080 + +[Install] +WantedBy=multi-user.target