summaryrefslogtreecommitdiff
path: root/net-p2p/monero/files
diff options
context:
space:
mode:
authorBertrand Jacquin <bertrand@jacquin.bzh>2020-08-15 21:59:58 +0100
committerBertrand Jacquin <bertrand@jacquin.bzh>2020-10-18 00:21:12 +0100
commitd7ddba421c884c0c7a31bbe958970ba736cd6e72 (patch)
tree94898e245c3d62d0fa7601c8558f9df355e41b4a /net-p2p/monero/files
parentdev-libs/randomx: version bump (diff)
downloadportage-d7ddba421c884c0c7a31bbe958970ba736cd6e72.tar.xz
net-p2p/monero: version bump
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Diffstat (limited to 'net-p2p/monero/files')
-rw-r--r--net-p2p/monero/files/0.16.0.1-Do-not-install-trezor-dep-libs.patch25
-rw-r--r--net-p2p/monero/files/0.16.0.1-Drop-in-tree-miniupnpc.patch57
-rw-r--r--net-p2p/monero/files/0.16.0.1-Use-gentoo-dev-libs-randomx.patch18
-rw-r--r--net-p2p/monero/files/0.16.0.1-Use-gentoo-versioning.patch37
-rw-r--r--net-p2p/monero/files/0.16.0.1-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch46
-rw-r--r--net-p2p/monero/files/0.16.0.1-translations-use-host-compiler.patch30
-rw-r--r--net-p2p/monero/files/0.16.0.3-Do-not-install-trezor-dep-libs.patch (renamed from net-p2p/monero/files/0.16.0.0-Do-not-install-trezor-dep-libs.patch)0
-rw-r--r--net-p2p/monero/files/0.16.0.3-Drop-in-tree-miniupnpc.patch (renamed from net-p2p/monero/files/0.16.0.0-Drop-in-tree-miniupnpc.patch)0
-rw-r--r--net-p2p/monero/files/0.16.0.3-Use-gentoo-dev-libs-randomx.patch (renamed from net-p2p/monero/files/0.16.0.0-Use-gentoo-dev-libs-randomx.patch)0
-rw-r--r--net-p2p/monero/files/0.16.0.3-Use-gentoo-versioning.patch (renamed from net-p2p/monero/files/0.16.0.0-Use-gentoo-versioning.patch)0
-rw-r--r--net-p2p/monero/files/0.16.0.3-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch (renamed from net-p2p/monero/files/0.16.0.0-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch)0
-rw-r--r--net-p2p/monero/files/0.16.0.3-translations-use-host-compiler.patch (renamed from net-p2p/monero/files/0.16.0.0-translations-use-host-compiler.patch)0
12 files changed, 0 insertions, 213 deletions
diff --git a/net-p2p/monero/files/0.16.0.1-Do-not-install-trezor-dep-libs.patch b/net-p2p/monero/files/0.16.0.1-Do-not-install-trezor-dep-libs.patch
deleted file mode 100644
index d7aebe27..00000000
--- a/net-p2p/monero/files/0.16.0.1-Do-not-install-trezor-dep-libs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b5d4c4405a038e63c1cf1bd0f84e041ca35ed5bb 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 a0a166a93bb9..64a10e8b913b 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/0.16.0.1-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/0.16.0.1-Drop-in-tree-miniupnpc.patch
deleted file mode 100644
index 73a1944f..00000000
--- a/net-p2p/monero/files/0.16.0.1-Drop-in-tree-miniupnpc.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 7b6c08d5dac6e4b42e81692e2d5297a213c75e04 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 71b165f4f166..072a26d19586 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 f8c177e3a99c..6ab425fd1d75 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 <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/0.16.0.1-Use-gentoo-dev-libs-randomx.patch b/net-p2p/monero/files/0.16.0.1-Use-gentoo-dev-libs-randomx.patch
deleted file mode 100644
index 598dcc88..00000000
--- a/net-p2p/monero/files/0.16.0.1-Use-gentoo-dev-libs-randomx.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 0a8fea3234d80c7b7bc73f47181e1d72dea448ff 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 072a26d19586..10189ce3a2fb 100644
---- a/external/CMakeLists.txt
-+++ b/external/CMakeLists.txt
-@@ -70,4 +70,3 @@ endif()
-
- add_subdirectory(db_drivers)
- add_subdirectory(easylogging++)
--add_subdirectory(randomx EXCLUDE_FROM_ALL)
diff --git a/net-p2p/monero/files/0.16.0.1-Use-gentoo-versioning.patch b/net-p2p/monero/files/0.16.0.1-Use-gentoo-versioning.patch
deleted file mode 100644
index e4280f4e..00000000
--- a/net-p2p/monero/files/0.16.0.1-Use-gentoo-versioning.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7e4e6cab0c98aa7fc1fa2ffd811885fd5e27ddba 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 26c2e2a1d447..d595b8293e1b 100644
---- a/cmake/Version.cmake
-+++ b/cmake/Version.cmake
-@@ -31,20 +31,8 @@ function (write_version tag)
- 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.
-- 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/0.16.0.1-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch b/net-p2p/monero/files/0.16.0.1-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch
deleted file mode 100644
index 941f4745..00000000
--- a/net-p2p/monero/files/0.16.0.1-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c62ddad29e57e5c7c535e860bc58db503bfcd8b7 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Sat, 30 Nov 2019 03:25:11 +0000
-Subject: [PATCH] https://sourceware.org/bugzilla/show_bug.cgi?id=25210
-
----
- CMakeLists.txt | 19 -------------------
- 1 file changed, 19 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 882bc96c56a2..2cb9c040634d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -716,11 +716,6 @@ else()
- CHECK_CXX_ACCEPTS_FLAG(-mfloat-abi=softfp CXX_ACCEPTS_MFLOAT_SOFTFP)
- endif()
-
-- if(ARM8)
-- CHECK_CXX_ACCEPTS_FLAG(-mfix-cortex-a53-835769 CXX_ACCEPTS_MFIX_CORTEX_A53_835769)
-- CHECK_CXX_ACCEPTS_FLAG(-mfix-cortex-a53-843419 CXX_ACCEPTS_MFIX_CORTEX_A53_843419)
-- endif()
--
- if(ARM6)
- message(STATUS "Selecting VFP for ARMv6")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=vfp")
-@@ -757,20 +752,6 @@ else()
- endif()
- endif(ARM7)
-
-- if(ARM8)
-- if(CXX_ACCEPTS_MFIX_CORTEX_A53_835769)
-- message(STATUS "Enabling Cortex-A53 workaround 835769")
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfix-cortex-a53-835769")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfix-cortex-a53-835769")
-- endif()
--
-- if(CXX_ACCEPTS_MFIX_CORTEX_A53_843419)
-- message(STATUS "Enabling Cortex-A53 workaround 843419")
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfix-cortex-a53-843419")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfix-cortex-a53-843419")
-- endif()
-- endif(ARM8)
--
- endif(ARM)
-
- if(ANDROID AND NOT BUILD_GUI_DEPS STREQUAL "ON" OR IOS)
diff --git a/net-p2p/monero/files/0.16.0.1-translations-use-host-compiler.patch b/net-p2p/monero/files/0.16.0.1-translations-use-host-compiler.patch
deleted file mode 100644
index 1dd1af02..00000000
--- a/net-p2p/monero/files/0.16.0.1-translations-use-host-compiler.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f5670abe068eb90650533ff64a354568ab47b84a 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 | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d9ec866e49ec..882bc96c56a2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -453,7 +453,12 @@ 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_C_COMPILER=$ENV{BUILD_CC}
-+ -DCMAKE_CXX_COMPILER=$ENV{BUILD_CXX}
-+ -DCMAKE_C_FLAGS=$ENV{BUILD_CFLAGS}
-+ -DCMAKE_CXX_FLAGS=$ENV{BUILD_CXXFLAGS}
-+ -DLRELEASE_PATH=${LRELEASE_PATH}
- INSTALL_COMMAND cmake -E echo "")
- include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
- add_subdirectory(external)
diff --git a/net-p2p/monero/files/0.16.0.0-Do-not-install-trezor-dep-libs.patch b/net-p2p/monero/files/0.16.0.3-Do-not-install-trezor-dep-libs.patch
index d7aebe27..d7aebe27 100644
--- a/net-p2p/monero/files/0.16.0.0-Do-not-install-trezor-dep-libs.patch
+++ b/net-p2p/monero/files/0.16.0.3-Do-not-install-trezor-dep-libs.patch
diff --git a/net-p2p/monero/files/0.16.0.0-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/0.16.0.3-Drop-in-tree-miniupnpc.patch
index 73a1944f..73a1944f 100644
--- a/net-p2p/monero/files/0.16.0.0-Drop-in-tree-miniupnpc.patch
+++ b/net-p2p/monero/files/0.16.0.3-Drop-in-tree-miniupnpc.patch
diff --git a/net-p2p/monero/files/0.16.0.0-Use-gentoo-dev-libs-randomx.patch b/net-p2p/monero/files/0.16.0.3-Use-gentoo-dev-libs-randomx.patch
index 598dcc88..598dcc88 100644
--- a/net-p2p/monero/files/0.16.0.0-Use-gentoo-dev-libs-randomx.patch
+++ b/net-p2p/monero/files/0.16.0.3-Use-gentoo-dev-libs-randomx.patch
diff --git a/net-p2p/monero/files/0.16.0.0-Use-gentoo-versioning.patch b/net-p2p/monero/files/0.16.0.3-Use-gentoo-versioning.patch
index e4280f4e..e4280f4e 100644
--- a/net-p2p/monero/files/0.16.0.0-Use-gentoo-versioning.patch
+++ b/net-p2p/monero/files/0.16.0.3-Use-gentoo-versioning.patch
diff --git a/net-p2p/monero/files/0.16.0.0-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch b/net-p2p/monero/files/0.16.0.3-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch
index 941f4745..941f4745 100644
--- a/net-p2p/monero/files/0.16.0.0-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch
+++ b/net-p2p/monero/files/0.16.0.3-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch
diff --git a/net-p2p/monero/files/0.16.0.0-translations-use-host-compiler.patch b/net-p2p/monero/files/0.16.0.3-translations-use-host-compiler.patch
index 1dd1af02..1dd1af02 100644
--- a/net-p2p/monero/files/0.16.0.0-translations-use-host-compiler.patch
+++ b/net-p2p/monero/files/0.16.0.3-translations-use-host-compiler.patch