From 28e775bae3426cef5f46c4c0490577c781ba8764 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Thu, 20 Sep 2018 23:57:37 +0100 Subject: net-p2p/monero: Remove old Package-Manager: Portage-2.3.49, Repoman-2.3.10 --- ...utilities-Add-monero-blockchain-ex-im-por.patch | 34 ------------- .../files/0.12.2.0-Drop-in-tree-miniupnpc.patch | 57 ---------------------- 2 files changed, 91 deletions(-) delete mode 100644 net-p2p/monero/files/0.11.1.0-blockchain_utilities-Add-monero-blockchain-ex-im-por.patch delete mode 100644 net-p2p/monero/files/0.12.2.0-Drop-in-tree-miniupnpc.patch (limited to 'net-p2p/monero/files') diff --git a/net-p2p/monero/files/0.11.1.0-blockchain_utilities-Add-monero-blockchain-ex-im-por.patch b/net-p2p/monero/files/0.11.1.0-blockchain_utilities-Add-monero-blockchain-ex-im-por.patch deleted file mode 100644 index dd678276..00000000 --- a/net-p2p/monero/files/0.11.1.0-blockchain_utilities-Add-monero-blockchain-ex-im-por.patch +++ /dev/null @@ -1,34 +0,0 @@ -From aa9c702eb7dcb529f91a972b05592797af154823 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -Date: Sun, 15 Oct 2017 22:15:18 +0100 -Subject: [PATCH] blockchain_utilities: Add monero-blockchain-{ex,im}port - binaries to default install targets - -Binaries available to download on https://getmonero.org/downloads/ as -embedding monerod, monero-wallet-{cli,rpc} and -monero-blockchain-{ex,im}port. - -This change synchronise download results with a manual build from -source ---- - src/blockchain_utilities/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/blockchain_utilities/CMakeLists.txt b/src/blockchain_utilities/CMakeLists.txt -index 0eaf71084f56..bd32e0c552d0 100644 ---- a/src/blockchain_utilities/CMakeLists.txt -+++ b/src/blockchain_utilities/CMakeLists.txt -@@ -93,6 +93,7 @@ endif() - set_property(TARGET blockchain_import - PROPERTY - OUTPUT_NAME "monero-blockchain-import") -+install(TARGETS blockchain_import DESTINATION bin) - - monero_add_executable(blockchain_export - ${blockchain_export_sources} -@@ -114,4 +115,5 @@ target_link_libraries(blockchain_export - set_property(TARGET blockchain_export - PROPERTY - OUTPUT_NAME "monero-blockchain-export") -+install(TARGETS blockchain_export DESTINATION bin) - diff --git a/net-p2p/monero/files/0.12.2.0-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/0.12.2.0-Drop-in-tree-miniupnpc.patch deleted file mode 100644 index c7b9d543..00000000 --- a/net-p2p/monero/files/0.12.2.0-Drop-in-tree-miniupnpc.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 694352e707574580d4249ead6673ffa2e7fcd0c2 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -Date: Sun, 17 Jun 2018 22:34:11 +0100 -Subject: [PATCH] Drop in-tree miniupnpc - -Since 6b8539803184 ("Build: update CMake and p2p for in-tree -miniupnp"), a hard dependency is made on miniupnpc which is a git -submodule not part of the archive available upstream. ---- - external/CMakeLists.txt | 16 +++------------- - src/p2p/net_node.inl | 6 +++--- - 2 files changed, 6 insertions(+), 16 deletions(-) - -diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index 1fc4d64c1cbf..48a6a9a32f08 100644 ---- a/external/CMakeLists.txt -+++ b/external/CMakeLists.txt -@@ -36,19 +36,9 @@ - # others. - - find_package(Miniupnpc REQUIRED) -- --message(STATUS "Using in-tree miniupnpc") -- --add_subdirectory(miniupnp/miniupnpc) -- --set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") --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() -- --set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) -+set(UPNP_STATIC false PARENT_SCOPE) -+set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE) -+set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE) - - find_package(Unbound) - -diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl -index 07f369d40544..e10e4cfbc606 100644 ---- a/src/p2p/net_node.inl -+++ b/src/p2p/net_node.inl -@@ -49,9 +49,9 @@ - #include "storages/levin_abstract_invoke2.h" - #include "cryptonote_core/cryptonote_core.h" - --#include --#include --#include -+#include -+#include -+#include - - #undef MONERO_DEFAULT_LOG_CATEGORY - #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p" -- cgit v1.2.3