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.patch11
1 files changed, 5 insertions, 6 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 64ef6aa..453d651 100644
--- a/patches/monero/0013-include-locale-only-when-targeting-WIN32.patch
+++ b/patches/monero/0013-include-locale-only-when-targeting-WIN32.patch
@@ -1,8 +1,7 @@
-From 1eacd30724559749be5adeb31d763f44c3f221f9 Mon Sep 17 00:00:00 2001
+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/14] include locale only when targeting WIN32
-
+Subject: [PATCH 13/17] include locale only when targeting WIN32
---
CMakeLists.txt | 6 +++++-
@@ -10,7 +9,7 @@ Subject: [PATCH 13/14] include locale only when targeting WIN32
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1eac121db..3a4e8f7e1 100644
+index 1eac121db..5938be622 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1089,7 +1089,11 @@ if(NOT Boost_FOUND)
@@ -27,7 +26,7 @@ index 1eac121db..3a4e8f7e1 100644
# 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
+index 20ccbfb35..c43803033 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -46,7 +46,9 @@
@@ -41,5 +40,5 @@ index d8fe108b4..e3e838b13 100644
#include "bc-ur/src/bc-ur.hpp"
#if defined(HIDAPI_DUMMY) && !defined(HAVE_HIDAPI)
--
-2.48.1
+2.49.0