diff options
Diffstat (limited to '')
-rw-r--r-- | net-p2p/monero/files/monero-0.17.1.1-Do-not-install-trezor-dep-libs.patch (renamed from net-p2p/monero/files/monero-0.17.1.0-Do-not-install-trezor-dep-libs.patch) | 2 | ||||
-rw-r--r-- | net-p2p/monero/files/monero-0.17.1.1-Drop-in-tree-miniupnpc.patch (renamed from net-p2p/monero/files/monero-0.17.1.0-Drop-in-tree-miniupnpc.patch) | 4 | ||||
-rw-r--r-- | net-p2p/monero/files/monero-0.17.1.1-Use-gentoo-dev-libs-randomx.patch (renamed from net-p2p/monero/files/monero-0.17.1.0-Use-gentoo-dev-libs-randomx.patch) | 2 | ||||
-rw-r--r-- | net-p2p/monero/files/monero-0.17.1.1-Use-gentoo-versioning.patch (renamed from net-p2p/monero/files/monero-0.17.1.0-Use-gentoo-versioning.patch) | 6 | ||||
-rw-r--r-- | net-p2p/monero/files/monero-0.17.1.1-translations-use-host-compiler.patch (renamed from net-p2p/monero/files/monero-0.17.1.0-translations-use-host-compiler.patch) | 4 | ||||
-rw-r--r-- | net-p2p/monero/files/monero-gui-0.17.1.0-cmake-fix-install-targets.patch | 32 | ||||
-rw-r--r-- | net-p2p/monero/files/monero-gui-0.17.1.0-wallet-set-right-signedness.patch | 34 | ||||
-rw-r--r-- | net-p2p/monero/files/monero-gui-0.17.1.1-cmake-remove-Werror.patch (renamed from net-p2p/monero/files/monero-gui-0.17.1.0-cmake-remove-Werror.patch) | 0 | ||||
-rw-r--r-- | net-p2p/monero/files/monero-gui-0.17.1.1-cmake-use-gentoo-versioning.patch (renamed from net-p2p/monero/files/monero-gui-0.17.1.0-cmake-use-gentoo-versioning.patch) | 0 | ||||
-rw-r--r-- | net-p2p/monero/monero-0.17.1.1.ebuild (renamed from net-p2p/monero/monero-0.17.1.0.ebuild) | 2 |
10 files changed, 9 insertions, 77 deletions
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.1-Do-not-install-trezor-dep-libs.patch index 801c375a..9f00b14a 100644 --- 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.1-Do-not-install-trezor-dep-libs.patch @@ -1,4 +1,4 @@ -From 14aecf88d701518399af041889d4ad53f85a9cbc Mon Sep 17 00:00:00 2001 +From dcf248f63e8a932cd48d0c0941faa3b48c551011 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 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.1-Drop-in-tree-miniupnpc.patch index cbb3a7f9..ee2b9b64 100644 --- a/net-p2p/monero/files/monero-0.17.1.0-Drop-in-tree-miniupnpc.patch +++ b/net-p2p/monero/files/monero-0.17.1.1-Drop-in-tree-miniupnpc.patch @@ -1,4 +1,4 @@ -From d4f31b840cf82c0d055a12df838544255f25ba26 Mon Sep 17 00:00:00 2001 +From 05f4db1c0256cc12b7233208d62b8218ea98d14c 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 @@ -39,7 +39,7 @@ index a8916a7d00d4..1db18e2431e6 100644 find_package(Unbound) diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl -index 175741146098..088b582f788a 100644 +index aa16e93d5939..9f51639edbdd 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -60,9 +60,9 @@ 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.1-Use-gentoo-dev-libs-randomx.patch index f6540042..a0c30347 100644 --- 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.1-Use-gentoo-dev-libs-randomx.patch @@ -1,4 +1,4 @@ -From e0bf6d9ff80418cf9b024f2a27a0f65ef40bc82c Mon Sep 17 00:00:00 2001 +From 33f0cd8a1323f537fe8721e5021423aa716f9b3a 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 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.1-Use-gentoo-versioning.patch index bfb6896a..9e8331d7 100644 --- a/net-p2p/monero/files/monero-0.17.1.0-Use-gentoo-versioning.patch +++ b/net-p2p/monero/files/monero-0.17.1.1-Use-gentoo-versioning.patch @@ -1,4 +1,4 @@ -From aabcbb13533d27eadf38991de0071ca489f1b299 Mon Sep 17 00:00:00 2001 +From e9da57769285e9a8a73ae3509cb85fcbe5ff1b29 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 @@ -8,11 +8,11 @@ Subject: [PATCH] Use gentoo versioning 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/cmake/Version.cmake b/cmake/Version.cmake -index a6c13ab6ca86..8d0fe9147622 100644 +index 707d7263958a..e6386339d720 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") + configure_file("${CMAKE_CURRENT_LIST_DIR}/../src/version.cpp.in" "${CMAKE_BINARY_DIR}/version.cpp") endfunction () -find_package(Git QUIET) 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.1-translations-use-host-compiler.patch index b3ae7d7d..ac9d7da8 100644 --- a/net-p2p/monero/files/monero-0.17.1.0-translations-use-host-compiler.patch +++ b/net-p2p/monero/files/monero-0.17.1.1-translations-use-host-compiler.patch @@ -1,4 +1,4 @@ -From 076e09cffce6c184ea75d4a3e7db61102215e52e Mon Sep 17 00:00:00 2001 +From ea1400129fa76ea66acc48e2a2f3ca1acb64711e 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 @@ -11,7 +11,7 @@ compiler flags 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2a16e00817e6..0eb2a5089248 100644 +index 41f82e26c2ec..63c6f2d4f5fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -468,7 +468,12 @@ ExternalProject_Add(generate_translations_header 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 deleted file mode 100644 index 849fc32d..00000000 --- a/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-fix-install-targets.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 44df1bccfc69f8390fd405828d469a250f5397a2 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -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-wallet-set-right-signedness.patch b/net-p2p/monero/files/monero-gui-0.17.1.0-wallet-set-right-signedness.patch deleted file mode 100644 index 79d5b98c..00000000 --- a/net-p2p/monero/files/monero-gui-0.17.1.0-wallet-set-right-signedness.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fb802658e2205f6829f966b27455c000e6094529 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -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<std::chrono::seconds>(now - last).count(); -+ const size_t elapsed = std::chrono::duration_cast<std::chrono::seconds>(now - last).count(); - if (elapsed >= refreshIntervalSec) - { - refresh(false); 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.1-cmake-remove-Werror.patch index b7c19692..b7c19692 100644 --- 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.1-cmake-remove-Werror.patch 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.1-cmake-use-gentoo-versioning.patch index e20fb6f4..e20fb6f4 100644 --- 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.1-cmake-use-gentoo-versioning.patch diff --git a/net-p2p/monero/monero-0.17.1.0.ebuild b/net-p2p/monero/monero-0.17.1.1.ebuild index 33186f67..da8cca4c 100644 --- a/net-p2p/monero/monero-0.17.1.0.ebuild +++ b/net-p2p/monero/monero-0.17.1.1.ebuild @@ -75,8 +75,6 @@ PATCHES_MONERO=( PATCHES_MONERO_GUI=( "${FILESDIR}/monero-gui-${PV}-cmake-remove-Werror.patch" - "${FILESDIR}/monero-gui-${PV}-wallet-set-right-signedness.patch" - "${FILESDIR}/monero-gui-${PV}-cmake-fix-install-targets.patch" "${FILESDIR}/monero-gui-${PV}-cmake-use-gentoo-versioning.patch" ) |