diff options
| author | cyan <cyjan@mrcyjanek.net> | 2025-02-20 15:12:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-20 15:12:58 +0100 |
| commit | 991a0d0c97bce6ae8671dc763dd03876dfa9ea8a (patch) | |
| tree | dd3ea422437bab03a774676868afb2216e13d5f3 /patches/monero/0013-include-locale-only-when-targeting-WIN32.patch | |
| parent | 65608c09e9093f1cd42c6afd8e9131016c82574b (diff) | |
[monero] update to latest v0.18 (#122)v0.18.4.0-RC1
* monero update
* update checksum
Diffstat (limited to 'patches/monero/0013-include-locale-only-when-targeting-WIN32.patch')
| -rw-r--r-- | patches/monero/0013-include-locale-only-when-targeting-WIN32.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/patches/monero/0013-include-locale-only-when-targeting-WIN32.patch b/patches/monero/0013-include-locale-only-when-targeting-WIN32.patch new file mode 100644 index 0000000..64ef6aa --- /dev/null +++ b/patches/monero/0013-include-locale-only-when-targeting-WIN32.patch @@ -0,0 +1,45 @@ +From 1eacd30724559749be5adeb31d763f44c3f221f9 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/14] 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..3a4e8f7e1 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 d8fe108b4..e3e838b13 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.48.1 + |