diff options
| -rw-r--r-- | net-p2p/monero/Manifest | 4 | ||||
| -rw-r--r-- | net-p2p/monero/files/monero-0.18.2.0-Drop-in-tree-miniupnpc.patch (renamed from net-p2p/monero/files/monero-0.18.1.1-Drop-in-tree-miniupnpc.patch) | 0 | ||||
| -rw-r--r-- | net-p2p/monero/files/monero-0.18.2.0-Use-gentoo-dev-libs-randomx.patch (renamed from net-p2p/monero/files/monero-0.18.1.1-Use-gentoo-dev-libs-randomx.patch) | 0 | ||||
| -rw-r--r-- | net-p2p/monero/files/monero-0.18.2.0-Use-gentoo-versioning.patch (renamed from net-p2p/monero/files/monero-0.18.1.1-Use-gentoo-versioning.patch) | 0 | ||||
| -rw-r--r-- | net-p2p/monero/files/monero-0.18.2.0-include-deque.patch | 32 | ||||
| -rw-r--r-- | net-p2p/monero/files/monero-0.18.2.0-include-set.patch | 35 | ||||
| -rw-r--r-- | net-p2p/monero/files/monero-0.18.2.0-translations-use-host-compiler.patch (renamed from net-p2p/monero/files/monero-0.18.1.1-translations-use-host-compiler.patch) | 0 | ||||
| -rw-r--r-- | net-p2p/monero/files/monero-gui-0.18.2.0-cmake-use-gentoo-versioning.patch (renamed from net-p2p/monero/files/monero-gui-0.18.1.1-cmake-use-gentoo-versioning.patch) | 0 | ||||
| -rw-r--r-- | net-p2p/monero/monero-0.18.2.0.ebuild (renamed from net-p2p/monero/monero-0.18.1.1.ebuild) | 10 |
9 files changed, 72 insertions, 9 deletions
diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest index 16eaba3a..f52c8147 100644 --- a/net-p2p/monero/Manifest +++ b/net-p2p/monero/Manifest @@ -1,7 +1,7 @@ -DIST monero-0.18.1.1.tar.gz 11609864 BLAKE2B 45591a856d251b6d11dc9eac987852fc413bea3fd035c330218cbb2226636ed4284b69e016a0e4ad71e2976fbe8bd6a4bc1d48cca05a45722add068c56ae0d9e SHA512 71c7d1940a31943b5a01236ffd7760907a3e63c50e31efa04cbd75f90d65401ed367efc1a9685a45638df7bdabd158ab61ee94398e3ca8e6c998aeb779db2066 DIST monero-0.18.1.2.tar.gz 11609034 BLAKE2B 3186a1038e9dd8f204a506df28c526bf3e0e5f788ad2d6b512f02735162a479be3f46d309d4e6888f30f962d68ecaf269888c8c0b21a066cad78b3c06f8cfc83 SHA512 d112f34b2fe6720c324560dd523badb68f08d03183d4bbbe7e1aa95f641cde4a1c4fa4042f1d47f9920f799269cc9620150136ebbef6dd66fcd4df0336c0d7f3 -DIST monero-gui-0.18.1.1.tar.gz 5894036 BLAKE2B a6cbd3050e7f34519d60d993b26970a32328968b92c7c72cf22026bc03a95dab76fb255f62f9eb7775511689c07e089b6b96899ff2db058cd3ceb455c7e65d74 SHA512 2461f0773ed8d25ca72af335856ce9e3baf7d84f696f8031b4cdef73c23e063fe85a283a8e73b6898135adcf090415159dae22ecaa7e61e092a626e18c3b1b8f +DIST monero-0.18.2.0.tar.gz 11624875 BLAKE2B e8dc2e89c664cb218d900ce0803dd1716f1ee363bbddb232fbd22570818c9a9ca307df04808ffef1eb30ee6097fbe243f6977dfad181f57b9169f22d4819f145 SHA512 19625d8e6ee3e9f27ba06eb6027ef21571a2ae8261c9e32f6e74d2f7adf8c73e9dfe34516cd456426274c41ce941e1e5b7eba9f9d20492b99decbd9262aec434 DIST monero-gui-0.18.1.2.tar.gz 6359524 BLAKE2B f52cfca5d0e882536d485b7400df0577a906753466a1718097ed20f70d63b263d48f1e254afed3261436501377a791e2496f93bd335c54eae65d7b414d70c571 SHA512 ca1d5527b62a48858706d5c10a7ffd54ebbd2648bbda154107c4f4a2c4921cf50c0b5acb7197234fadefb0f495efa5494b353dec321350b449c44ac7557e9c31 +DIST monero-gui-0.18.2.0.tar.gz 6593513 BLAKE2B ddd959cb2e1393f42198cfa8cb85db316fce61bf985ab1c1e68451feac94bd60570ebff6641bb23f490f21be9cac563ca1b9b09f98478e10e792637162a255c0 SHA512 4da8594c0c9a069b0ebce9ab684224bcf35b6681c24127ac156175b70044793a09c21b10b5f07c1e3eb065f98773e7957e18e18e3f528ff3199c14df68f0762a DIST quirc-516d91a94d880ca1006fc1d57f318bdff8411f0d.tar.gz 42163 BLAKE2B 36f07063c376c51397958321e317c9f3a8718f192a16ade546add1b652a7252abeecebcb7c850b50b85c3b59b941456c4225a80aa301cdab5eb42c04e4725698 SHA512 30eb2905e03fd070ec160ad78bfba2ed973fe24fe63ab810bdb7bcec9e52da5ef042efbb50cce19fcfae13ffa531bcfb20421325e4a868856690d696f8e89eee DIST supercop-633500ad8c8759995049ccd022107d1fa8a1bbc9.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648 DIST trezor-common-028c9b2e95d83b4164748a12cfdc181f0dd11920.tar.gz 926880 BLAKE2B e2937f9e17fdf33e047084eec73bd4b75bb5e2a1ccb3ce03c9d731ddf2b93200f895de565c16913a0bb022e3662faa38777828912dc257124ea4196b23cc501c SHA512 d0fdc74dbcde444c852bf000123bc795d86a07993b79b18cc5cfb1535348059f3b7b5a4865892321c7ddc8a98be8f04e6cfbe224e7daae3aa292f40642afa609 diff --git a/net-p2p/monero/files/monero-0.18.1.1-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/monero-0.18.2.0-Drop-in-tree-miniupnpc.patch index 4959cf9c..4959cf9c 100644 --- a/net-p2p/monero/files/monero-0.18.1.1-Drop-in-tree-miniupnpc.patch +++ b/net-p2p/monero/files/monero-0.18.2.0-Drop-in-tree-miniupnpc.patch diff --git a/net-p2p/monero/files/monero-0.18.1.1-Use-gentoo-dev-libs-randomx.patch b/net-p2p/monero/files/monero-0.18.2.0-Use-gentoo-dev-libs-randomx.patch index 178e83ff..178e83ff 100644 --- a/net-p2p/monero/files/monero-0.18.1.1-Use-gentoo-dev-libs-randomx.patch +++ b/net-p2p/monero/files/monero-0.18.2.0-Use-gentoo-dev-libs-randomx.patch diff --git a/net-p2p/monero/files/monero-0.18.1.1-Use-gentoo-versioning.patch b/net-p2p/monero/files/monero-0.18.2.0-Use-gentoo-versioning.patch index c2c563e1..c2c563e1 100644 --- a/net-p2p/monero/files/monero-0.18.1.1-Use-gentoo-versioning.patch +++ b/net-p2p/monero/files/monero-0.18.2.0-Use-gentoo-versioning.patch diff --git a/net-p2p/monero/files/monero-0.18.2.0-include-deque.patch b/net-p2p/monero/files/monero-0.18.2.0-include-deque.patch new file mode 100644 index 00000000..0d7b658c --- /dev/null +++ b/net-p2p/monero/files/monero-0.18.2.0-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.2.0-include-set.patch b/net-p2p/monero/files/monero-0.18.2.0-include-set.patch new file mode 100644 index 00000000..52d2b094 --- /dev/null +++ b/net-p2p/monero/files/monero-0.18.2.0-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/files/monero-0.18.1.1-translations-use-host-compiler.patch b/net-p2p/monero/files/monero-0.18.2.0-translations-use-host-compiler.patch index e51bef2f..e51bef2f 100644 --- a/net-p2p/monero/files/monero-0.18.1.1-translations-use-host-compiler.patch +++ b/net-p2p/monero/files/monero-0.18.2.0-translations-use-host-compiler.patch diff --git a/net-p2p/monero/files/monero-gui-0.18.1.1-cmake-use-gentoo-versioning.patch b/net-p2p/monero/files/monero-gui-0.18.2.0-cmake-use-gentoo-versioning.patch index 1d05fdb6..1d05fdb6 100644 --- a/net-p2p/monero/files/monero-gui-0.18.1.1-cmake-use-gentoo-versioning.patch +++ b/net-p2p/monero/files/monero-gui-0.18.2.0-cmake-use-gentoo-versioning.patch diff --git a/net-p2p/monero/monero-0.18.1.1.ebuild b/net-p2p/monero/monero-0.18.2.0.ebuild index 7d3dce32..7aed0e43 100644 --- a/net-p2p/monero/monero-0.18.1.1.ebuild +++ b/net-p2p/monero/monero-0.18.2.0.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=( @@ -137,6 +139,7 @@ src_configure() { -DBUILD_TESTS=OFF -DUSE_READLINE="$(usex readline ON OFF)" -DBUILD_GUI_DEPS="$(usex qt5 ON OFF)" + -DSTACK_TRACE=OFF -DBUILD_SHARED_LIBS=OFF -DMANUAL_SUBMODULES=ON ) @@ -147,13 +150,6 @@ src_configure() { cmakeargs_monero+=( -DNO_AES=ON ) fi - if use elibc_musl ; then - cmakeargs_monero+=( - # https://github.com/monero-project/monero/issues/2030 - -DSTACK_TRACE=OFF - ) - fi - local cmakeargs_monerogui=( "${cmakeargs_monero[@]}" -DUSE_DEVICE_TREZOR="$(usex smartcard ON OFF)" |