1 |
commit: 1b42af1f1038be9a2404bb01c49b6a74f765ab93 |
2 |
Author: James Beddek <telans <AT> posteo <DOT> de> |
3 |
AuthorDate: Sat Jun 19 23:19:13 2021 +0000 |
4 |
Commit: Theo Anderson <telans <AT> posteo <DOT> de> |
5 |
CommitDate: Sat Jun 19 23:19:32 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1b42af1f |
7 |
|
8 |
net-p2p/monero: fix build with boot-1.76 |
9 |
|
10 |
Signed-off-by: James Beddek <telans <AT> posteo.de> |
11 |
|
12 |
.../monero/files/monero-0.17.2.0-boost-176.patch | 24 ++++++++++++++++++++++ |
13 |
net-p2p/monero/monero-0.17.2.0.ebuild | 7 +++++-- |
14 |
2 files changed, 29 insertions(+), 2 deletions(-) |
15 |
|
16 |
diff --git a/net-p2p/monero/files/monero-0.17.2.0-boost-176.patch b/net-p2p/monero/files/monero-0.17.2.0-boost-176.patch |
17 |
new file mode 100644 |
18 |
index 000000000..07a584a39 |
19 |
--- /dev/null |
20 |
+++ b/net-p2p/monero/files/monero-0.17.2.0-boost-176.patch |
21 |
@@ -0,0 +1,24 @@ |
22 |
+From c28d2f7c110c0a2161fa02d6c20df94a60a41965 Mon Sep 17 00:00:00 2001 |
23 |
+From: loqs <loqs@××××××××××××××××××××.com> |
24 |
+Date: Sun, 23 May 2021 20:29:17 +0100 |
25 |
+Subject: [PATCH] Fix boost 1.76.0 compatibility |
26 |
+ |
27 |
+Add missing header boost/mpl/contains.hpp |
28 |
+monero-project/monero/issues/7728 |
29 |
+--- |
30 |
+ contrib/epee/include/storages/portable_storage.h | 2 ++ |
31 |
+ 1 file changed, 2 insertions(+) |
32 |
+ |
33 |
+diff --git a/contrib/epee/include/storages/portable_storage.h b/contrib/epee/include/storages/portable_storage.h |
34 |
+index 1e68605abf5..801bb2c3465 100644 |
35 |
+--- a/contrib/epee/include/storages/portable_storage.h |
36 |
++++ b/contrib/epee/include/storages/portable_storage.h |
37 |
+@@ -40,6 +40,8 @@ |
38 |
+ #include "span.h" |
39 |
+ #include "int-util.h" |
40 |
+ |
41 |
++#include <boost/mpl/contains.hpp> |
42 |
++ |
43 |
+ namespace epee |
44 |
+ { |
45 |
+ namespace serialization |
46 |
|
47 |
diff --git a/net-p2p/monero/monero-0.17.2.0.ebuild b/net-p2p/monero/monero-0.17.2.0.ebuild |
48 |
index e3b4ccfae..6107e459f 100644 |
49 |
--- a/net-p2p/monero/monero-0.17.2.0.ebuild |
50 |
+++ b/net-p2p/monero/monero-0.17.2.0.ebuild |
51 |
@@ -26,7 +26,7 @@ RESTRICT="test" |
52 |
DEPEND=" |
53 |
acct-group/monero |
54 |
acct-user/monero |
55 |
- <dev-libs/boost-1.76.0:=[nls,threads] |
56 |
+ dev-libs/boost:=[nls,threads] |
57 |
dev-libs/libsodium:= |
58 |
dev-libs/openssl:= |
59 |
dev-libs/randomx |
60 |
@@ -40,7 +40,10 @@ DEPEND=" |
61 |
RDEPEND="${DEPEND}" |
62 |
BDEPEND="virtual/pkgconfig" |
63 |
|
64 |
-PATCHES=( "${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch" ) |
65 |
+PATCHES=( |
66 |
+ "${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch" |
67 |
+ "${FILESDIR}/${PN}-0.17.2.0-boost-176.patch" |
68 |
+) |
69 |
|
70 |
src_configure() { |
71 |
local mycmakeargs=( |