From da4ec54f5296135ab1614b6ae91b0897456de952 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Wed, 4 Mar 2026 15:01:26 +0100 Subject: fix: x86_64-w64-mingw32 --- ...s-remove-icu4c-monero-project-monero-8880.patch | 41 +++++++++++++++++++ patches/monero/0021-fix-mingw-build-issues.patch | 46 ++++++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 patches/monero/0020-depends-remove-icu4c-monero-project-monero-8880.patch create mode 100644 patches/monero/0021-fix-mingw-build-issues.patch (limited to 'patches') diff --git a/patches/monero/0020-depends-remove-icu4c-monero-project-monero-8880.patch b/patches/monero/0020-depends-remove-icu4c-monero-project-monero-8880.patch new file mode 100644 index 0000000..34172b6 --- /dev/null +++ b/patches/monero/0020-depends-remove-icu4c-monero-project-monero-8880.patch @@ -0,0 +1,41 @@ +From c1d4ec80ec32232d2e70074afd8830754a752d70 Mon Sep 17 00:00:00 2001 +From: Czarek Nakamoto +Date: Tue, 3 Mar 2026 13:55:59 +0100 +Subject: [PATCH] depends: remove icu4c monero-project/monero#8880 + +--- + CMakeLists.txt | 4 ++-- + src/common/perf_timer.h | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 10c80dbad..2525cf8ba 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1123,9 +1123,9 @@ 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() +- set(ICU_LIBRARIES icuio icuin icuuc icudt icutu iconv) ++ set(ICU_LIBRARIES iconv) + endif() + elseif(APPLE OR OPENBSD OR ANDROID) + set(EXTRA_LIBRARIES "") +diff --git a/src/common/perf_timer.h b/src/common/perf_timer.h +index c6120b06d..a96da6e56 100644 +--- a/src/common/perf_timer.h ++++ b/src/common/perf_timer.h +@@ -28,6 +28,7 @@ + + #pragma once + ++#include + #include + #include + #include +-- +2.51.0 + diff --git a/patches/monero/0021-fix-mingw-build-issues.patch b/patches/monero/0021-fix-mingw-build-issues.patch new file mode 100644 index 0000000..50d6a43 --- /dev/null +++ b/patches/monero/0021-fix-mingw-build-issues.patch @@ -0,0 +1,46 @@ +From ff7287c028327294a28f4521bf6c05721403016d Mon Sep 17 00:00:00 2001 +From: Czarek Nakamoto +Date: Wed, 4 Mar 2026 14:52:14 +0100 +Subject: [PATCH] fix: mingw build issues + +--- + contrib/epee/include/serialization/keyvalue_serialization.h | 1 + + contrib/epee/src/abstract_http_client.cpp | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/contrib/epee/include/serialization/keyvalue_serialization.h b/contrib/epee/include/serialization/keyvalue_serialization.h +index fbbddc7d2..5104f284d 100644 +--- a/contrib/epee/include/serialization/keyvalue_serialization.h ++++ b/contrib/epee/include/serialization/keyvalue_serialization.h +@@ -26,6 +26,7 @@ + + #pragma once + ++#include + #include + #include + #include +diff --git a/contrib/epee/src/abstract_http_client.cpp b/contrib/epee/src/abstract_http_client.cpp +index 03f73cbbc..70c18cfca 100644 +--- a/contrib/epee/src/abstract_http_client.cpp ++++ b/contrib/epee/src/abstract_http_client.cpp +@@ -2,6 +2,7 @@ + #include "net/http_base.h" + #include "net/net_parse_helpers.h" + #include "misc_log_ex.h" ++#include + + #undef MONERO_DEFAULT_LOG_CATEGORY + #define MONERO_DEFAULT_LOG_CATEGORY "net.http" +@@ -38,7 +39,7 @@ namespace net_utils + while (num_char >= radix) + { + temp = num_char % radix; +- num_char = (int)floor((float)num_char / (float)radix); ++ num_char = (int)std::floor((float)num_char / (float)radix); + csTmp = get_hex_vals()[temp]; + } + +-- +2.51.0 + -- cgit v1.2.3