diff options
Diffstat (limited to 'net-p2p/monero/files')
7 files changed, 0 insertions, 238 deletions
diff --git a/net-p2p/monero/files/monero-0.17.2.3-Do-not-install-trezor-dep-libs.patch b/net-p2p/monero/files/monero-0.17.2.3-Do-not-install-trezor-dep-libs.patch deleted file mode 100644 index 96fede78..00000000 --- a/net-p2p/monero/files/monero-0.17.2.3-Do-not-install-trezor-dep-libs.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bfdf47d264e23f31c72529058d4d724033ac1b4f Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -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 bf238ae37887..0cfb534ed4fe 100644 ---- a/src/wallet/CMakeLists.txt -+++ b/src/wallet/CMakeLists.txt -@@ -149,11 +149,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/monero-0.17.2.3-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/monero-0.17.2.3-Drop-in-tree-miniupnpc.patch deleted file mode 100644 index f8f7036a..00000000 --- a/net-p2p/monero/files/monero-0.17.2.3-Drop-in-tree-miniupnpc.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 2998bbb7886f03771884a7d0405827cc1ecec48d Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -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 a8916a7d00d4..1db18e2431e6 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 b8cf2d124948..8fdcd08d554d 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" diff --git a/net-p2p/monero/files/monero-0.17.2.3-Use-gentoo-dev-libs-randomx.patch b/net-p2p/monero/files/monero-0.17.2.3-Use-gentoo-dev-libs-randomx.patch deleted file mode 100644 index 02994f0d..00000000 --- a/net-p2p/monero/files/monero-0.17.2.3-Use-gentoo-dev-libs-randomx.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 19ee58c33daece28e198e058d3cd5a06501ef178 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -Date: Wed, 6 Nov 2019 01:23:52 +0000 -Subject: [PATCH] Use gentoo dev-libs/randomx - ---- - external/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index 1db18e2431e6..567a2fc1ebb6 100644 ---- a/external/CMakeLists.txt -+++ b/external/CMakeLists.txt -@@ -71,4 +71,3 @@ endif() - add_subdirectory(db_drivers) - add_subdirectory(easylogging++) - add_subdirectory(qrcodegen) --add_subdirectory(randomx EXCLUDE_FROM_ALL) diff --git a/net-p2p/monero/files/monero-0.17.2.3-Use-gentoo-versioning.patch b/net-p2p/monero/files/monero-0.17.2.3-Use-gentoo-versioning.patch deleted file mode 100644 index 16cfb731..00000000 --- a/net-p2p/monero/files/monero-0.17.2.3-Use-gentoo-versioning.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 885cd1e274b4d1cdc35dd4d20713fd21d6757885 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -Date: Sat, 15 Jun 2019 00:15:54 +0100 -Subject: [PATCH] Use gentoo versioning - ---- - cmake/Version.cmake | 18 +++--------------- - 1 file changed, 3 insertions(+), 15 deletions(-) - -diff --git a/cmake/Version.cmake b/cmake/Version.cmake -index 707d7263958a..e6386339d720 100644 ---- a/cmake/Version.cmake -+++ b/cmake/Version.cmake -@@ -31,20 +31,8 @@ function (write_version tag) - configure_file("${CMAKE_CURRENT_LIST_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. -- set(VERSION_IS_RELEASE "true") -- write_version("release") --elseif (GIT_FOUND OR Git_FOUND) -- message(STATUS "Found Git: ${GIT_EXECUTABLE}") -- include(GitVersion) -- get_version_tag_from_git("${GIT_EXECUTABLE}") -- write_version("${VERSIONTAG}") --else() -- message(STATUS "WARNING: Git was not found!") -- set(VERSION_IS_RELEASE "false") -- write_version("unknown") --endif () -+set(VERSION_IS_RELEASE "true") -+write_version("release") -+ - add_custom_target(genversion ALL - DEPENDS "${CMAKE_BINARY_DIR}/version.cpp") diff --git a/net-p2p/monero/files/monero-0.17.2.3-translations-use-host-compiler.patch b/net-p2p/monero/files/monero-0.17.2.3-translations-use-host-compiler.patch deleted file mode 100644 index 847a6310..00000000 --- a/net-p2p/monero/files/monero-0.17.2.3-translations-use-host-compiler.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6e2719e0d44e052715642ec895e76d64b77809ce Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -Date: Sat, 30 Nov 2019 02:09:14 +0000 -Subject: [PATCH] translations: use host compiler - -Do not pass target compiler and compiler flags as -generate_translations_header need to be created using host compiler and -compiler flags ---- - CMakeLists.txt | 4 +++- - translations/CMakeLists.txt | 4 ++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 362ca8d5659c..3b4d31f87e46 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -534,7 +534,9 @@ ExternalProject_Add(generate_translations_header - SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/translations" - BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/translations" - STAMP_DIR ${LRELEASE_PATH} -- CMAKE_ARGS -DLRELEASE_PATH=${LRELEASE_PATH} -+ CMAKE_ARGS -+ -DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_BINARY_DIR}/translations.cmake -+ -DLRELEASE_PATH=${LRELEASE_PATH} - INSTALL_COMMAND cmake -E echo "") - include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations") - add_subdirectory(external) -diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt -index 0081746f2b9c..5309d84d742f 100644 ---- a/translations/CMakeLists.txt -+++ b/translations/CMakeLists.txt -@@ -28,6 +28,10 @@ - - cmake_minimum_required(VERSION 2.8.7) - -+# Ensure LDFLAGS for target are not propaged here since target are -+# meant for host -+UNSET(ENV{LDFLAGS}) -+ - project(translations) - - # when crosscompiling import the executable targets from a file diff --git a/net-p2p/monero/files/monero-gui-0.17.2.3-cmake-remove-Werror.patch b/net-p2p/monero/files/monero-gui-0.17.2.3-cmake-remove-Werror.patch deleted file mode 100644 index aa77b755..00000000 --- a/net-p2p/monero/files/monero-gui-0.17.2.3-cmake-remove-Werror.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 398631d77701cd134a83094d66364bfc34c0456b Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -Date: Sat, 17 Oct 2020 18:27:24 +0100 -Subject: [PATCH] cmake: remove Werror - -See: https://bugs.gentoo.org/show_bug.cgi?id=652650 ---- - CMakeLists.txt | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 16a9551d2f38..7e4e82fe7c73 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -438,8 +438,6 @@ if(APPLE) - endif() - - # warnings --add_c_flag_if_supported(-Werror C_SECURITY_FLAGS) --add_cxx_flag_if_supported(-Werror CXX_SECURITY_FLAGS) - add_c_flag_if_supported(-Wformat C_SECURITY_FLAGS) - add_cxx_flag_if_supported(-Wformat CXX_SECURITY_FLAGS) - add_c_flag_if_supported(-Wformat-security C_SECURITY_FLAGS) diff --git a/net-p2p/monero/files/monero-gui-0.17.2.3-cmake-use-gentoo-versioning.patch b/net-p2p/monero/files/monero-gui-0.17.2.3-cmake-use-gentoo-versioning.patch deleted file mode 100644 index 31aa7be3..00000000 --- a/net-p2p/monero/files/monero-gui-0.17.2.3-cmake-use-gentoo-versioning.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7296808739a756fa3a95d2ccc85e46bd8f0eb457 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -Date: Sun, 18 Oct 2020 15:43:33 +0100 -Subject: [PATCH] cmake: use gentoo versioning - ---- - cmake/VersionGui.cmake | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/cmake/VersionGui.cmake b/cmake/VersionGui.cmake -index 960c3f4e0d05..73934232b527 100644 ---- a/cmake/VersionGui.cmake -+++ b/cmake/VersionGui.cmake -@@ -30,20 +30,7 @@ function (write_static_version_header VERSION_TAG_GUI) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/version.js.in" "${CMAKE_CURRENT_SOURCE_DIR}/version.js") - 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}") -+write_static_version_header("@@PV@@") - -- include(GitGetVersionTag) -- git_get_version_tag(${GIT_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} VERSION_TAG_GUI) -- STRING(REGEX REPLACE "^v([0-9])" "\\1" VERSION_TAG_GUI ${VERSION_TAG_GUI}) -- write_static_version_header(${VERSION_TAG_GUI}) --else() -- message(STATUS "WARNING: Git was not found!") -- write_static_version_header("unknown") --endif () - add_custom_target(genversiongui ALL - DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/version.js") |