Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent-rasterbar/files/
Date: Sun, 05 Jun 2022 23:03:51
Message-Id: 1654470208.3b93e4975af1a82ddd87748b82cfca3e809cf64f.conikost@gentoo
1 commit: 3b93e4975af1a82ddd87748b82cfca3e809cf64f
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sat Jun 4 18:44:47 2022 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 5 23:03:28 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b93e497
7
8 net-libs/libtorrent-rasterbar: remove unused patches
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Closes: https://github.com/gentoo/gentoo/pull/25751
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 ...libtorrent-rasterbar-2.0.4-asio-ssl-error.patch | 31 ------------
16 .../libtorrent-rasterbar-2.0.4-boost-1.76.patch | 59 ----------------------
17 .../libtorrent-rasterbar-2.0.4-boost-1.77.patch | 37 --------------
18 ...libtorrent-rasterbar-2.0.4-python-symbols.patch | 28 ----------
19 4 files changed, 155 deletions(-)
20
21 diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-asio-ssl-error.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-asio-ssl-error.patch
22 deleted file mode 100644
23 index 5c4e90ff852d..000000000000
24 --- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-asio-ssl-error.patch
25 +++ /dev/null
26 @@ -1,31 +0,0 @@
27 -https://github.com/arvidn/libtorrent/pull/6547
28 -
29 -From 61ebb3317b1f8a63fcf4d018a21dac6818ea21cf Mon Sep 17 00:00:00 2001
30 -From: Sam James <sam@g.o>
31 -Date: Sun, 31 Oct 2021 09:16:46 +0000
32 -Subject: [PATCH] Add missing include for get_ssl_category
33 -
34 -error::get_ssl_category is defined in boost/asio/ssl/error.hpp, so
35 -include it when we're building with SSL support.
36 -
37 -Bug: https://bugs.gentoo.org/820836
38 -
39 ----
40 - bindings/python/src/error_code.cpp | 1 +
41 - 1 file changed, 1 insertion(+)
42 -
43 -diff --git a/bindings/python/src/error_code.cpp b/bindings/python/src/error_code.cpp
44 -index 2fc5f42..b947119 100644
45 ---- a/bindings/python/src/error_code.cpp
46 -+++ b/bindings/python/src/error_code.cpp
47 -@@ -49,6 +49,7 @@ namespace boost
48 -
49 - #include <boost/asio/error.hpp>
50 - #if TORRENT_USE_SSL
51 -+#include <boost/asio/ssl/error.hpp>
52 - #include <libtorrent/ssl.hpp>
53 - #endif
54 - #if TORRENT_USE_I2P
55 ---
56 -2.33.1
57 -
58
59 diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.76.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.76.patch
60 deleted file mode 100644
61 index a3cdd811e2a3..000000000000
62 --- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.76.patch
63 +++ /dev/null
64 @@ -1,59 +0,0 @@
65 -https://github.com/paullouisageneau/boost-asio-gnutls/commit/895105972e5a9318d572b147c1872f64d23e2a8e
66 -https://bugs.gentoo.org/820836
67 -https://github.com/arvidn/libtorrent/pull/6546
68 -
69 -From 895105972e5a9318d572b147c1872f64d23e2a8e Mon Sep 17 00:00:00 2001
70 -From: Shantanu Singh <shsi@×××××××××.com>
71 -Date: Fri, 18 Sep 2020 14:01:39 -0700
72 -Subject: [PATCH] Use fully qualified std::placeholders to prevent conflicts
73 - with boost::placeholders
74 -
75 ---- a/deps/asio-gnutls/include/boost/asio/gnutls/stream.hpp
76 -+++ b/deps/asio-gnutls/include/boost/asio/gnutls/stream.hpp
77 -@@ -244,8 +244,7 @@ template <typename NextLayer> class stream : public stream_base
78 - return;
79 - }
80 -
81 -- using namespace std::placeholders;
82 -- m_impl->read_handler = std::bind(callable, _1, _2);
83 -+ m_impl->read_handler = std::bind(callable, std::placeholders::_1, std::placeholders::_2);
84 - m_impl->bytes_read = 0;
85 - m_impl->async_schedule();
86 - return callable.get_completion_result();
87 -@@ -293,8 +292,7 @@ template <typename NextLayer> class stream : public stream_base
88 - return;
89 - }
90 -
91 -- using namespace std::placeholders;
92 -- m_impl->write_handler = std::bind(callable, _1, _2);
93 -+ m_impl->write_handler = std::bind(callable, std::placeholders::_1, std::placeholders::_2);
94 - m_impl->bytes_written = 0;
95 - m_impl->async_schedule();
96 - return callable.get_completion_result();
97 -@@ -568,8 +566,6 @@ template <typename NextLayer> class stream : public stream_base
98 -
99 - void async_schedule()
100 - {
101 -- using namespace std::placeholders;
102 --
103 - if (!parent) return;
104 - auto& next_layer = parent->m_next_layer;
105 -
106 -@@ -581,14 +577,14 @@ template <typename NextLayer> class stream : public stream_base
107 - else
108 - next_layer.async_wait(
109 - next_layer_type::wait_read,
110 -- std::bind(&impl::handle_read, this->shared_from_this(), _1));
111 -+ std::bind(&impl::handle_read, this->shared_from_this(), std::placeholders::_1));
112 - }
113 -
114 - // Start a write operation if GnuTLS wants one
115 - if (want_write() && !std::exchange(is_writing, true))
116 - {
117 - next_layer.async_wait(next_layer_type::wait_write,
118 -- std::bind(&impl::handle_write, this->shared_from_this(), _1));
119 -+ std::bind(&impl::handle_write, this->shared_from_this(), std::placeholders::_1));
120 - }
121 - }
122 -
123 -
124
125 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
126 deleted file mode 100644
127 index b39f62614b2a..000000000000
128 --- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.77.patch
129 +++ /dev/null
130 @@ -1,37 +0,0 @@
131 -https://github.com/arvidn/libtorrent/pull/6412
132 -https://github.com/arvidn/libtorrent/issues/6405
133 -https://bugs.gentoo.org/808084
134 -
135 -From 906cedddedbdf9d98ecf2bd19340f7f17869b968 Mon Sep 17 00:00:00 2001
136 -From: arvidn <arvid@××××××××××.org>
137 -Date: Thu, 19 Aug 2021 11:54:13 +0200
138 -Subject: [PATCH] bump handler allocation sizes for boost-1.77 (linux)
139 -
140 ----
141 - include/libtorrent/aux_/allocating_handler.hpp | 10 +++++-----
142 - 1 file changed, 5 insertions(+), 5 deletions(-)
143 -
144 -diff --git a/include/libtorrent/aux_/allocating_handler.hpp b/include/libtorrent/aux_/allocating_handler.hpp
145 -index 9d826d11a1..b24349850e 100644
146 ---- a/include/libtorrent/aux_/allocating_handler.hpp
147 -+++ b/include/libtorrent/aux_/allocating_handler.hpp
148 -@@ -122,14 +122,14 @@ namespace libtorrent { namespace aux {
149 - constexpr std::size_t fuzzer_write_cost = 0;
150 - constexpr std::size_t fuzzer_read_cost = 0;
151 - #endif
152 -- constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 152;
153 -- constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 152;
154 -- constexpr std::size_t udp_handler_max_size = tracking + 144;
155 -- constexpr std::size_t utp_handler_max_size = tracking + 168;
156 -+ constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 168;
157 -+ constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 168;
158 -+ constexpr std::size_t udp_handler_max_size = tracking + 160;
159 -+ constexpr std::size_t utp_handler_max_size = tracking + 184;
160 - constexpr std::size_t abort_handler_max_size = tracking + 72;
161 - constexpr std::size_t submit_handler_max_size = tracking + 72;
162 - constexpr std::size_t deferred_handler_max_size = tracking + 80;
163 -- constexpr std::size_t tick_handler_max_size = tracking + 112;
164 -+ constexpr std::size_t tick_handler_max_size = tracking + 128;
165 - #endif
166 -
167 - enum HandlerName
168
169 diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-python-symbols.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-python-symbols.patch
170 deleted file mode 100644
171 index 109a6490af23..000000000000
172 --- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-python-symbols.patch
173 +++ /dev/null
174 @@ -1,28 +0,0 @@
175 -https://github.com/arvidn/libtorrent/commit/f2eefd327f1ca89b053eb1e5f4ed229efe52e47f
176 -https://bugs.gentoo.org/820518
177 -
178 -From: Nick Korotysh <kolchaprogrammer@××××.ru>
179 -Date: Fri, 25 Jun 2021 22:08:00 +0300
180 -Subject: [PATCH] added missed sources to Python bindings CMakeLists.txt
181 -
182 -fixes libtorrent loading module issues:
183 -libtorrent.cpython-39-x86_64-linux-gnu.so: undefined symbol: _Z16bind_sha256_hashv
184 ---- a/bindings/python/CMakeLists.txt
185 -+++ b/bindings/python/CMakeLists.txt
186 -@@ -49,6 +49,7 @@ Python3_add_library(python-libtorrent MODULE WITH_SOABI
187 - src/entry.cpp
188 - src/error_code.cpp
189 - src/fingerprint.cpp
190 -+ src/info_hash.cpp
191 - src/ip_filter.cpp
192 - src/magnet_uri.cpp
193 - src/module.cpp
194 -@@ -56,6 +57,7 @@ Python3_add_library(python-libtorrent MODULE WITH_SOABI
195 - src/session.cpp
196 - src/session_settings.cpp
197 - src/sha1_hash.cpp
198 -+ src/sha256_hash.cpp
199 - src/string.cpp
200 - src/torrent_handle.cpp
201 - src/torrent_info.cpp
202 -