Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent-rasterbar/files/, net-libs/libtorrent-rasterbar/
Date: Fri, 27 Aug 2021 00:36:07
Message-Id: 1630024392.ac3234e6bb0e647c0bbdb98fd36c2aeb5d5b396d.sam@gentoo
1 commit: ac3234e6bb0e647c0bbdb98fd36c2aeb5d5b396d
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 27 00:32:44 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 27 00:33:12 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac3234e6
7
8 net-libs/libtorrent-rasterbar: fix Boost 1.77 compatibility
9
10 Revbumping because the patch seems a bit invasive
11 and also to fix DEPEND.
12
13 Closes: https://bugs.gentoo.org/808084
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 .../libtorrent-rasterbar-2.0.4-boost-1.77.patch | 37 ++++++++++++++++++++++
17 ...ebuild => libtorrent-rasterbar-2.0.4-r1.ebuild} | 6 +++-
18 2 files changed, 42 insertions(+), 1 deletion(-)
19
20 diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.77.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.77.patch
21 new file mode 100644
22 index 00000000000..b39f62614b2
23 --- /dev/null
24 +++ b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.77.patch
25 @@ -0,0 +1,37 @@
26 +https://github.com/arvidn/libtorrent/pull/6412
27 +https://github.com/arvidn/libtorrent/issues/6405
28 +https://bugs.gentoo.org/808084
29 +
30 +From 906cedddedbdf9d98ecf2bd19340f7f17869b968 Mon Sep 17 00:00:00 2001
31 +From: arvidn <arvid@××××××××××.org>
32 +Date: Thu, 19 Aug 2021 11:54:13 +0200
33 +Subject: [PATCH] bump handler allocation sizes for boost-1.77 (linux)
34 +
35 +---
36 + include/libtorrent/aux_/allocating_handler.hpp | 10 +++++-----
37 + 1 file changed, 5 insertions(+), 5 deletions(-)
38 +
39 +diff --git a/include/libtorrent/aux_/allocating_handler.hpp b/include/libtorrent/aux_/allocating_handler.hpp
40 +index 9d826d11a1..b24349850e 100644
41 +--- a/include/libtorrent/aux_/allocating_handler.hpp
42 ++++ b/include/libtorrent/aux_/allocating_handler.hpp
43 +@@ -122,14 +122,14 @@ namespace libtorrent { namespace aux {
44 + constexpr std::size_t fuzzer_write_cost = 0;
45 + constexpr std::size_t fuzzer_read_cost = 0;
46 + #endif
47 +- constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 152;
48 +- constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 152;
49 +- constexpr std::size_t udp_handler_max_size = tracking + 144;
50 +- constexpr std::size_t utp_handler_max_size = tracking + 168;
51 ++ constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 168;
52 ++ constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 168;
53 ++ constexpr std::size_t udp_handler_max_size = tracking + 160;
54 ++ constexpr std::size_t utp_handler_max_size = tracking + 184;
55 + constexpr std::size_t abort_handler_max_size = tracking + 72;
56 + constexpr std::size_t submit_handler_max_size = tracking + 72;
57 + constexpr std::size_t deferred_handler_max_size = tracking + 80;
58 +- constexpr std::size_t tick_handler_max_size = tracking + 112;
59 ++ constexpr std::size_t tick_handler_max_size = tracking + 128;
60 + #endif
61 +
62 + enum HandlerName
63
64 diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r1.ebuild
65 similarity index 95%
66 rename from net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4.ebuild
67 rename to net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r1.ebuild
68 index 739fc3f8e91..127f26feb7f 100644
69 --- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4.ebuild
70 +++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r1.ebuild
71 @@ -19,6 +19,7 @@ IUSE="+dht debug gnutls python ssl test"
72 RESTRICT="!test? ( test ) test" # not yet fixed
73 RDEPEND="dev-libs/boost:=[threads(+)]"
74 DEPEND="
75 + ${RDEPEND}
76 python? (
77 ${PYTHON_DEPS}
78 $(python_gen_any_dep '
79 @@ -28,9 +29,12 @@ DEPEND="
80 gnutls? ( net-libs/gnutls:= )
81 !gnutls? ( dev-libs/openssl:= )
82 )
83 - ${DEPEND}
84 "
85
86 +PATCHES=(
87 + "${FILESDIR}"/${P}-boost-1.77.patch
88 +)
89 +
90 pkg_setup() {
91 use python && python-any-r1_pkg_setup
92 }