Merging upstream version 4:24.2.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 23 insertions, 0 deletions

diff --git a/external/boost/windows-no-utf8-locales.patch.0 b/external/boost/windows-no-utf8-locales.patch.0
new file mode 100644
index 0000000000..519d8bde2f
--- /dev/null
+++ b/external/boost/windows-no-utf8-locales.patch.0
@@ -0,0 +1,23 @@
+Don't ever attempt to initialise a std::locale with a UTF-8 locale on Windows -*- Mode: Diff -*-
+
+--- libs/locale/src/boost/locale/std/std_backend.cpp
++++ libs/locale/src/boost/locale/std/std_backend.cpp
+@@ -86,6 +86,7 @@
+ #endif
+                 utf_mode_ = utf8_support::none;
+             } else {
++                #if !defined(BOOST_WINDOWS)
+                 if(loadable(lid)) {
+                     name_ = lid;
+                     utf_mode_ = utf8_support::native_with_wide;
+@@ -98,8 +99,8 @@
+                     utf_mode_ = utf8_support::from_wide;
+ #endif
+                 }
+-#if defined(BOOST_WINDOWS)
+-                else if(loadable(win_name))
++                #else
++                if(loadable(win_name))
+                 {
+                     name_ = win_name;
+                     utf_mode_ = utf8_support::from_wide;