Attachment 178285 Details for Bug 215575 – update net-p2p/qbittorrent to 3.3.10

[patch] update net-p2p/qbittorrent to 3.3.10

net-p2p_qbittorrent.patch (text/plain), 4.32 KB, created by Matthew Rezny on 2016-12-26 11:40:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Rezny

Created: 2016-12-26 11:40:40 UTC

Size: 4.32 KB

patch

obsolete

>Index: net-p2p/qbittorrent/Makefile
>===================================================================
>--- net-p2p/qbittorrent/Makefile	(revision 429358)
>+++ net-p2p/qbittorrent/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	qbittorrent
>-PORTVERSION=	3.3.7
>-PORTREVISION=	1
>+PORTVERSION=	3.3.10
> CATEGORIES=	net-p2p ipv6
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
> 
>Index: net-p2p/qbittorrent/distinfo
>===================================================================
>--- net-p2p/qbittorrent/distinfo	(revision 429358)
>+++ net-p2p/qbittorrent/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1473733537
>-SHA256 (qbittorrent-3.3.7.tar.xz) = 72dc824a90fadc0825e6be6f1c215e38f976262c7f83b625061d542b2b664c40
>-SIZE (qbittorrent-3.3.7.tar.xz) = 2884792
>+TIMESTAMP = 1482707995
>+SHA256 (qbittorrent-3.3.10.tar.xz) = 2c657ceacdc84033da044a0a9ecba7e0fdb35858324dc097546f989166f1a8d2
>+SIZE (qbittorrent-3.3.10.tar.xz) = 2959380
>Index: net-p2p/qbittorrent/files/patch-src_base_bittorrent_session.cpp
>===================================================================
>--- net-p2p/qbittorrent/files/patch-src_base_bittorrent_session.cpp	(nonexistent)
>+++ net-p2p/qbittorrent/files/patch-src_base_bittorrent_session.cpp	(working copy)
>@@ -0,0 +1,64 @@
>+Revert the following commit until libtorrent 1.1.2 is released:
>+
>+From 729c80f9104a3d01ec724351bd6910b4b8d14c6c Mon Sep 17 00:00:00 2001
>+From: sledgehammer999 <hammered999@gmail.com>
>+Date: Mon, 31 Oct 2016 02:31:56 +0200
>+Subject: [PATCH] Use new libtorrent 1.1.2+ utility function to generate client
>+ ID instead.
>+
>+--- src/base/bittorrent/session.cpp.orig	2016-12-17 18:02:06 UTC
>++++ src/base/bittorrent/session.cpp
>+@@ -45,6 +45,7 @@
>+ #include <QTimer>
>+ 
>+ #include <cstdlib>
>++#include <sstream>
>+ #include <queue>
>+ #include <vector>
>+ 
>+@@ -194,6 +195,36 @@ namespace
>+ 
>+     template <typename T>
>+     LowerLimited<T> lowerLimited(T limit, T ret) { return LowerLimited<T>(limit, ret); }
>++
>++#if LIBTORRENT_VERSION_NUM >= 10100
>++    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 +365,7 @@ Session::Session(QObject *parent)
>+         dispatchAlerts(alertPtr.release());
>+     });
>+ #else
>+-    std::string peerId = libt::generate_fingerprint(PEER_ID, VERSION_MAJOR, VERSION_MINOR, VERSION_BUGFIX, VERSION_BUILD);
>++    std::string peerId = makeFingerprint(PEER_ID, VERSION_MAJOR, VERSION_MINOR, VERSION_BUGFIX, VERSION_BUILD);
>+     libt::settings_pack pack;
>+     pack.set_int(libt::settings_pack::alert_mask, alertMask);
>+     pack.set_str(libt::settings_pack::peer_fingerprint, peerId);
>
>Property changes on: net-p2p/qbittorrent/files/patch-src_base_bittorrent_session.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp
>===================================================================
>--- net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp	(revision 429358)
>+++ net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp	(working copy)
>@@ -1,4 +1,6 @@
>---- src/base/utils/string.cpp.orig	2016-09-23 15:05:18 UTC
>+Avoid use of thread local storage on versions prior to which it was supported.
>+
>+--- src/base/utils/string.cpp.orig	2016-12-17 18:02:06 UTC
> +++ src/base/utils/string.cpp
> @@ -37,7 +37,7 @@
>  #ifdef QBT_USES_QT5

Actions: View | Diff

Attachments on bug 215575: 178285