From 9ed6844a68c84a1286ac0b241521d52aece4046a Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Mon, 13 Sep 2021 22:52:47 +0100 Subject: net-p2p/monero: version bump Package-Manager: Portage-3.0.20, Repoman-3.0.3 --- ...o-0.17.2.0-Do-not-install-trezor-dep-libs.patch | 25 ---------- .../monero-0.17.2.0-Drop-in-tree-miniupnpc.patch | 57 ---------------------- ...o-0.17.2.0-Fix-boost-1.76.0-compatibility.patch | 24 --------- ...nero-0.17.2.0-Use-gentoo-dev-libs-randomx.patch | 18 ------- .../monero-0.17.2.0-Use-gentoo-versioning.patch | 37 -------------- ...o-0.17.2.0-translations-use-host-compiler.patch | 43 ---------------- ...o-0.17.2.3-Do-not-install-trezor-dep-libs.patch | 25 ++++++++++ .../monero-0.17.2.3-Drop-in-tree-miniupnpc.patch | 57 ++++++++++++++++++++++ ...nero-0.17.2.3-Use-gentoo-dev-libs-randomx.patch | 18 +++++++ .../monero-0.17.2.3-Use-gentoo-versioning.patch | 37 ++++++++++++++ ...o-0.17.2.3-translations-use-host-compiler.patch | 43 ++++++++++++++++ .../monero-gui-0.17.2.0-cmake-remove-Werror.patch | 23 --------- ...-gui-0.17.2.0-cmake-use-gentoo-versioning.patch | 35 ------------- .../monero-gui-0.17.2.3-cmake-remove-Werror.patch | 23 +++++++++ ...-gui-0.17.2.3-cmake-use-gentoo-versioning.patch | 35 +++++++++++++ 15 files changed, 238 insertions(+), 262 deletions(-) delete mode 100644 net-p2p/monero/files/monero-0.17.2.0-Do-not-install-trezor-dep-libs.patch delete mode 100644 net-p2p/monero/files/monero-0.17.2.0-Drop-in-tree-miniupnpc.patch delete mode 100644 net-p2p/monero/files/monero-0.17.2.0-Fix-boost-1.76.0-compatibility.patch delete mode 100644 net-p2p/monero/files/monero-0.17.2.0-Use-gentoo-dev-libs-randomx.patch delete mode 100644 net-p2p/monero/files/monero-0.17.2.0-Use-gentoo-versioning.patch delete mode 100644 net-p2p/monero/files/monero-0.17.2.0-translations-use-host-compiler.patch create mode 100644 net-p2p/monero/files/monero-0.17.2.3-Do-not-install-trezor-dep-libs.patch create mode 100644 net-p2p/monero/files/monero-0.17.2.3-Drop-in-tree-miniupnpc.patch create mode 100644 net-p2p/monero/files/monero-0.17.2.3-Use-gentoo-dev-libs-randomx.patch create mode 100644 net-p2p/monero/files/monero-0.17.2.3-Use-gentoo-versioning.patch create mode 100644 net-p2p/monero/files/monero-0.17.2.3-translations-use-host-compiler.patch delete mode 100644 net-p2p/monero/files/monero-gui-0.17.2.0-cmake-remove-Werror.patch delete mode 100644 net-p2p/monero/files/monero-gui-0.17.2.0-cmake-use-gentoo-versioning.patch create mode 100644 net-p2p/monero/files/monero-gui-0.17.2.3-cmake-remove-Werror.patch create mode 100644 net-p2p/monero/files/monero-gui-0.17.2.3-cmake-use-gentoo-versioning.patch (limited to 'net-p2p/monero/files') diff --git a/net-p2p/monero/files/monero-0.17.2.0-Do-not-install-trezor-dep-libs.patch b/net-p2p/monero/files/monero-0.17.2.0-Do-not-install-trezor-dep-libs.patch deleted file mode 100644 index 9f00b14a..00000000 --- a/net-p2p/monero/files/monero-0.17.2.0-Do-not-install-trezor-dep-libs.patch +++ /dev/null @@ -1,25 +0,0 @@ -From dcf248f63e8a932cd48d0c0941faa3b48c551011 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.2.0-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/monero-0.17.2.0-Drop-in-tree-miniupnpc.patch deleted file mode 100644 index ee2b9b64..00000000 --- a/net-p2p/monero/files/monero-0.17.2.0-Drop-in-tree-miniupnpc.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 05f4db1c0256cc12b7233208d62b8218ea98d14c 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 aa16e93d5939..9f51639edbdd 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.2.0-Fix-boost-1.76.0-compatibility.patch b/net-p2p/monero/files/monero-0.17.2.0-Fix-boost-1.76.0-compatibility.patch deleted file mode 100644 index b0fdd457..00000000 --- a/net-p2p/monero/files/monero-0.17.2.0-Fix-boost-1.76.0-compatibility.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 44cc6d67620ff09dc0173ad8e6ada89d700ffd3e Mon Sep 17 00:00:00 2001 -From: loqs -Date: Sun, 23 May 2021 20:29:17 +0100 -Subject: [PATCH] Fix boost 1.76.0 compatibility - -Add missing header boost/mpl/contains.hpp -monero-project/monero/issues/7728 ---- - contrib/epee/include/storages/portable_storage.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/contrib/epee/include/storages/portable_storage.h b/contrib/epee/include/storages/portable_storage.h -index 655a2eb12cda..60f3e672fb55 100644 ---- a/contrib/epee/include/storages/portable_storage.h -+++ b/contrib/epee/include/storages/portable_storage.h -@@ -31,6 +31,8 @@ - #include "misc_log_ex.h" - #include "span.h" - -+#include -+ - namespace epee - { - class byte_slice; diff --git a/net-p2p/monero/files/monero-0.17.2.0-Use-gentoo-dev-libs-randomx.patch b/net-p2p/monero/files/monero-0.17.2.0-Use-gentoo-dev-libs-randomx.patch deleted file mode 100644 index a0c30347..00000000 --- a/net-p2p/monero/files/monero-0.17.2.0-Use-gentoo-dev-libs-randomx.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 33f0cd8a1323f537fe8721e5021423aa716f9b3a 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.2.0-Use-gentoo-versioning.patch b/net-p2p/monero/files/monero-0.17.2.0-Use-gentoo-versioning.patch deleted file mode 100644 index 9e8331d7..00000000 --- a/net-p2p/monero/files/monero-0.17.2.0-Use-gentoo-versioning.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e9da57769285e9a8a73ae3509cb85fcbe5ff1b29 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 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.0-translations-use-host-compiler.patch b/net-p2p/monero/files/monero-0.17.2.0-translations-use-host-compiler.patch deleted file mode 100644 index be4364df..00000000 --- a/net-p2p/monero/files/monero-0.17.2.0-translations-use-host-compiler.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 52f77ae211afe9e02717d1c47369d83cebe4ace3 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 | 4 +++- - translations/CMakeLists.txt | 4 ++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0c8d8dffb826..2889fd7f922f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -467,7 +467,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-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 new file mode 100644 index 00000000..96fede78 --- /dev/null +++ b/net-p2p/monero/files/monero-0.17.2.3-Do-not-install-trezor-dep-libs.patch @@ -0,0 +1,25 @@ +From bfdf47d264e23f31c72529058d4d724033ac1b4f 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.2.3-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/monero-0.17.2.3-Drop-in-tree-miniupnpc.patch new file mode 100644 index 00000000..f8f7036a --- /dev/null +++ b/net-p2p/monero/files/monero-0.17.2.3-Drop-in-tree-miniupnpc.patch @@ -0,0 +1,57 @@ +From 2998bbb7886f03771884a7d0405827cc1ecec48d 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 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 +-#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.2.3-Use-gentoo-dev-libs-randomx.patch b/net-p2p/monero/files/monero-0.17.2.3-Use-gentoo-dev-libs-randomx.patch new file mode 100644 index 00000000..02994f0d --- /dev/null +++ b/net-p2p/monero/files/monero-0.17.2.3-Use-gentoo-dev-libs-randomx.patch @@ -0,0 +1,18 @@ +From 19ee58c33daece28e198e058d3cd5a06501ef178 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.2.3-Use-gentoo-versioning.patch b/net-p2p/monero/files/monero-0.17.2.3-Use-gentoo-versioning.patch new file mode 100644 index 00000000..16cfb731 --- /dev/null +++ b/net-p2p/monero/files/monero-0.17.2.3-Use-gentoo-versioning.patch @@ -0,0 +1,37 @@ +From 885cd1e274b4d1cdc35dd4d20713fd21d6757885 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 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 new file mode 100644 index 00000000..847a6310 --- /dev/null +++ b/net-p2p/monero/files/monero-0.17.2.3-translations-use-host-compiler.patch @@ -0,0 +1,43 @@ +From 6e2719e0d44e052715642ec895e76d64b77809ce 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 | 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.0-cmake-remove-Werror.patch b/net-p2p/monero/files/monero-gui-0.17.2.0-cmake-remove-Werror.patch deleted file mode 100644 index dda8dbed..00000000 --- a/net-p2p/monero/files/monero-gui-0.17.2.0-cmake-remove-Werror.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 162a8cadf4270306f216becf0ade15ad9acc7916 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 -- - 1 file changed, 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ef6cbf1861f..8e45fdd66c99 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -453,8 +453,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.0-cmake-use-gentoo-versioning.patch b/net-p2p/monero/files/monero-gui-0.17.2.0-cmake-use-gentoo-versioning.patch deleted file mode 100644 index 201f461f..00000000 --- a/net-p2p/monero/files/monero-gui-0.17.2.0-cmake-use-gentoo-versioning.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c9ac85124e908625a2262b3cd4103687558a6fd9 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..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") 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 new file mode 100644 index 00000000..aa77b755 --- /dev/null +++ b/net-p2p/monero/files/monero-gui-0.17.2.3-cmake-remove-Werror.patch @@ -0,0 +1,23 @@ +From 398631d77701cd134a83094d66364bfc34c0456b 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 -- + 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 new file mode 100644 index 00000000..31aa7be3 --- /dev/null +++ b/net-p2p/monero/files/monero-gui-0.17.2.3-cmake-use-gentoo-versioning.patch @@ -0,0 +1,35 @@ +From 7296808739a756fa3a95d2ccc85e46bd8f0eb457 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..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") -- cgit v1.2.3