From 55b58f2e7177174b54359c729198508b4cde6167 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Tue, 23 Jul 2019 01:35:56 +0100 Subject: net-p2p/monero: Version bump Package-Manager: Portage-2.3.66, Repoman-2.3.11 --- .../files/0.14.0.2-Drop-in-tree-miniupnpc.patch | 57 ---------------------- .../0.14.1.0-Do-not-install-trezor-dep-libs.patch | 25 ---------- .../files/0.14.1.0-Drop-in-tree-miniupnpc.patch | 57 ---------------------- .../files/0.14.1.0-Use-gentoo-versioning.patch | 38 --------------- .../0.14.1.2-Do-not-install-trezor-dep-libs.patch | 25 ++++++++++ .../files/0.14.1.2-Drop-in-tree-miniupnpc.patch | 57 ++++++++++++++++++++++ .../files/0.14.1.2-Use-gentoo-versioning.patch | 38 +++++++++++++++ 7 files changed, 120 insertions(+), 177 deletions(-) delete mode 100644 net-p2p/monero/files/0.14.0.2-Drop-in-tree-miniupnpc.patch delete mode 100644 net-p2p/monero/files/0.14.1.0-Do-not-install-trezor-dep-libs.patch delete mode 100644 net-p2p/monero/files/0.14.1.0-Drop-in-tree-miniupnpc.patch delete mode 100644 net-p2p/monero/files/0.14.1.0-Use-gentoo-versioning.patch create mode 100644 net-p2p/monero/files/0.14.1.2-Do-not-install-trezor-dep-libs.patch create mode 100644 net-p2p/monero/files/0.14.1.2-Drop-in-tree-miniupnpc.patch create mode 100644 net-p2p/monero/files/0.14.1.2-Use-gentoo-versioning.patch (limited to 'net-p2p/monero/files') diff --git a/net-p2p/monero/files/0.14.0.2-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/0.14.0.2-Drop-in-tree-miniupnpc.patch deleted file mode 100644 index c300bf9b..00000000 --- a/net-p2p/monero/files/0.14.0.2-Drop-in-tree-miniupnpc.patch +++ /dev/null @@ -1,57 +0,0 @@ -From bcc66dab7ac3d7745b28dc406c39846def96d2fd 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 7553f87ea968..59996bf0c2f7 100644 ---- a/external/CMakeLists.txt -+++ b/external/CMakeLists.txt -@@ -37,19 +37,9 @@ - - 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() --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 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 9390626a8f7d..a5e5b99b51ef 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" diff --git a/net-p2p/monero/files/0.14.1.0-Do-not-install-trezor-dep-libs.patch b/net-p2p/monero/files/0.14.1.0-Do-not-install-trezor-dep-libs.patch deleted file mode 100644 index 9525a2f6..00000000 --- a/net-p2p/monero/files/0.14.1.0-Do-not-install-trezor-dep-libs.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 29277ef1a899be4f71d97d3df0909b561299edb7 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -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 d0fc21f51175..6d8f5e4cb3a7 100644 ---- a/src/wallet/CMakeLists.txt -+++ b/src/wallet/CMakeLists.txt -@@ -142,11 +142,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/0.14.1.0-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/0.14.1.0-Drop-in-tree-miniupnpc.patch deleted file mode 100644 index 23fafa98..00000000 --- a/net-p2p/monero/files/0.14.1.0-Drop-in-tree-miniupnpc.patch +++ /dev/null @@ -1,57 +0,0 @@ -From defc40037d89c32c9763e660af1b5a9260f43867 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 bc4344b34833..10189ce3a2fb 100644 ---- a/external/CMakeLists.txt -+++ b/external/CMakeLists.txt -@@ -37,19 +37,9 @@ - - 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() --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 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 ba29d92c9144..e9f62ad1717b 100644 ---- a/src/p2p/net_node.inl -+++ b/src/p2p/net_node.inl -@@ -60,9 +60,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" diff --git a/net-p2p/monero/files/0.14.1.0-Use-gentoo-versioning.patch b/net-p2p/monero/files/0.14.1.0-Use-gentoo-versioning.patch deleted file mode 100644 index b1f11ec7..00000000 --- a/net-p2p/monero/files/0.14.1.0-Use-gentoo-versioning.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 777b5fb5c1128b54a008b47bd637cb93fe1253b4 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -Date: Sat, 15 Jun 2019 00:15:54 +0100 -Subject: [PATCH] Use gentoo versioning - ---- - cmake/Version.cmake | 19 ++----------------- - 1 file changed, 2 insertions(+), 17 deletions(-) - -diff --git a/cmake/Version.cmake b/cmake/Version.cmake -index 632c1431c953..5aaa404b9f6f 100644 ---- a/cmake/Version.cmake -+++ b/cmake/Version.cmake -@@ -31,22 +31,7 @@ function (write_static_version_header hash) - configure_file("${CMAKE_SOURCE_DIR}/src/version.cpp.in" "${CMAKE_BINARY_DIR}/version.cpp") - endfunction () - --find_package(Git QUIET) --if ("$Format:$" STREQUAL "") -- # We're in a tarball; use hard-coded variables. -- write_static_version_header("release") --elseif (GIT_FOUND OR Git_FOUND) -- message(STATUS "Found Git: ${GIT_EXECUTABLE}") -- add_custom_command( -- OUTPUT "${CMAKE_BINARY_DIR}/version.cpp" -- COMMAND "${CMAKE_COMMAND}" -- "-D" "GIT=${GIT_EXECUTABLE}" -- "-D" "TO=${CMAKE_BINARY_DIR}/version.cpp" -- "-P" "cmake/GenVersion.cmake" -- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") --else() -- message(STATUS "WARNING: Git was not found!") -- write_static_version_header("unknown") --endif () -+write_static_version_header("release") -+ - add_custom_target(genversion ALL - DEPENDS "${CMAKE_BINARY_DIR}/version.cpp") diff --git a/net-p2p/monero/files/0.14.1.2-Do-not-install-trezor-dep-libs.patch b/net-p2p/monero/files/0.14.1.2-Do-not-install-trezor-dep-libs.patch new file mode 100644 index 00000000..7ef73765 --- /dev/null +++ b/net-p2p/monero/files/0.14.1.2-Do-not-install-trezor-dep-libs.patch @@ -0,0 +1,25 @@ +From 8247c0f8151d678ca51a7b940667665809cb60aa Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Sat, 15 Jun 2019 00:57:09 +0100 +Subject: [PATCH 3/3] 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 d0fc21f51175..6d8f5e4cb3a7 100644 +--- a/src/wallet/CMakeLists.txt ++++ b/src/wallet/CMakeLists.txt +@@ -142,11 +142,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/0.14.1.2-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/0.14.1.2-Drop-in-tree-miniupnpc.patch new file mode 100644 index 00000000..9d34d836 --- /dev/null +++ b/net-p2p/monero/files/0.14.1.2-Drop-in-tree-miniupnpc.patch @@ -0,0 +1,57 @@ +From a4ba00bb22e8de0f1c436be17392014b8d21117c Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Sun, 17 Jun 2018 22:34:11 +0100 +Subject: [PATCH 1/3] 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 bc4344b34833..10189ce3a2fb 100644 +--- a/external/CMakeLists.txt ++++ b/external/CMakeLists.txt +@@ -37,19 +37,9 @@ + + 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() +-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 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 cec832231d3f..6b156792286d 100644 +--- a/src/p2p/net_node.inl ++++ b/src/p2p/net_node.inl +@@ -60,9 +60,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" diff --git a/net-p2p/monero/files/0.14.1.2-Use-gentoo-versioning.patch b/net-p2p/monero/files/0.14.1.2-Use-gentoo-versioning.patch new file mode 100644 index 00000000..763d17be --- /dev/null +++ b/net-p2p/monero/files/0.14.1.2-Use-gentoo-versioning.patch @@ -0,0 +1,38 @@ +From 9b782e9ba4c576367f50a336f15e81b1b79cb392 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Sat, 15 Jun 2019 00:15:54 +0100 +Subject: [PATCH 2/3] Use gentoo versioning + +--- + cmake/Version.cmake | 19 ++----------------- + 1 file changed, 2 insertions(+), 17 deletions(-) + +diff --git a/cmake/Version.cmake b/cmake/Version.cmake +index 632c1431c953..957202469db7 100644 +--- a/cmake/Version.cmake ++++ b/cmake/Version.cmake +@@ -31,22 +31,7 @@ function (write_static_version_header hash) + configure_file("${CMAKE_SOURCE_DIR}/src/version.cpp.in" "${CMAKE_BINARY_DIR}/version.cpp") + endfunction () + +-find_package(Git QUIET) +-if ("$Format:$" STREQUAL "") +- # We're in a tarball; use hard-coded variables. +- write_static_version_header("release") +-elseif (GIT_FOUND OR Git_FOUND) +- message(STATUS "Found Git: ${GIT_EXECUTABLE}") +- add_custom_command( +- OUTPUT "${CMAKE_BINARY_DIR}/version.cpp" +- COMMAND "${CMAKE_COMMAND}" +- "-D" "GIT=${GIT_EXECUTABLE}" +- "-D" "TO=${CMAKE_BINARY_DIR}/version.cpp" +- "-P" "cmake/GenVersion.cmake" +- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") +-else() +- message(STATUS "WARNING: Git was not found!") +- write_static_version_header("unknown") +-endif () ++write_static_version_header("release") ++ + add_custom_target(genversion ALL + DEPENDS "${CMAKE_BINARY_DIR}/version.cpp") -- cgit v1.2.3