public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Theo Anderson" <telans@posteo.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/monero/files/, net-p2p/monero/
Date: Sat, 19 Jun 2021 23:19:42 +0000 (UTC)	[thread overview]
Message-ID: <1624144772.1b42af1f1038be9a2404bb01c49b6a74f765ab93.telans@gentoo> (raw)

commit:     1b42af1f1038be9a2404bb01c49b6a74f765ab93
Author:     James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sat Jun 19 23:19:13 2021 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Sat Jun 19 23:19:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1b42af1f

net-p2p/monero: fix build with boot-1.76

Signed-off-by: James Beddek <telans <AT> posteo.de>

 .../monero/files/monero-0.17.2.0-boost-176.patch   | 24 ++++++++++++++++++++++
 net-p2p/monero/monero-0.17.2.0.ebuild              |  7 +++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

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
new file mode 100644
index 000000000..07a584a39
--- /dev/null
+++ b/net-p2p/monero/files/monero-0.17.2.0-boost-176.patch
@@ -0,0 +1,24 @@
+From c28d2f7c110c0a2161fa02d6c20df94a60a41965 Mon Sep 17 00:00:00 2001
+From: loqs <loqs@users.noreply.github.com>
+Date: Sun, 23 May 2021 20:29:17 +0100
+Subject: [PATCH] Fix boost 1.76.0 compatibility
+
+Add missing header boost/mpl/contains.hpp
+monero-project/monero/issues/7728
+---
+ contrib/epee/include/storages/portable_storage.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/contrib/epee/include/storages/portable_storage.h b/contrib/epee/include/storages/portable_storage.h
+index 1e68605abf5..801bb2c3465 100644
+--- a/contrib/epee/include/storages/portable_storage.h
++++ b/contrib/epee/include/storages/portable_storage.h
+@@ -40,6 +40,8 @@
+ #include "span.h"
+ #include "int-util.h"
+ 
++#include <boost/mpl/contains.hpp>
++
+ namespace epee
+ {
+   namespace serialization

diff --git a/net-p2p/monero/monero-0.17.2.0.ebuild b/net-p2p/monero/monero-0.17.2.0.ebuild
index e3b4ccfae..6107e459f 100644
--- a/net-p2p/monero/monero-0.17.2.0.ebuild
+++ b/net-p2p/monero/monero-0.17.2.0.ebuild
@@ -26,7 +26,7 @@ RESTRICT="test"
 DEPEND="
 	acct-group/monero
 	acct-user/monero
-	<dev-libs/boost-1.76.0:=[nls,threads]
+	dev-libs/boost:=[nls,threads]
 	dev-libs/libsodium:=
 	dev-libs/openssl:=
 	dev-libs/randomx
@@ -40,7 +40,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch"
+	"${FILESDIR}/${PN}-0.17.2.0-boost-176.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(


WARNING: multiple messages have this Message-ID (diff)
From: "Theo Anderson" <telans@posteo.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: net-p2p/monero/, net-p2p/monero/files/
Date: Sun, 20 Jun 2021 03:52:51 +0000 (UTC)	[thread overview]
Message-ID: <1624144772.1b42af1f1038be9a2404bb01c49b6a74f765ab93.telans@gentoo> (raw)
Message-ID: <20210620035251.pAAgkBc3Qsi_78IypvKC74xd7-ESc8fYEsrn05-93uE@z> (raw)

commit:     1b42af1f1038be9a2404bb01c49b6a74f765ab93
Author:     James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sat Jun 19 23:19:13 2021 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Sat Jun 19 23:19:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1b42af1f

net-p2p/monero: fix build with boot-1.76

Signed-off-by: James Beddek <telans <AT> posteo.de>

 .../monero/files/monero-0.17.2.0-boost-176.patch   | 24 ++++++++++++++++++++++
 net-p2p/monero/monero-0.17.2.0.ebuild              |  7 +++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

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
new file mode 100644
index 000000000..07a584a39
--- /dev/null
+++ b/net-p2p/monero/files/monero-0.17.2.0-boost-176.patch
@@ -0,0 +1,24 @@
+From c28d2f7c110c0a2161fa02d6c20df94a60a41965 Mon Sep 17 00:00:00 2001
+From: loqs <loqs@users.noreply.github.com>
+Date: Sun, 23 May 2021 20:29:17 +0100
+Subject: [PATCH] Fix boost 1.76.0 compatibility
+
+Add missing header boost/mpl/contains.hpp
+monero-project/monero/issues/7728
+---
+ contrib/epee/include/storages/portable_storage.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/contrib/epee/include/storages/portable_storage.h b/contrib/epee/include/storages/portable_storage.h
+index 1e68605abf5..801bb2c3465 100644
+--- a/contrib/epee/include/storages/portable_storage.h
++++ b/contrib/epee/include/storages/portable_storage.h
+@@ -40,6 +40,8 @@
+ #include "span.h"
+ #include "int-util.h"
+ 
++#include <boost/mpl/contains.hpp>
++
+ namespace epee
+ {
+   namespace serialization

diff --git a/net-p2p/monero/monero-0.17.2.0.ebuild b/net-p2p/monero/monero-0.17.2.0.ebuild
index e3b4ccfae..6107e459f 100644
--- a/net-p2p/monero/monero-0.17.2.0.ebuild
+++ b/net-p2p/monero/monero-0.17.2.0.ebuild
@@ -26,7 +26,7 @@ RESTRICT="test"
 DEPEND="
 	acct-group/monero
 	acct-user/monero
-	<dev-libs/boost-1.76.0:=[nls,threads]
+	dev-libs/boost:=[nls,threads]
 	dev-libs/libsodium:=
 	dev-libs/openssl:=
 	dev-libs/randomx
@@ -40,7 +40,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch"
+	"${FILESDIR}/${PN}-0.17.2.0-boost-176.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(


             reply	other threads:[~2021-06-19 23:19 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-19 23:19 Theo Anderson [this message]
2021-06-20  3:52 ` [gentoo-commits] repo/proj/guru:master commit in: net-p2p/monero/, net-p2p/monero/files/ Theo Anderson
  -- strict thread matches above, loose matches on Subject: below --
2025-03-30 23:33 [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/monero/files/, net-p2p/monero/ Sergey Alirzaev
2024-11-19 11:20 Sergey Alirzaev
2024-07-27  9:47 Filip Kobierski
2023-05-30 22:13 YiFei Zhu
2022-09-30 21:27 Efe İzbudak
2022-08-15 16:24 Sergey Alirzaev
2022-04-14 16:20 Dex Conner
2020-12-29 10:41 Theo Anderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1624144772.1b42af1f1038be9a2404bb01c49b6a74f765ab93.telans@gentoo \
    --to=telans@posteo.de \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox