diff options
| author | Czarek Nakamoto <cyjan@mrcyjanek.net> | 2026-03-07 17:04:17 +0100 |
|---|---|---|
| committer | Czarek Nakamoto <cyjan@mrcyjanek.net> | 2026-03-07 17:04:17 +0100 |
| commit | 58468fc093d08f03ad5a4ccb26a8dc435cd848c4 (patch) | |
| tree | 83aed5e96fdf2d4cbed807923c5191e72c14362d /patches/wownero | |
| parent | a858a8aadfab418b6b284f19640f4c29b19678ef (diff) | |
all updated :o
Diffstat (limited to 'patches/wownero')
| -rw-r--r-- | patches/wownero/0003-store-crash-fix.patch | 2 | ||||
| -rw-r--r-- | patches/wownero/0006-UR-functions.patch | 7 | ||||
| -rw-r--r-- | patches/wownero/0007-add-dummy-device-for-ledger.patch | 8 | ||||
| -rw-r--r-- | patches/wownero/0008-polyseed.patch | 15 | ||||
| -rw-r--r-- | patches/wownero/0022-fix-remove-flaky-test.patch | 27 | ||||
| -rw-r--r-- | patches/wownero/0025-depends-remove-icu4c-monero-project-monero-8880.patch | 25 |
6 files changed, 80 insertions, 4 deletions
diff --git a/patches/wownero/0003-store-crash-fix.patch b/patches/wownero/0003-store-crash-fix.patch index 942dd4b..1bc6a4a 100644 --- a/patches/wownero/0003-store-crash-fix.patch +++ b/patches/wownero/0003-store-crash-fix.patch @@ -49,7 +49,7 @@ index 6f30d4b92..27b099b6d 160000 +++ b/external/randomwow @@ -1 +1 @@ -Subproject commit 6f30d4b924fecb231e5b683915cc75d18b3b5866 -+Subproject commit 27b099b6dd6fef6e17f58c6dfe00009e9c5df587 ++Subproject commit cd137b1ea7bb9f0bcb5e77b39a5c1e08ca4b4fed diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index af420569c..d53372fc9 100644 --- a/src/wallet/api/wallet.cpp diff --git a/patches/wownero/0006-UR-functions.patch b/patches/wownero/0006-UR-functions.patch index 7a4d779..b3cda8d 100644 --- a/patches/wownero/0006-UR-functions.patch +++ b/patches/wownero/0006-UR-functions.patch @@ -1022,6 +1022,13 @@ index a1d939a5a..e309cec5e 100644 bool import_key_images(std::vector<crypto::key_image> key_images, size_t offset=0, boost::optional<std::unordered_set<size_t>> selected_transfers=boost::none); bool import_key_images(signed_tx_set & signed_tx, size_t offset=0, bool only_selected_transfers=false); crypto::public_key get_tx_pub_key_from_received_outs(const tools::wallet2::transfer_details &td) const; +diff --git a/external/bc-ur b/external/bc-ur +new file mode 160000 +index 000000000..d82e7c753 +--- /dev/null ++++ b/external/bc-ur +@@ -0,0 +1 @@ ++Subproject commit d82e7c753e710b8000706dc3383b498438795208 -- 2.51.0 diff --git a/patches/wownero/0007-add-dummy-device-for-ledger.patch b/patches/wownero/0007-add-dummy-device-for-ledger.patch index 7fd3100..6f32873 100644 --- a/patches/wownero/0007-add-dummy-device-for-ledger.patch +++ b/patches/wownero/0007-add-dummy-device-for-ledger.patch @@ -149,7 +149,7 @@ new file mode 100644 index 000000000..f91e10651 --- /dev/null +++ b/src/device/device_io_dummy.cpp -@@ -0,0 +1,133 @@ +@@ -0,0 +1,135 @@ +// Copyright (c) 2017-2022, The Monero Project +// +// All rights reserved. @@ -192,6 +192,8 @@ index 000000000..f91e10651 + +#if defined(HIDAPI_DUMMY) && !defined(HAVE_HIDAPI) +#include <boost/scope_exit.hpp> ++#include <boost/chrono.hpp> ++#include <boost/thread.hpp> +#include "log.hpp" +#include "device_io_dummy.hpp" +#include "device_ledger.hpp" @@ -250,13 +252,13 @@ index 000000000..f91e10651 + MDEBUG("exchange(): waitsForDeviceSend"); + // NOTE: waitsForDeviceSend should be changed by external code + while (waitsForDeviceSend) { -+ std::this_thread::sleep_for(std::chrono::microseconds(1000)); ++ boost::this_thread::sleep_for(boost::chrono::milliseconds(1000)); + MDEBUG("exchange(): waitsForDeviceSend (still)"); + } + + MDEBUG("exchange(): waitsForDeviceReceive"); + while (waitsForDeviceReceive) { -+ std::this_thread::sleep_for(std::chrono::microseconds(1000)); ++ boost::this_thread::sleep_for(boost::chrono::milliseconds(1000)); + MDEBUG("exchange(): waitsForDeviceReceive (still)"); + } + diff --git a/patches/wownero/0008-polyseed.patch b/patches/wownero/0008-polyseed.patch index 69df1d5..aeb17b1 100644 --- a/patches/wownero/0008-polyseed.patch +++ b/patches/wownero/0008-polyseed.patch @@ -1441,6 +1441,21 @@ index e309cec5e..9c520fa99 100644 bool m_multisig; /*!< if > 1 spend secret key will not match spend public key */ uint32_t m_multisig_threshold; std::vector<crypto::public_key> m_multisig_signers; + +diff --git a/external/polyseed b/external/polyseed +new file mode 160000 +index 000000000..bd79f5014 +--- /dev/null ++++ b/external/polyseed +@@ -0,0 +1 @@ ++Subproject commit bd79f5014c331273357277ed8a3d756fb61b9fa1 +diff --git a/external/utf8proc b/external/utf8proc +new file mode 160000 +index 000000000..3de4596fb +--- /dev/null ++++ b/external/utf8proc +@@ -0,0 +1 @@ ++Subproject commit 3de4596fbe28956855df2ecb3c11c0bbc3535838 -- 2.51.0 diff --git a/patches/wownero/0022-fix-remove-flaky-test.patch b/patches/wownero/0022-fix-remove-flaky-test.patch new file mode 100644 index 0000000..4c70ca3 --- /dev/null +++ b/patches/wownero/0022-fix-remove-flaky-test.patch @@ -0,0 +1,27 @@ +From 3855cc39761321650484f5fba70c48dd8eb18444 Mon Sep 17 00:00:00 2001 +From: Czarek Nakamoto <cyjan@mrcyjanek.net> +Date: Thu, 5 Mar 2026 18:12:53 +0100 +Subject: [PATCH] fix: remove flaky test + +--- + CMakeLists.txt | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2525cf8ba..42189c0fe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -235,9 +235,7 @@ add_library(l3 OBJECT incorrect_source.cpp) + "-DCMAKE_MODULE_LINKER_FLAGS=${CMAKE_MODULE_LINKER_FLAGS}" + "-DEXPECT_SUCCESS=${EXPECT}" + ) +- if (NOT ${SUCCESS} STREQUAL ${EXPECT}) +- message(FATAL_ERROR "Undefined symbols test failure: expect(${EXPECT}), success(${SUCCESS})") +- endif() ++ + file(REMOVE_RECURSE "${TEST_PROJECT}") + endforeach() + endfunction() +-- +2.51.0 + diff --git a/patches/wownero/0025-depends-remove-icu4c-monero-project-monero-8880.patch b/patches/wownero/0025-depends-remove-icu4c-monero-project-monero-8880.patch new file mode 100644 index 0000000..aaf2e74 --- /dev/null +++ b/patches/wownero/0025-depends-remove-icu4c-monero-project-monero-8880.patch @@ -0,0 +1,25 @@ +From e437fea14ce67d7d0073ad484a66cfc92daa3eb5 Mon Sep 17 00:00:00 2001 +From: Czarek Nakamoto <cyjan@mrcyjanek.net> +Date: Tue, 3 Mar 2026 13:55:59 +0100 +Subject: [PATCH] depends: remove icu4c monero-project/monero#8880 + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a4c163503..b744261ea 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1115,7 +1115,7 @@ if(MINGW) + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj") + set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi;crypt32;bcrypt) + if(DEPENDS) +- set(ICU_LIBRARIES icuio icui18n icuuc icudata icutu iconv) ++ set(ICU_LIBRARIES iconv) + else() + # This is an extremely ugly hack to get around Boost not being built with static ICU. + # We reported the issue, we are waiting for upstream to fix this issue: https://github.com/boostorg/boost/issues/1079#issue-3384962885 +-- +2.51.0 + |
