diff options
| -rw-r--r-- | net-p2p/monero/files/monero-0.18.1.2-include-deque.patch | 32 | ||||
| -rw-r--r-- | net-p2p/monero/files/monero-0.18.1.2-include-set.patch | 35 | ||||
| -rw-r--r-- | net-p2p/monero/monero-0.18.1.2.ebuild | 2 |
3 files changed, 69 insertions, 0 deletions
diff --git a/net-p2p/monero/files/monero-0.18.1.2-include-deque.patch b/net-p2p/monero/files/monero-0.18.1.2-include-deque.patch new file mode 100644 index 00000000..0d7b658c --- /dev/null +++ b/net-p2p/monero/files/monero-0.18.1.2-include-deque.patch @@ -0,0 +1,32 @@ +From d6e49361201970b68f4335e200995c5ab4050555 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin <bertrand@jacquin.bzh> +Date: Sat, 21 Jan 2023 03:27:57 +0000 +Subject: [PATCH] include deque + +boost 1.81.0 requires deque to be included directly: + + cd /var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2_build/src/common && /usr/sbin/x86_64-pc-linux-gnu-g++ -DAUTO_INITIALIZE_EASYLOGGINGPP -DBLOCKCHAIN_DB=DB_LMDB -DBOOST_ASIO_ENABLE_SEQUENTIAL_STRAND_ALLOCATION -DBUILD_TAG=amd64 -DDEFAULT_DB_TYPE=\"lmdb\" -DHAVE_EXPLICIT_BZERO -DHAVE_READLINE -DHAVE_STRPTIME -DPER_BLOCK_CHECKPOINT -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/external/rapidjson/include -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/external/easylogging++ -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/src -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/contrib/epee/include -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/external -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/external/supercop/include -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2_build/generated_include -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2_build/translations -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/external/db_drivers/liblmdb -march=native -O2 -pipe -fomit-frame-pointer -DUSE_EXTRA_EC_CERT -pthread -maes -march=native -fno-strict-aliasing -D_GNU_SOURCE -Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized -Wlogical-op -Wno-error=maybe-uninitialized -Wno-error=cpp -Wno-reorder -Wno-missing-field-initializers -fPIC -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -Wformat -Wformat-security -fstack-protector -fstack-protector-strong -fcf-protection=full -fstack-clash-protection -Werror=switch -Werror=return-type -fno-strict-aliasing -ftemplate-depth=900 -DNDEBUG -Ofast -std=c++14 -MD -MT src/common/CMakeFiles/obj_common.dir/dns_utils.cpp.o -MF CMakeFiles/obj_common.dir/dns_utils.cpp.o.d -o CMakeFiles/obj_common.dir/dns_utils.cpp.o -c /var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/src/common/dns_utils.cpp + In file included from /var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/src/common/dns_utils.cpp:35: + /var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/src/common/threadpool.h:96:10: error: 'deque' in namespace 'std' does not name a template type + 96 | std::deque<entry> queue; + | ^~~~~ + /var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/src/common/threadpool.h:33:1: note: 'std::deque' is defined in header '<deque>'; did you forget to '#include <deque>'? + 32 | #include <boost/thread/thread.hpp> + +++ |+#include <deque> + 33 | #include <cstddef> +--- + src/common/threadpool.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/common/threadpool.h b/src/common/threadpool.h +index 53421e18b30d..ec9d3e54fbe4 100644 +--- a/src/common/threadpool.h ++++ b/src/common/threadpool.h +@@ -30,6 +30,7 @@ + #include <boost/thread/condition_variable.hpp> + #include <boost/thread/mutex.hpp> + #include <boost/thread/thread.hpp> ++#include <deque> + #include <cstddef> + #include <functional> + #include <utility> diff --git a/net-p2p/monero/files/monero-0.18.1.2-include-set.patch b/net-p2p/monero/files/monero-0.18.1.2-include-set.patch new file mode 100644 index 00000000..52d2b094 --- /dev/null +++ b/net-p2p/monero/files/monero-0.18.1.2-include-set.patch @@ -0,0 +1,35 @@ +From d918271cd10cca0b8ab3ae7190753e708c64f31d Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin <bertrand@jacquin.bzh> +Date: Sat, 21 Jan 2023 03:27:57 +0000 +Subject: [PATCH] include set +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +boost 1.81.0 requires set to be included directly: + + cd /var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2_build/src/common && /usr/sbin/x86_64-pc-linux-gnu-g++ -DAUTO_INITIALIZE_EASYLOGGINGPP -DBLOCKCHAIN_DB=DB_LMDB -DBOOST_ASIO_ENABLE_SEQUENTIAL_STRAND_ALLOCATION -DBUILD_TAG=amd64 -DDEFAULT_DB_TYPE=\"lmdb\" -DDEVICE_TREZOR_READY=1 -DHAVE_EXPLICIT_BZERO -DHAVE_HIDAPI -DHAVE_READLINE -DHAVE_STRPTIME -DHAVE_TREZOR_LIBUSB=1 -DPER_BLOCK_CHECKPOINT -DPROTOBUF_INLINE_NOT_IN_HEADERS=0 -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/external/rapidjson/include -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/external/easylogging++ -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/src -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/contrib/epee/include -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/external -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/external/supercop/include -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2_build/generated_include -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2_build/translations -I/var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/external/db_drivers/liblmdb -I/usr/include/hidapi -I/usr/include/libusb-1.0 -march=native -O2 -pipe -fomit-frame-pointer -DUSE_EXTRA_EC_CERT -pthread -maes -march=native -fno-strict-aliasing -D_GNU_SOURCE -Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized -Wlogical-op -Wno-error=maybe-uninitialized -Wno-error=cpp -Wno-reorder -Wno-missing-field-initializers -fPIC -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -Wformat -Wformat-security -fstack-protector -fstack-protector-strong -fcf-protection=full -fstack-clash-protection -Werror=switch -Werror=return-type -fno-strict-aliasing -ftemplate-depth=900 -DNDEBUG -Ofast -std=c++14 -MD -MT src/common/CMakeFiles/obj_common.dir/dns_utils.cpp.o -MF CMakeFiles/obj_common.dir/dns_utils.cpp.o.d -o CMakeFiles/obj_common.dir/dns_utils.cpp.o -c /var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/src/common/dns_utils.cpp + /var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/src/common/dns_utils.cpp: In function ‘bool tools::dns_utils::load_txt_records_from_dns(std::vector<std::__cxx11::basic_string<char> >&, const std::vector<std::__cxx11::basic_string<char> >&)’: + /var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/src/common/dns_utils.cpp:517:20: error: ‘set’ is not a member of ‘std’ + 517 | std::vector<std::set<std::string> > records; + | ^~~ + /var/tmp/portage/net-p2p/monero-0.18.1.2/work/monero-0.18.1.2/src/common/dns_utils.cpp:39:1: note: ‘std::set’ is defined in header ‘<set>’; did you forget to ‘#include <set>’? + 38 | #include <boost/algorithm/string/join.hpp> + +++ |+#include <set> + 39 | #include <boost/optional.hpp> +--- + src/common/dns_utils.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp +index 7bb1781d4772..395081d52de2 100644 +--- a/src/common/dns_utils.cpp ++++ b/src/common/dns_utils.cpp +@@ -36,6 +36,7 @@ + #include "crypto/crypto.h" + #include <boost/thread/mutex.hpp> + #include <boost/algorithm/string/join.hpp> ++#include <set> + #include <boost/optional.hpp> + #include <boost/utility/string_ref.hpp> + using namespace epee; diff --git a/net-p2p/monero/monero-0.18.1.2.ebuild b/net-p2p/monero/monero-0.18.1.2.ebuild index 92ad9451..7aed0e43 100644 --- a/net-p2p/monero/monero-0.18.1.2.ebuild +++ b/net-p2p/monero/monero-0.18.1.2.ebuild @@ -73,6 +73,8 @@ PATCHES_MONERO=( "${FILESDIR}/monero-${PV}-Use-gentoo-versioning.patch" "${FILESDIR}/monero-${PV}-Use-gentoo-dev-libs-randomx.patch" "${FILESDIR}/monero-${PV}-translations-use-host-compiler.patch" + "${FILESDIR}/monero-${PV}-include-deque.patch" + "${FILESDIR}/monero-${PV}-include-set.patch" ) PATCHES_MONERO_GUI=( |