| 1 |
commit: 116d6431c3830f6332bc67e1ec591fcbe6542bdc |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 31 04:22:03 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 31 04:22:03 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=116d6431 |
| 7 |
|
| 8 |
net-libs/libtorrent-rasterbar: add Boost 1.76(?) patch |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/820836 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../libtorrent-rasterbar-2.0.4-boost-1.76.patch | 58 ++++++++++++++++++++++ |
| 14 |
.../libtorrent-rasterbar-2.0.4-r3.ebuild | 1 + |
| 15 |
2 files changed, 59 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..5e8e04e940f |
| 20 |
--- /dev/null |
| 21 |
+++ b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.76.patch |
| 22 |
@@ -0,0 +1,58 @@ |
| 23 |
+https://github.com/paullouisageneau/boost-asio-gnutls/commit/895105972e5a9318d572b147c1872f64d23e2a8e |
| 24 |
+https://bugs.gentoo.org/820836 |
| 25 |
+ |
| 26 |
+From 895105972e5a9318d572b147c1872f64d23e2a8e Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Shantanu Singh <shsi@×××××××××.com> |
| 28 |
+Date: Fri, 18 Sep 2020 14:01:39 -0700 |
| 29 |
+Subject: [PATCH] Use fully qualified std::placeholders to prevent conflicts |
| 30 |
+ with boost::placeholders |
| 31 |
+ |
| 32 |
+--- a/deps/asio-gnutls/include/boost/asio/gnutls/stream.hpp |
| 33 |
++++ b/deps/asio-gnutls/include/boost/asio/gnutls/stream.hpp |
| 34 |
+@@ -244,8 +244,7 @@ template <typename NextLayer> class stream : public stream_base |
| 35 |
+ return; |
| 36 |
+ } |
| 37 |
+ |
| 38 |
+- using namespace std::placeholders; |
| 39 |
+- m_impl->read_handler = std::bind(callable, _1, _2); |
| 40 |
++ m_impl->read_handler = std::bind(callable, std::placeholders::_1, std::placeholders::_2); |
| 41 |
+ m_impl->bytes_read = 0; |
| 42 |
+ m_impl->async_schedule(); |
| 43 |
+ return callable.get_completion_result(); |
| 44 |
+@@ -293,8 +292,7 @@ template <typename NextLayer> class stream : public stream_base |
| 45 |
+ return; |
| 46 |
+ } |
| 47 |
+ |
| 48 |
+- using namespace std::placeholders; |
| 49 |
+- m_impl->write_handler = std::bind(callable, _1, _2); |
| 50 |
++ m_impl->write_handler = std::bind(callable, std::placeholders::_1, std::placeholders::_2); |
| 51 |
+ m_impl->bytes_written = 0; |
| 52 |
+ m_impl->async_schedule(); |
| 53 |
+ return callable.get_completion_result(); |
| 54 |
+@@ -568,8 +566,6 @@ template <typename NextLayer> class stream : public stream_base |
| 55 |
+ |
| 56 |
+ void async_schedule() |
| 57 |
+ { |
| 58 |
+- using namespace std::placeholders; |
| 59 |
+- |
| 60 |
+ if (!parent) return; |
| 61 |
+ auto& next_layer = parent->m_next_layer; |
| 62 |
+ |
| 63 |
+@@ -581,14 +577,14 @@ template <typename NextLayer> class stream : public stream_base |
| 64 |
+ else |
| 65 |
+ next_layer.async_wait( |
| 66 |
+ next_layer_type::wait_read, |
| 67 |
+- std::bind(&impl::handle_read, this->shared_from_this(), _1)); |
| 68 |
++ std::bind(&impl::handle_read, this->shared_from_this(), std::placeholders::_1)); |
| 69 |
+ } |
| 70 |
+ |
| 71 |
+ // Start a write operation if GnuTLS wants one |
| 72 |
+ if (want_write() && !std::exchange(is_writing, true)) |
| 73 |
+ { |
| 74 |
+ next_layer.async_wait(next_layer_type::wait_write, |
| 75 |
+- std::bind(&impl::handle_write, this->shared_from_this(), _1)); |
| 76 |
++ std::bind(&impl::handle_write, this->shared_from_this(), std::placeholders::_1)); |
| 77 |
+ } |
| 78 |
+ } |
| 79 |
+ |
| 80 |
+ |
| 81 |
|
| 82 |
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r3.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r3.ebuild |
| 83 |
index 787c4093411..9dc9cb50370 100644 |
| 84 |
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r3.ebuild |
| 85 |
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r3.ebuild |
| 86 |
@@ -39,6 +39,7 @@ BDEPEND="python? ( |
| 87 |
)" |
| 88 |
|
| 89 |
PATCHES=( |
| 90 |
+ "${FILESDIR}"/${PN}-2.0.4-boost-1.76.patch |
| 91 |
"${FILESDIR}"/${P}-boost-1.77.patch |
| 92 |
) |
Archives