net-p2p/monero: version bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3

6 files changed, 20 insertions, 45 deletions

diff --git a/net-p2p/monero/files/monero-0.17.3.2-Do-not-install-trezor-dep-libs.patch b/net-p2p/monero/files/monero-0.17.3.2-Do-not-install-trezor-dep-libs.patch
deleted file mode 100644
index 8e67be09..00000000
--- a/net-p2p/monero/files/monero-0.17.3.2-Do-not-install-trezor-dep-libs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6c75b95c9b4c3bd43842e50da7c14f122ed4fcb0 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Sat, 15 Jun 2019 00:57:09 +0100
-Subject: [PATCH] Do not install trezor dep libs
-
----
- src/wallet/CMakeLists.txt | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
-index bf238ae37887..0cfb534ed4fe 100644
---- a/src/wallet/CMakeLists.txt
-+++ b/src/wallet/CMakeLists.txt
-@@ -149,11 +149,7 @@ if (BUILD_GUI_DEPS)
-     install(TARGETS wallet_merged
-         ARCHIVE DESTINATION ${lib_folder})
- 
--    install(FILES ${TREZOR_DEP_LIBS}
--            DESTINATION ${lib_folder})
-     file(WRITE "trezor_link_flags.txt" ${TREZOR_DEP_LINKER})
--    install(FILES "trezor_link_flags.txt"
--            DESTINATION ${lib_folder})
- endif()
- 
- add_subdirectory(api)
diff --git a/net-p2p/monero/files/monero-0.17.3.2-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/monero-0.18.1.0-Drop-in-tree-miniupnpc.patch
index 56b93027..4959cf9c 100644
--- a/net-p2p/monero/files/monero-0.17.3.2-Drop-in-tree-miniupnpc.patch
+++ b/net-p2p/monero/files/monero-0.18.1.0-Drop-in-tree-miniupnpc.patch
@@ -1,4 +1,4 @@
-From f9b6fc9209e256b00bd5f198a9427d6ce1c9f34b Mon Sep 17 00:00:00 2001
+From dc3a18789e8c8ef6252bd94546bf8cd6184a56eb Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Sun, 17 Jun 2018 22:34:11 +0100
 Subject: [PATCH] Drop in-tree miniupnpc
@@ -12,7 +12,7 @@ submodule not part of the archive available upstream.
  2 files changed, 6 insertions(+), 19 deletions(-)
 
 diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index 7ae4ba750da4..77e9a50205ff 100644
+index 5b7f69a56843..fc40455064f4 100644
 --- a/external/CMakeLists.txt
 +++ b/external/CMakeLists.txt
 @@ -36,22 +36,9 @@
@@ -42,10 +42,10 @@ index 7ae4ba750da4..77e9a50205ff 100644
  find_package(Unbound)
  
 diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 71021b24c3c5..a2f5930aaf7b 100644
+index f33ce977de07..3d0c05a19da2 100644
 --- a/src/p2p/net_node.inl
 +++ b/src/p2p/net_node.inl
-@@ -61,9 +61,9 @@
+@@ -60,9 +60,9 @@
  #include "cryptonote_core/cryptonote_core.h"
  #include "net/parse.h"
  
diff --git a/net-p2p/monero/files/monero-0.17.3.2-Use-gentoo-dev-libs-randomx.patch b/net-p2p/monero/files/monero-0.18.1.0-Use-gentoo-dev-libs-randomx.patch
index 3ed12631..178e83ff 100644
--- a/net-p2p/monero/files/monero-0.17.3.2-Use-gentoo-dev-libs-randomx.patch
+++ b/net-p2p/monero/files/monero-0.18.1.0-Use-gentoo-dev-libs-randomx.patch
@@ -1,4 +1,4 @@
-From 0644c9fcb32af4f5cd55dc1040007631f01cf2ca Mon Sep 17 00:00:00 2001
+From a007bfe93c3e71a166206abd30a91dc3637983c8 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Wed, 6 Nov 2019 01:23:52 +0000
 Subject: [PATCH] Use gentoo dev-libs/randomx
@@ -8,10 +8,10 @@ Subject: [PATCH] Use gentoo dev-libs/randomx
  1 file changed, 1 deletion(-)
 
 diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index 85040f05b3d3..adf307c5fc01 100644
+index fc40455064f4..5536debe8e2b 100644
 --- a/external/CMakeLists.txt
 +++ b/external/CMakeLists.txt
-@@ -66,4 +66,3 @@ endif()
+@@ -56,4 +56,3 @@ endif()
  add_subdirectory(db_drivers)
  add_subdirectory(easylogging++)
  add_subdirectory(qrcodegen)
diff --git a/net-p2p/monero/files/monero-0.17.3.2-Use-gentoo-versioning.patch b/net-p2p/monero/files/monero-0.18.1.0-Use-gentoo-versioning.patch
index c10730cf..c2c563e1 100644
--- a/net-p2p/monero/files/monero-0.17.3.2-Use-gentoo-versioning.patch
+++ b/net-p2p/monero/files/monero-0.18.1.0-Use-gentoo-versioning.patch
@@ -1,4 +1,4 @@
-From 67dac45de0bfb119888cb5ebb41be1283a074a3d Mon Sep 17 00:00:00 2001
+From 9e2da6c420843a4928b0fb42a41bafcfb4b95ee3 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Sat, 15 Jun 2019 00:15:54 +0100
 Subject: [PATCH] Use gentoo versioning
@@ -8,7 +8,7 @@ Subject: [PATCH] Use gentoo versioning
  1 file changed, 3 insertions(+), 15 deletions(-)
 
 diff --git a/cmake/Version.cmake b/cmake/Version.cmake
-index 707d7263958a..e6386339d720 100644
+index e9ed9fba159b..5df4bc1ab7f3 100644
 --- a/cmake/Version.cmake
 +++ b/cmake/Version.cmake
 @@ -31,20 +31,8 @@ function (write_version tag)
diff --git a/net-p2p/monero/files/monero-0.17.3.2-translations-use-host-compiler.patch b/net-p2p/monero/files/monero-0.18.1.0-translations-use-host-compiler.patch
index 40276b0a..e51bef2f 100644
--- a/net-p2p/monero/files/monero-0.17.3.2-translations-use-host-compiler.patch
+++ b/net-p2p/monero/files/monero-0.18.1.0-translations-use-host-compiler.patch
@@ -1,4 +1,4 @@
-From e10d750a15343998ae1b655947820cdb26e58276 Mon Sep 17 00:00:00 2001
+From c927623016a946cddf6ba4e255cc9208929fa117 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Sat, 30 Nov 2019 02:09:14 +0000
 Subject: [PATCH] translations: use host compiler
@@ -12,10 +12,10 @@ compiler flags
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ffb5abb82534..49f18a57cf7e 100644
+index b05c087cf898..ef980115c9e1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -542,7 +542,9 @@ ExternalProject_Add(generate_translations_header
+@@ -671,7 +671,9 @@ ExternalProject_Add(generate_translations_header
    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/translations"
    BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/translations"
    STAMP_DIR ${LRELEASE_PATH}
@@ -23,21 +23,21 @@ index ffb5abb82534..49f18a57cf7e 100644
 +  CMAKE_ARGS
 +    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_BINARY_DIR}/translations.cmake
 +    -DLRELEASE_PATH=${LRELEASE_PATH}
-   INSTALL_COMMAND cmake -E echo "")
+   INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "")
  include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
  add_subdirectory(external)
 diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt
-index 7e31ed319e94..64bda84f055e 100644
+index 3b43360f84c8..35fcae544a42 100644
 --- a/translations/CMakeLists.txt
 +++ b/translations/CMakeLists.txt
-@@ -28,6 +28,10 @@
+@@ -30,6 +30,10 @@ cmake_minimum_required(VERSION 3.5)
  
- cmake_minimum_required(VERSION 3.5)
+ project(translations)
  
 +# Ensure LDFLAGS for target are not propagated here since target are
 +# meant for host
 +UNSET(ENV{LDFLAGS})
 +
- project(translations)
- 
  # when crosscompiling import the executable targets from a file
+ IF(CMAKE_CROSSCOMPILING)
+   message(WARNING "CrossCompiling")
diff --git a/net-p2p/monero/files/monero-gui-0.17.3.2-cmake-use-gentoo-versioning.patch b/net-p2p/monero/files/monero-gui-0.18.1.0-cmake-use-gentoo-versioning.patch
index 546c562a..1d05fdb6 100644
--- a/net-p2p/monero/files/monero-gui-0.17.3.2-cmake-use-gentoo-versioning.patch
+++ b/net-p2p/monero/files/monero-gui-0.18.1.0-cmake-use-gentoo-versioning.patch
@@ -1,4 +1,4 @@
-From d83bfe6ab9b90b16d48e7bd7c88ee1a75a91afda Mon Sep 17 00:00:00 2001
+From 3a0d595e530779c37431743b73566a7f6b2543e9 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Sun, 18 Oct 2020 15:43:33 +0100
 Subject: [PATCH] cmake: use gentoo versioning
@@ -8,7 +8,7 @@ Subject: [PATCH] cmake: use gentoo versioning
  1 file changed, 2 insertions(+), 12 deletions(-)
 
 diff --git a/cmake/VersionGui.cmake b/cmake/VersionGui.cmake
-index e225bf2bb3c0..786bb2d934f1 100644
+index e225bf2bb3c0..1f8574e8d1e8 100644
 --- a/cmake/VersionGui.cmake
 +++ b/cmake/VersionGui.cmake
 @@ -31,17 +31,7 @@ function (write_static_version_header tag)