From c8e1415f7125070d5455563bb691b3755d92b6ae Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 10 Oct 2018 13:28:26 +0200 Subject: [PATCH] monero: update to 0.13.0.2. --- srcpkgs/monero/patches/easylogging.patch | 10 +- srcpkgs/monero/patches/system-miniupnpc.patch | 116 +++++++++--------- srcpkgs/monero/template | 6 +- 3 files changed, 67 insertions(+), 65 deletions(-) diff --git a/srcpkgs/monero/patches/easylogging.patch b/srcpkgs/monero/patches/easylogging.patch index f3ecb999a67..e4970afdd5e 100644 --- a/srcpkgs/monero/patches/easylogging.patch +++ b/srcpkgs/monero/patches/easylogging.patch @@ -1,11 +1,11 @@ ---- external/easylogging++/easylogging++.h 2018-03-25 11:13:30.152606274 +0200 -+++ external/easylogging++/easylogging++.h 2018-03-25 11:14:51.038363937 +0200 -@@ -200,7 +200,7 @@ +--- external/easylogging++/easylogging++.h 2018-10-10 13:06:21.126417347 +0200 ++++ external/easylogging++/easylogging++.h 2018-10-10 13:07:35.488416829 +0200 +@@ -205,7 +205,7 @@ # define ELPP_INTERNAL_INFO(lvl, msg) #endif // (defined(ELPP_DEBUG_INFO)) #if (defined(ELPP_FEATURE_ALL)) || (defined(ELPP_FEATURE_CRASH_LOG)) --# if (ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD) -+# if (__has_include() && ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD) +-# if (ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD && !ELPP_OS_NETBSD) ++# if ( __has_include() && ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD && !ELPP_OS_NETBSD) # define ELPP_STACKTRACE 1 # else # define ELPP_STACKTRACE 0 diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch index 1e93d5b1bc0..79b2e4d842c 100644 --- a/srcpkgs/monero/patches/system-miniupnpc.patch +++ b/srcpkgs/monero/patches/system-miniupnpc.patch @@ -15,63 +15,6 @@ # Final setup for libunbound include_directories(${UNBOUND_INCLUDE}) link_directories(${UNBOUND_LIBRARY_DIRS}) -diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index 1fc4d64c..b4f712ee 100644 ---- external/CMakeLists.txt -+++ external/CMakeLists.txt -@@ -34,21 +34,42 @@ - # We always compile if we are building statically to reduce static dependency issues... - # ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with - # others. -+if(NOT IOS) -+ find_package(Miniupnpc QUIET) -+endif() - --find_package(Miniupnpc REQUIRED) -+# If we have the correct shared version and we're not building static, use it -+if(STATIC OR IOS) -+ set(USE_SHARED_MINIUPNPC false) -+elseif(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER) -+ set(USE_SHARED_MINIUPNPC true) -+endif() - --message(STATUS "Using in-tree miniupnpc") -+if(USE_SHARED_MINIUPNPC) -+ message(STATUS "Using shared miniupnpc found at ${MINIUPNP_INCLUDE_DIR}") - --add_subdirectory(miniupnp/miniupnpc) -+ set(UPNP_STATIC false PARENT_SCOPE) -+ set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE) -+ set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE) -+else() -+ if(STATIC) -+ message(STATUS "Using miniupnpc from local source tree for static build") -+ else() -+ message(STATUS "Using miniupnpc from local source tree (/external/miniupnp/miniupnpc)") -+ endif() - --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() -+ 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 true PARENT_SCOPE) -+ set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) -+endif() - - find_package(Unbound) - diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 9b21705e..76340a22 100644 --- src/p2p/net_node.inl @@ -99,3 +42,62 @@ index 9b21705e..76340a22 100644 -- 2.17.0 +--- external/CMakeLists.txt 2018-10-10 13:13:55.759414180 +0200 ++++ external/CMakeLists.txt 2018-10-10 13:19:33.363411827 +0200 +@@ -34,22 +34,46 @@ + # We always compile if we are building statically to reduce static dependency issues... + # ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with + # others. ++if(NOT IOS) ++ find_package(Miniupnpc QUIET) ++endif() + +-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") ++# If we have the correct shared version and we're not building static, use it ++if(STATIC OR IOS) ++ set(USE_SHARED_MINIUPNPC false) ++elseif(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER) ++ set(USE_SHARED_MINIUPNPC true) + endif() ++ ++ ++if(USE_SHARED_MINIUPNPC) ++ message(STATUS "Using shared miniupnpc found at ${MINIUPNP_INCLUDE_DIR}") ++ ++ set(UPNP_STATIC false PARENT_SCOPE) ++ set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE) ++ set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE) ++else() ++ if(STATIC) ++ message(STATUS "Using miniupnpc from local source tree for static build") ++ else() ++ message(STATUS "Using miniupnpc from local source tree (/external/miniupnp/miniupnpc)") ++ endif() ++ 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() ++ + 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_STATIC true PARENT_SCOPE) ++ set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) ++endif() + + find_package(Unbound) + diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template index d4caad4211f..63d0998e9ae 100644 --- a/srcpkgs/monero/template +++ b/srcpkgs/monero/template @@ -1,6 +1,6 @@ # Template file for 'monero' pkgname=monero -version=0.12.4.0 +version=0.13.0.2 revision=1 conf_files="/etc/monerod.conf" build_style=cmake @@ -8,7 +8,7 @@ hostmakedepends="pkg-config qt5-host-tools" configure_args="-DBUILD_GUI_DEPS=ON -DHAVE_LIBRESSL=1" makedepends="libressl-devel boost-devel libldns-devel libunwind-devel readline-devel unbound-devel miniupnpc-devel libldns-devel expat-devel - cppzmq czmq-devel rapidjson" + cppzmq czmq-devel rapidjson libsodium-devel" system_accounts="monero" make_dirs=" /var/lib/monero 0750 monero monero @@ -18,7 +18,7 @@ maintainer="Helmut Pozimski " license="BSD-3-Clause" homepage="https://getmonero.org" distfiles="https://github.com/monero-project/monero/archive/v${version}.tar.gz" -checksum=a54f821bb792d617d484c5bd2e03db2eec30bee06d6cdfe9f4922d08aaf75b32 +checksum=613255b761083190e1c313a7cc8c7377938648ebfe1a670ddfa96708e1bc8d7b if [ "$CROSS_BUILD" ]; then configure_args+=" -DTHREADS_PTHREAD_ARG=OFF"