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/0014-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/0014-include-locale-only-when-targeting-WIN32.patch')
| -rw-r--r-- | patches/monero/0014-include-locale-only-when-targeting-WIN32.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/patches/monero/0014-include-locale-only-when-targeting-WIN32.patch b/patches/monero/0014-include-locale-only-when-targeting-WIN32.patch deleted file mode 100644 index 4cd1d0c..0000000 --- a/patches/monero/0014-include-locale-only-when-targeting-WIN32.patch +++ /dev/null @@ -1,43 +0,0 @@ -From dfe8fde34cd51f5d5ec95fb464737f6e447d41bb Mon Sep 17 00:00:00 2001 -From: Czarek Nakamoto <cyjan@mrcyjanek.net> -Date: Mon, 18 Nov 2024 10:57:37 -0500 -Subject: [PATCH 14/14] include locale only when targeting WIN32 - ---- - CMakeLists.txt | 5 ++++- - src/wallet/api/wallet.cpp | 2 ++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4e86328..809bce6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1079,7 +1079,10 @@ if(STATIC) - set(Boost_USE_STATIC_LIBS ON) - set(Boost_USE_STATIC_RUNTIME ON) - endif() --find_package(Boost 1.58 QUIET REQUIRED COMPONENTS system filesystem thread date_time chrono regex serialization program_options locale) -+if(WIN32) -+ set(BOOST_LOCALE locale) -+endif() -+find_package(Boost 1.58 QUIET REQUIRED COMPONENTS system filesystem thread date_time chrono regex serialization program_options ${BOOST_LOCALE}) - add_definitions(-DBOOST_ASIO_ENABLE_SEQUENTIAL_STRAND_ALLOCATION) - - set(CMAKE_FIND_LIBRARY_SUFFIXES ${OLD_LIB_SUFFIXES}) -diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp -index 5734aff..f4fb093 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.39.5 (Apple Git-154) - |