summaryrefslogtreecommitdiff
path: root/patches/monero
diff options
context:
space:
mode:
authorCzarek Nakamoto <cyjan@mrcyjanek.net>2026-03-06 12:06:40 +0100
committerCzarek Nakamoto <cyjan@mrcyjanek.net>2026-03-06 12:06:40 +0100
commit5829d5f594b1e1fc5a8b78be17afe5bb0878ee91 (patch)
treeb0a3a272d6edc43306ca7bcb3662d0b064129a30 /patches/monero
parentda4ec54f5296135ab1614b6ae91b0897456de952 (diff)
wip
Diffstat (limited to 'patches/monero')
-rw-r--r--patches/monero/0001-fix-missing-___clear_cache-when-targetting-iOS.patch2
-rw-r--r--patches/monero/0013-include-locale-only-when-targeting-WIN32 copy.patch44
-rw-r--r--patches/monero/0022-fix-remove-flaky-test.patch27
3 files changed, 72 insertions, 1 deletions
diff --git a/patches/monero/0001-fix-missing-___clear_cache-when-targetting-iOS.patch b/patches/monero/0001-fix-missing-___clear_cache-when-targetting-iOS.patch
index 4dc4e8f..d11f005 100644
--- a/patches/monero/0001-fix-missing-___clear_cache-when-targetting-iOS.patch
+++ b/patches/monero/0001-fix-missing-___clear_cache-when-targetting-iOS.patch
@@ -28,7 +28,7 @@ index 102f8acf9..ce72c9bb9 160000
+++ b/external/randomx
@@ -1 +1 @@
-Subproject commit 102f8acf90a7649ada410de5499a7ec62e49e1da
-+Subproject commit ce72c9bb9cb799e0d9171094b9abb009e04c5bfc
++Subproject commit 5dfeeb30ec3446ec9d348153767abc324436c56c
--
2.49.0
diff --git a/patches/monero/0013-include-locale-only-when-targeting-WIN32 copy.patch b/patches/monero/0013-include-locale-only-when-targeting-WIN32 copy.patch
new file mode 100644
index 0000000..453d651
--- /dev/null
+++ b/patches/monero/0013-include-locale-only-when-targeting-WIN32 copy.patch
@@ -0,0 +1,44 @@
+From db52bcebe23b29b35ae538f01e72ed4f7f66f931 Mon Sep 17 00:00:00 2001
+From: Czarek Nakamoto <cyjan@mrcyjanek.net>
+Date: Mon, 18 Nov 2024 10:57:37 -0500
+Subject: [PATCH 13/17] include locale only when targeting WIN32
+
+---
+ CMakeLists.txt | 6 +++++-
+ src/wallet/api/wallet.cpp | 2 ++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1eac121db..5938be622 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1089,7 +1089,11 @@ if(NOT Boost_FOUND)
+ elseif(Boost_FOUND)
+ message(STATUS "Found Boost Version: ${Boost_VERSION_STRING}")
+
+- set(BOOST_COMPONENTS filesystem thread date_time chrono serialization program_options locale)
++ set(BOOST_COMPONENTS filesystem thread date_time chrono serialization program_options)
++
++ if(WIN32)
++ list(APPEND BOOST_COMPONENTS locale)
++ endif()
+
+ # Boost System is header-only since 1.69
+ if (Boost_VERSION_STRING VERSION_LESS 1.69.0)
+diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
+index 20ccbfb35..c43803033 100644
+--- a/src/wallet/api/wallet.cpp
++++ b/src/wallet/api/wallet.cpp
+@@ -46,7 +46,9 @@
+ #include <sstream>
+ #include <unordered_map>
+
++#ifdef WIN32
+ #include <boost/locale.hpp>
++#endif
+ #include <boost/filesystem.hpp>
+ #include "bc-ur/src/bc-ur.hpp"
+ #if defined(HIDAPI_DUMMY) && !defined(HAVE_HIDAPI)
+--
+2.49.0
+
diff --git a/patches/monero/0022-fix-remove-flaky-test.patch b/patches/monero/0022-fix-remove-flaky-test.patch
new file mode 100644
index 0000000..4c70ca3
--- /dev/null
+++ b/patches/monero/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
+