commit: 5efe54d5649591bf264eb5a2ce0033f4a6c49199
Author: Filip Kobierski <fkobi <AT> pm <DOT> me>
AuthorDate: Tue May 6 17:57:29 2025 +0000
Commit: Filip Kobierski <fkobi <AT> pm <DOT> me>
CommitDate: Tue May 6 17:58:19 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5efe54d5
net-p2p/monero: drop unused patch
Signed-off-by: Filip Kobierski <fkobi <AT> pm.me>
.../monero-0.17.3.2-unbundle-dependencies.patch | 114 ---------------------
1 file changed, 114 deletions(-)
diff --git a/net-p2p/monero/files/monero-0.17.3.2-unbundle-dependencies.patch
b/net-p2p/monero/files/monero-0.17.3.2-unbundle-dependencies.patch
deleted file mode 100644
index ec03bf5f4..000000000
--- a/net-p2p/monero/files/monero-0.17.3.2-unbundle-dependencies.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 41f82e26c..3eb2b2e78 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -382,7 +382,7 @@
- # elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
- # set(BSDI TRUE)
-
--include_directories(external/rapidjson/include external/easylogging++ src
contrib/epee/include external external/supercop/include)
-+include_directories(external/rapidjson/include external/easylogging++ src
contrib/epee/include external )
-
- if(APPLE)
- include_directories(SYSTEM /usr/include/malloc)
-@@ -1082,7 +1082,6 @@
- set(ZMQ_LIB "${ZMQ_LIB};${SODIUM_LIBRARY}")
- endif()
-
--include(external/supercop/functions.cmake) # place after setting flags and
before src directory inclusion
- add_subdirectory(contrib)
- add_subdirectory(src)
-
-diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index a8916a7d0..05ab35c82 100644
---- a/external/CMakeLists.txt
-+++ b/external/CMakeLists.txt
-@@ -37,21 +37,7 @@
-
- find_package(Miniupnpc REQUIRED)
-
--message(STATUS "Using in-tree miniupnpc")
--set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE)
--add_subdirectory(miniupnp/miniupnpc)
--set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
--set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON)
--if(MSVC)
-- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY
COMPILE_FLAGS " -wd4244 -wd4267")
--elseif(NOT MSVC)
-- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY
COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
--endif()
--if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
-- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY
COMPILE_FLAGS " -D_NETBSD_SOURCE")
--endif()
--
--set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
-+set(UPNP_LIBRARIES "miniupnpc" PARENT_SCOPE)
-
- find_package(Unbound)
-
-@@ -83,4 +69,3 @@
- add_subdirectory(db_drivers)
- add_subdirectory(easylogging++)
- add_subdirectory(qrcodegen)
--add_subdirectory(randomx EXCLUDE_FROM_ALL)
-diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
-index 3b33fe90a..ba354a0e8 100644
---- a/src/crypto/CMakeLists.txt
-+++ b/src/crypto/CMakeLists.txt
-@@ -55,6 +55,7 @@ list(APPEND crypto_sources CryptonightR_template.S)
- endif()
-
- include_directories(${RANDOMX_INCLUDE})
-+include_directories(SYSTEM /usr/include/monero)
-
- set(crypto_headers)
-
-@@ -116,6 +117,3 @@ endif()
-
- # cheat because cmake and ccache hate each other
- set_property(SOURCE CryptonightR_template.S PROPERTY LANGUAGE C)
--
--# Must be done last, because it references libraries in this directory
--add_subdirectory(wallet)
-diff --git a/src/crypto/wallet/crypto.h b/src/crypto/wallet/crypto.h
-index a4c5d5a07..5c6b96cd8 100644
---- a/src/crypto/wallet/crypto.h
-+++ b/src/crypto/wallet/crypto.h
-@@ -29,7 +29,6 @@
- #pragma once
-
- #include <cstddef>
--#include "crypto/wallet/ops.h"
-
- namespace crypto {
- namespace wallet {
-diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt
-index ff2afba4b..26b0f4523 100644
---- a/src/device/CMakeLists.txt
-+++ b/src/device/CMakeLists.txt
-@@ -73,7 +73,7 @@
- cncrypto
- cryptonote_format_utils_basic
- ringct_basic
-- wallet-crypto
-+ monero-crypto
- ${OPENSSL_CRYPTO_LIBRARIES}
- ${Boost_SERIALIZATION_LIBRARY}
- PRIVATE
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 65db2615c..3ace310f6 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -61,9 +61,9 @@
- #include "cryptonote_core/cryptonote_core.h"
- #include "net/parse.h"
-
--#include <miniupnp/miniupnpc/miniupnpc.h>
--#include <miniupnp/miniupnpc/upnpcommands.h>
--#include <miniupnp/miniupnpc/upnperrors.h>
-+#include <miniupnpc/miniupnpc.h>
-+#include <miniupnpc/upnpcommands.h>
-+#include <miniupnpc/upnperrors.h>
-
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
