summaryrefslogtreecommitdiff
path: root/patches/monero/0013-include-locale-only-when-targeting-WIN32.patch
diff options
context:
space:
mode:
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.patch40
1 files changed, 11 insertions, 29 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
index 56c8132..63fc7a8 100644
--- a/patches/monero/0013-include-locale-only-when-targeting-WIN32.patch
+++ b/patches/monero/0013-include-locale-only-when-targeting-WIN32.patch
@@ -1,44 +1,26 @@
-From 60ef2d2a25b07aca8f25ef5016eb4b9b7c253a50 Mon Sep 17 00:00:00 2001
+From 3e83b0212fe9a824ff9e8c399ef86e25c73afa13 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/20] include locale only when targeting WIN32
+Subject: [PATCH 13/22] include locale only when targeting WIN32
---
- CMakeLists.txt | 6 +++++-
- src/wallet/api/wallet.cpp | 2 ++
- 2 files changed, 7 insertions(+), 1 deletion(-)
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b814c76b7..cef44dd1b 100644
+index 133997f74..95326743c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1090,7 +1090,11 @@ if(NOT Boost_FOUND)
- elseif(Boost_FOUND)
+@@ -953,7 +953,8 @@ 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)
+ set(BOOST_COMPONENTS filesystem thread date_time chrono serialization program_options)
+- if (WIN32)
+
+ if(WIN32)
-+ list(APPEND BOOST_COMPONENTS locale)
-+ endif()
+ 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 00918e357..107f516f3 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.50.1 (Apple Git-155)
+2.54.0 (Apple Git-157)