diff --git a/gnu/local.mk b/gnu/local.mk index fa070bcaa52..4026ab7228a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1935,7 +1935,6 @@ dist_patch_DATA = \ %D%/packages/patches/modglue-fix-build.patch \ %D%/packages/patches/modem-manager-fix-test-wrapper.patch \ %D%/packages/patches/module-init-tools-moduledir.patch \ - %D%/packages/patches/monero-use-system-miniupnpc.patch \ %D%/packages/patches/mono-1.2.6-bootstrap.patch \ %D%/packages/patches/mono-1.9.1-add-MONO_CREATE_IMAGE_VERSION.patch \ %D%/packages/patches/mono-1.9.1-fixes.patch \ diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index c0f77464a05..35be6c8473f 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -908,7 +908,7 @@ blockchain.") ;; the system's dynamically linked library. (package (name "monero") - (version "0.18.4.6") + (version "0.18.5.0") (source (origin (method git-fetch) @@ -917,16 +917,15 @@ blockchain.") (commit (string-append "v" version)) (recursive? #t))) (file-name (git-file-name name version)) - (patches (search-patches "monero-use-system-miniupnpc.patch")) (modules '((guix build utils))) (snippet '(begin ;; Delete bundled dependencies. (for-each delete-file-recursively - '("external/miniupnp" "external/rapidjson")))) + '("external/rapidjson")))) (sha256 - (base32 "0s03rwa1pfxxrj03f170sr6yd5v2wpqdfzam7gas1s71gg6v6ap6")))) + (base32 "0i0x4aacw2id877hdarp4vjc0cgs0yijsgrx85890xdypik2m8zq")))) (build-system cmake-build-system) (native-inputs (list doxygen @@ -943,7 +942,6 @@ blockchain.") libsodium libunwind libusb - miniupnpc-2.1 openssl protobuf rapidjson diff --git a/gnu/packages/patches/monero-use-system-miniupnpc.patch b/gnu/packages/patches/monero-use-system-miniupnpc.patch deleted file mode 100644 index 17a010be93f..00000000000 --- a/gnu/packages/patches/monero-use-system-miniupnpc.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index 5b7f69a56..3a353a0f3 100644 ---- a/external/CMakeLists.txt -+++ b/external/CMakeLists.txt -@@ -37,22 +37,7 @@ - - find_package(Miniupnpc REQUIRED) - --message(STATUS "Using in-tree miniupnpc") --set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE) --set(UPNPC_BUILD_SHARED OFF CACHE BOOL "Disable building shared library" 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) - -diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl -index d4b39869c..13071d898 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 --#include --#include -+#include -+#include -+#include - - #undef MONERO_DEFAULT_LOG_CATEGORY - #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"