From 9bc468e080d131f2279fd516c7decc87e79a3e07 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Mon, 28 Sep 2020 20:27:25 +0100 Subject: net-p2p/monero: version bump Package-Manager: Portage-3.0.4, Repoman-3.0.1 --- .../0.16.0.3-Do-not-install-trezor-dep-libs.patch | 25 ---------- .../files/0.16.0.3-Drop-in-tree-miniupnpc.patch | 57 ---------------------- .../0.16.0.3-Use-gentoo-dev-libs-randomx.patch | 18 ------- .../files/0.16.0.3-Use-gentoo-versioning.patch | 37 -------------- ...ceware.org-bugzilla-show_bug.cgi-id-25210.patch | 46 ----------------- .../0.16.0.3-translations-use-host-compiler.patch | 30 ------------ .../0.17.0.0-Do-not-install-trezor-dep-libs.patch | 25 ---------- .../files/0.17.0.0-Drop-in-tree-miniupnpc.patch | 57 ---------------------- .../0.17.0.0-Use-gentoo-dev-libs-randomx.patch | 18 ------- .../files/0.17.0.0-Use-gentoo-versioning.patch | 37 -------------- .../0.17.0.0-translations-use-host-compiler.patch | 30 ------------ ...o-0.17.1.0-Do-not-install-trezor-dep-libs.patch | 25 ++++++++++ .../monero-0.17.1.0-Drop-in-tree-miniupnpc.patch | 57 ++++++++++++++++++++++ ...nero-0.17.1.0-Use-gentoo-dev-libs-randomx.patch | 18 +++++++ .../monero-0.17.1.0-Use-gentoo-versioning.patch | 37 ++++++++++++++ ...o-0.17.1.0-translations-use-host-compiler.patch | 30 ++++++++++++ ...ro-gui-0.17.1.0-cmake-fix-install-targets.patch | 32 ++++++++++++ .../monero-gui-0.17.1.0-cmake-remove-Werror.patch | 39 +++++++++++++++ ...-gui-0.17.1.0-cmake-use-gentoo-versioning.patch | 35 +++++++++++++ ...-gui-0.17.1.0-wallet-set-right-signedness.patch | 34 +++++++++++++ 20 files changed, 307 insertions(+), 380 deletions(-) delete mode 100644 net-p2p/monero/files/0.16.0.3-Do-not-install-trezor-dep-libs.patch delete mode 100644 net-p2p/monero/files/0.16.0.3-Drop-in-tree-miniupnpc.patch delete mode 100644 net-p2p/monero/files/0.16.0.3-Use-gentoo-dev-libs-randomx.patch delete mode 100644 net-p2p/monero/files/0.16.0.3-Use-gentoo-versioning.patch delete mode 100644 net-p2p/monero/files/0.16.0.3-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch delete mode 100644 net-p2p/monero/files/0.16.0.3-translations-use-host-compiler.patch delete mode 100644 net-p2p/monero/files/0.17.0.0-Do-not-install-trezor-dep-libs.patch delete mode 100644 net-p2p/monero/files/0.17.0.0-Drop-in-tree-miniupnpc.patch delete mode 100644 net-p2p/monero/files/0.17.0.0-Use-gentoo-dev-libs-randomx.patch delete mode 100644 net-p2p/monero/files/0.17.0.0-Use-gentoo-versioning.patch delete mode 100644 net-p2p/monero/files/0.17.0.0-translations-use-host-compiler.patch create mode 100644 net-p2p/monero/files/monero-0.17.1.0-Do-not-install-trezor-dep-libs.patch create mode 100644 net-p2p/monero/files/monero-0.17.1.0-Drop-in-tree-miniupnpc.patch create mode 100644 net-p2p/monero/files/monero-0.17.1.0-Use-gentoo-dev-libs-randomx.patch create mode 100644 net-p2p/monero/files/monero-0.17.1.0-Use-gentoo-versioning.patch create mode 100644 net-p2p/monero/files/monero-0.17.1.0-translations-use-host-compiler.patch create mode 100644 net-p2p/monero/files/monero-gui-0.17.1.0-cmake-fix-install-targets.patch create mode 100644 net-p2p/monero/files/monero-gui-0.17.1.0-cmake-remove-Werror.patch create mode 100644 net-p2p/monero/files/monero-gui-0.17.1.0-cmake-use-gentoo-versioning.patch create mode 100644 net-p2p/monero/files/monero-gui-0.17.1.0-wallet-set-right-signedness.patch (limited to 'net-p2p/monero/files') diff --git a/net-p2p/monero/files/0.16.0.3-Do-not-install-trezor-dep-libs.patch b/net-p2p/monero/files/0.16.0.3-Do-not-install-trezor-dep-libs.patch deleted file mode 100644 index d7aebe27..00000000 --- a/net-p2p/monero/files/0.16.0.3-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 -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.3-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/0.16.0.3-Drop-in-tree-miniupnpc.patch deleted file mode 100644 index 73a1944f..00000000 --- a/net-p2p/monero/files/0.16.0.3-Drop-in-tree-miniupnpc.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 7b6c08d5dac6e4b42e81692e2d5297a213c75e04 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 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 --#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.16.0.3-Use-gentoo-dev-libs-randomx.patch b/net-p2p/monero/files/0.16.0.3-Use-gentoo-dev-libs-randomx.patch deleted file mode 100644 index 598dcc88..00000000 --- a/net-p2p/monero/files/0.16.0.3-Use-gentoo-dev-libs-randomx.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 0a8fea3234d80c7b7bc73f47181e1d72dea448ff Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -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.3-Use-gentoo-versioning.patch b/net-p2p/monero/files/0.16.0.3-Use-gentoo-versioning.patch deleted file mode 100644 index e4280f4e..00000000 --- a/net-p2p/monero/files/0.16.0.3-Use-gentoo-versioning.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7e4e6cab0c98aa7fc1fa2ffd811885fd5e27ddba 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 | 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.3-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 deleted file mode 100644 index 941f4745..00000000 --- a/net-p2p/monero/files/0.16.0.3-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 -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.3-translations-use-host-compiler.patch b/net-p2p/monero/files/0.16.0.3-translations-use-host-compiler.patch deleted file mode 100644 index 1dd1af02..00000000 --- a/net-p2p/monero/files/0.16.0.3-translations-use-host-compiler.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f5670abe068eb90650533ff64a354568ab47b84a Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -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.17.0.0-Do-not-install-trezor-dep-libs.patch b/net-p2p/monero/files/0.17.0.0-Do-not-install-trezor-dep-libs.patch deleted file mode 100644 index 801c375a..00000000 --- a/net-p2p/monero/files/0.17.0.0-Do-not-install-trezor-dep-libs.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 14aecf88d701518399af041889d4ad53f85a9cbc 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 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/0.17.0.0-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/0.17.0.0-Drop-in-tree-miniupnpc.patch deleted file mode 100644 index cbb3a7f9..00000000 --- a/net-p2p/monero/files/0.17.0.0-Drop-in-tree-miniupnpc.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d4f31b840cf82c0d055a12df838544255f25ba26 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 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 175741146098..088b582f788a 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.17.0.0-Use-gentoo-dev-libs-randomx.patch b/net-p2p/monero/files/0.17.0.0-Use-gentoo-dev-libs-randomx.patch deleted file mode 100644 index f6540042..00000000 --- a/net-p2p/monero/files/0.17.0.0-Use-gentoo-dev-libs-randomx.patch +++ /dev/null @@ -1,18 +0,0 @@ -From e0bf6d9ff80418cf9b024f2a27a0f65ef40bc82c Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -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/0.17.0.0-Use-gentoo-versioning.patch b/net-p2p/monero/files/0.17.0.0-Use-gentoo-versioning.patch deleted file mode 100644 index bfb6896a..00000000 --- a/net-p2p/monero/files/0.17.0.0-Use-gentoo-versioning.patch +++ /dev/null @@ -1,37 +0,0 @@ -From aabcbb13533d27eadf38991de0071ca489f1b299 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 | 18 +++--------------- - 1 file changed, 3 insertions(+), 15 deletions(-) - -diff --git a/cmake/Version.cmake b/cmake/Version.cmake -index a6c13ab6ca86..8d0fe9147622 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.17.0.0-translations-use-host-compiler.patch b/net-p2p/monero/files/0.17.0.0-translations-use-host-compiler.patch deleted file mode 100644 index b3ae7d7d..00000000 --- a/net-p2p/monero/files/0.17.0.0-translations-use-host-compiler.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 076e09cffce6c184ea75d4a3e7db61102215e52e Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -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 2a16e00817e6..0eb2a5089248 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -468,7 +468,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/monero-0.17.1.0-Do-not-install-trezor-dep-libs.patch b/net-p2p/monero/files/monero-0.17.1.0-Do-not-install-trezor-dep-libs.patch new file mode 100644 index 00000000..801c375a --- /dev/null +++ b/net-p2p/monero/files/monero-0.17.1.0-Do-not-install-trezor-dep-libs.patch @@ -0,0 +1,25 @@ +From 14aecf88d701518399af041889d4ad53f85a9cbc 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 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.1.0-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/monero-0.17.1.0-Drop-in-tree-miniupnpc.patch new file mode 100644 index 00000000..cbb3a7f9 --- /dev/null +++ b/net-p2p/monero/files/monero-0.17.1.0-Drop-in-tree-miniupnpc.patch @@ -0,0 +1,57 @@ +From d4f31b840cf82c0d055a12df838544255f25ba26 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 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 175741146098..088b582f788a 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/monero-0.17.1.0-Use-gentoo-dev-libs-randomx.patch b/net-p2p/monero/files/monero-0.17.1.0-Use-gentoo-dev-libs-randomx.patch new file mode 100644 index 00000000..f6540042 --- /dev/null +++ b/net-p2p/monero/files/monero-0.17.1.0-Use-gentoo-dev-libs-randomx.patch @@ -0,0 +1,18 @@ +From e0bf6d9ff80418cf9b024f2a27a0f65ef40bc82c Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +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.1.0-Use-gentoo-versioning.patch b/net-p2p/monero/files/monero-0.17.1.0-Use-gentoo-versioning.patch new file mode 100644 index 00000000..bfb6896a --- /dev/null +++ b/net-p2p/monero/files/monero-0.17.1.0-Use-gentoo-versioning.patch @@ -0,0 +1,37 @@ +From aabcbb13533d27eadf38991de0071ca489f1b299 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 | 18 +++--------------- + 1 file changed, 3 insertions(+), 15 deletions(-) + +diff --git a/cmake/Version.cmake b/cmake/Version.cmake +index a6c13ab6ca86..8d0fe9147622 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/monero-0.17.1.0-translations-use-host-compiler.patch b/net-p2p/monero/files/monero-0.17.1.0-translations-use-host-compiler.patch new file mode 100644 index 00000000..b3ae7d7d --- /dev/null +++ b/net-p2p/monero/files/monero-0.17.1.0-translations-use-host-compiler.patch @@ -0,0 +1,30 @@ +From 076e09cffce6c184ea75d4a3e7db61102215e52e Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +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 2a16e00817e6..0eb2a5089248 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -468,7 +468,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/monero-gui-0.17.1.0-cmake-fix-install-targets.patch b/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-fix-install-targets.patch new file mode 100644 index 00000000..849fc32d --- /dev/null +++ b/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-fix-install-targets.patch @@ -0,0 +1,32 @@ +From 44df1bccfc69f8390fd405828d469a250f5397a2 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Sat, 17 Oct 2020 22:49:17 +0100 +Subject: [PATCH] cmake: fix install targets + +Binary should be installed in bin/ relative to CMAKE_INSTALL_PREFIX, +prior to this commit, monero-wallet-gui is installed in usr/ instead of +usr/bin + + -- Installing: image/usr/monero-wallet-gui + +With this comment, file is installed in the right location: + + -- Installing: image/usr/bin/monero-wallet-gui + +See: https://cmake.org/cmake/help/latest/command/install.html +See: https://github.com/monero-project/monero-gui/pull/3172 +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c7822ee7690e..b3f7fa4aaed3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -178,5 +178,5 @@ add_custom_command(TARGET monero-wallet-gui POST_BUILD COMMAND ${CMAKE_COMMAND} + include(Deploy) + + install(TARGETS monero-wallet-gui +- DESTINATION ${CMAKE_INSTALL_PREFIX} ++ DESTINATION bin + ) diff --git a/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-remove-Werror.patch b/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-remove-Werror.patch new file mode 100644 index 00000000..b7c19692 --- /dev/null +++ b/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-remove-Werror.patch @@ -0,0 +1,39 @@ +From fbaf0c4b21fb5390758311ff70644623b6697bf2 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +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 -- + monero-wallet-gui.pro | 4 ++-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 197e7c301120..a865ec4fa922 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -422,8 +422,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/monero-wallet-gui.pro b/monero-wallet-gui.pro +index 271786236b98..49506e09e9e2 100644 +--- a/monero-wallet-gui.pro ++++ b/monero-wallet-gui.pro +@@ -187,8 +187,8 @@ android { + + + +-QMAKE_CXXFLAGS += -Werror -Wformat -Wformat-security +-QMAKE_CFLAGS += -Werror -Wformat -Wformat-security ++QMAKE_CXXFLAGS += -Wformat -Wformat-security ++QMAKE_CFLAGS += -Wformat -Wformat-security + QMAKE_CXXFLAGS_RELEASE += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -O2 + QMAKE_CFLAGS_RELEASE += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -O2 + diff --git a/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-use-gentoo-versioning.patch b/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-use-gentoo-versioning.patch new file mode 100644 index 00000000..e20fb6f4 --- /dev/null +++ b/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-use-gentoo-versioning.patch @@ -0,0 +1,35 @@ +From 5a4a63dbf9608c82c1cf18e0abc529d2a9ac5258 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +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..ef1af288495d 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") diff --git a/net-p2p/monero/files/monero-gui-0.17.1.0-wallet-set-right-signedness.patch b/net-p2p/monero/files/monero-gui-0.17.1.0-wallet-set-right-signedness.patch new file mode 100644 index 00000000..79d5b98c --- /dev/null +++ b/net-p2p/monero/files/monero-gui-0.17.1.0-wallet-set-right-signedness.patch @@ -0,0 +1,34 @@ +From fb802658e2205f6829f966b27455c000e6094529 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Sat, 17 Oct 2020 13:54:01 +0100 +Subject: [PATCH] wallet: set right signedness + +libwalletqt fails to build with gcc 9.3.0 and QT 5.14.2 with the +following error + + x86_64-pc-linux-gnu-g++ -c -march=native -O2 -pipe -fomit-frame-pointer -I/var/tmp/portage/net-p2p/monero-gui-0.17.1.0/work/monero-0.17.1.0/src -I/var/tmp/portage/net-p2p/monero-gui-0.17.1.0/work/monero-0.17.1.0/contrib/epee/include -I/var/tmp/portage/net-p2p/monero-gui-0.17.1.0/work/monero-0.17.1.0/external/easylogging++ -fPIC -fstack-protector -fstack-protector-strong -Werror -Wformat -Wformat-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -O2 -std=gnu++11 -pthread -Wall -Wextra -D_REENTRANT -fPIC -DWITH_SCANNER -DQT_NO_DEBUG -DQT_SVG_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_MULTIMEDIA_LIB -DQT_GUI_LIB -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -I. -I/var/tmp/portage/net-p2p/monero-gui-0.17.1.0/work/monero-gui-0.17.1.0/monero/include -Isrc/libwalletqt -I/var/tmp/portage/net-p2p/monero-gui-0.17.1.0/work/monero-gui-0.17.1.0/src/QR-Code-generator -Isrc -I/var/tmp/portage/net-p2p/monero-gui-0.17.1.0/work/monero-gui-0.17.1.0/monero/src -I/var/tmp/portage/net-p2p/monero-gui-0.17.1.0/work/monero-gui-0.17.1.0/monero/external/easylogging++ -I/var/tmp/portage/net-p2p/monero-gui-0.17.1.0/work/monero-gui-0.17.1.0/monero/contrib/epee/include -Isrc/QR-Code-scanner -isystem /usr/include/libusb-1.0 -isystem /usr/include/hidapi -isystem /usr/include/qt5 -isystem /usr/include/qt5/QtSvg -isystem /usr/include/qt5/QtWidgets -isystem /usr/include/qt5/QtGui/5.14.2 -isystem /usr/include/qt5/QtGui/5.14.2/QtGui -isystem /usr/include/qt5/QtQuick -isystem /usr/include/qt5/QtMultimedia -isystem /usr/include/qt5/QtGui -isystem /usr/include/qt5/QtQmlModels -isystem /usr/include/qt5/QtQml -isystem /usr/include/qt5/QtNetwork -isystem /usr/include/qt5/QtCore/5.14.2 -isystem /usr/include/qt5/QtCore/5.14.2/QtCore -isystem /usr/include/qt5/QtCore -I. -I/usr/lib64/qt5/mkspecs/linux-g++ -o Wallet.o src/libwalletqt/Wallet.cpp + src/libwalletqt/Wallet.cpp: In lambda function: + src/libwalletqt/Wallet.cpp:1129:29: error: comparison of integer expressions of different signedness: 'const long int' and 'const size_t' {aka 'const long unsigned int'} [-Werror=sign-compare] + 1129 | if (elapsed >= refreshIntervalSec) + | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~ + cc1plus: all warnings being treated as errors + make: *** [Makefile:1934: Wallet.o] Error 1 + +See: https://github.com/monero-project/monero-gui/pull/3173 +--- + src/libwalletqt/Wallet.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp +index 454dca29b23f..93156c2b7b3d 100644 +--- a/src/libwalletqt/Wallet.cpp ++++ b/src/libwalletqt/Wallet.cpp +@@ -1125,7 +1125,7 @@ void Wallet::startRefreshThread() + if (m_refreshEnabled) + { + const auto now = std::chrono::steady_clock::now(); +- const auto elapsed = std::chrono::duration_cast(now - last).count(); ++ const size_t elapsed = std::chrono::duration_cast(now - last).count(); + if (elapsed >= refreshIntervalSec) + { + refresh(false); -- cgit v1.2.3