Merge branch 'PR'

6 files changed, 10 insertions, 34 deletions

diff --git a/contrib/libs/cxxsupp/libcxx/include/__support/win32/locale_win32.h b/contrib/libs/cxxsupp/libcxx/include/__support/win32/locale_win32.h
index 3c7ae9c693..55e818e63a 100644
--- a/contrib/libs/cxxsupp/libcxx/include/__support/win32/locale_win32.h
+++ b/contrib/libs/cxxsupp/libcxx/include/__support/win32/locale_win32.h
@@ -41,8 +41,8 @@
 #define LC_NUMERIC_MASK _M_NUMERIC
 #define LC_TIME_MASK _M_TIME
 #define LC_MESSAGES_MASK _M_MESSAGES
-#define LC_MESSAGES _X_MESSAGES
-#define LC_ALL_MASK _M_ALL
+#define LC_ALL_MASK                                                                                                    \
+  (LC_COLLATE_MASK | LC_CTYPE_MASK | LC_MESSAGES_MASK | LC_MONETARY_MASK | LC_NUMERIC_MASK | LC_TIME_MASK)
 
 class __lconv_storage {
 public:
@@ -191,7 +191,7 @@ decltype(MB_CUR_MAX) MB_CUR_MAX_L(locale_t __l);
 #define strtod_l _strtod_l
 #if defined(_LIBCPP_MSVCRT)
 #  define strtof_l _strtof_l
-#  define strtold_l _strtod_l
+#  define strtold_l _strtold_l
 #else
 _LIBCPP_EXPORTED_FROM_ABI float strtof_l(const char*, char**, locale_t);
 _LIBCPP_EXPORTED_FROM_ABI long double strtold_l(const char*, char**, locale_t);
diff --git a/contrib/libs/cxxsupp/libcxx/patches/09-msc-ver.patch b/contrib/libs/cxxsupp/libcxx/patches/09-clang-cl-abi.patch
index dd57def15a..dd57def15a 100644
--- a/contrib/libs/cxxsupp/libcxx/patches/09-msc-ver.patch
+++ b/contrib/libs/cxxsupp/libcxx/patches/09-clang-cl-abi.patch
diff --git a/contrib/libs/cxxsupp/libcxx/patches/18-locale-win32.patch b/contrib/libs/cxxsupp/libcxx/patches/18-locale-win32.patch
deleted file mode 100644
index 85e9323c0c..0000000000
--- a/contrib/libs/cxxsupp/libcxx/patches/18-locale-win32.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/include/__support/win32/locale_win32.h b/include/__support/win32/locale_win32.h
-index 55e818e..3c7ae9c 100644
---- a/include/__support/win32/locale_win32.h
-+++ b/include/__support/win32/locale_win32.h
-@@ -41,8 +41,8 @@
- #define LC_NUMERIC_MASK _M_NUMERIC
- #define LC_TIME_MASK _M_TIME
- #define LC_MESSAGES_MASK _M_MESSAGES
--#define LC_ALL_MASK                                                                                                    \
--  (LC_COLLATE_MASK | LC_CTYPE_MASK | LC_MESSAGES_MASK | LC_MONETARY_MASK | LC_NUMERIC_MASK | LC_TIME_MASK)
-+#define LC_MESSAGES _X_MESSAGES
-+#define LC_ALL_MASK _M_ALL
- 
- class __lconv_storage {
- public:
-@@ -191,7 +191,7 @@ decltype(MB_CUR_MAX) MB_CUR_MAX_L(locale_t __l);
- #define strtod_l _strtod_l
- #if defined(_LIBCPP_MSVCRT)
- #  define strtof_l _strtof_l
--#  define strtold_l _strtold_l
-+#  define strtold_l _strtod_l
- #else
- _LIBCPP_EXPORTED_FROM_ABI float strtof_l(const char*, char**, locale_t);
- _LIBCPP_EXPORTED_FROM_ABI long double strtold_l(const char*, char**, locale_t);
diff --git a/contrib/libs/hyperscan/.yandex_meta/__init__.py b/contrib/libs/hyperscan/.yandex_meta/__init__.py
index c56235d3b4..02f917dd90 100644
--- a/contrib/libs/hyperscan/.yandex_meta/__init__.py
+++ b/contrib/libs/hyperscan/.yandex_meta/__init__.py
@@ -61,7 +61,7 @@ def instantiate_runtime(self, *, runtime_name, runtime_yamake):
         # list of symbols that will be duplicated if compiled without proper wrapping.
         # It can be obtained with compiling runtime_* libraries and applying
         # nm --defined-only --extern-only --format=posix -o *.a | awk '{print $2}'
-        with open(P.join(self.meta_dir, 'symbols.json')) as f:
+        with open(P.join(self.meta_dir, "symbols.json")) as f:
             symbols_to_rename = json.load(f)
 
         # rename symbols that would be duplicated between runtimes otherwise
diff --git a/contrib/libs/nghttp3/.yandex_meta/__init__.py b/contrib/libs/nghttp3/.yandex_meta/__init__.py
index f75bcde11e..344c3f236e 100644
--- a/contrib/libs/nghttp3/.yandex_meta/__init__.py
+++ b/contrib/libs/nghttp3/.yandex_meta/__init__.py
@@ -8,7 +8,7 @@ def post_install(self):
     with open(includeFilePath, "r") as file:
         filedata = file.read()
 
-    filedata = filedata.replace("<nghttp3/version.h>", "\"version.h\"")
+    filedata = filedata.replace("<nghttp3/version.h>", '"version.h"')
 
     with open(includeFilePath, "w") as file:
         file.write(filedata)
diff --git a/contrib/libs/protobuf/.yandex_meta/__init__.py b/contrib/libs/protobuf/.yandex_meta/__init__.py
index 7d7498e483..8eb399ce00 100644
--- a/contrib/libs/protobuf/.yandex_meta/__init__.py
+++ b/contrib/libs/protobuf/.yandex_meta/__init__.py
@@ -42,7 +42,7 @@ DEPRECATED_STUBS = [
     "src/google/protobuf/json_util.h",
 ]
 
-DEPRECATED_SRC = [x for x in DEPRECATED_STUBS if x.endswith('.cc')]
+DEPRECATED_SRC = [x for x in DEPRECATED_STUBS if x.endswith(".cc")]
 
 # Set of proto files coming with original google protobuf (excluding descriptor.proto, see below)
 # WARN: upon changing this file, make sure to check protobuf_std counterpart.
@@ -219,19 +219,19 @@ ENDIF()
         for lang in ["csharp", "objectivec"]:
             for root, _, files in os.walk(os.path.join(libprotoc_abs_dir, "src/google/protobuf/compiler", lang)):
                 for file in files:
-                    if file.endswith('.h'):
-                        with open(os.path.join(root, lang + '_' + file), 'w') as f:
+                    if file.endswith(".h"):
+                        with open(os.path.join(root, lang + "_" + file), "w") as f:
                             f.write(f'#include "{file}"\n')
                             f.write('#include "names.h"')
 
         # generate temporal proxy for ydb
-        with open(os.path.join(libprotoc_abs_dir, "src/google/protobuf/compiler/cpp/cpp_helpers.h"), 'w') as f:
+        with open(os.path.join(libprotoc_abs_dir, "src/google/protobuf/compiler/cpp/cpp_helpers.h"), "w") as f:
             f.write('#include "helpers.h"')
 
         with open(f"{libprotoc_abs_dir}/ya.make", "wt") as ymake:
             ymake.write(str(libprotoc))
 
-        with open(os.path.join(self.ctx.arc, self.arcdir, "src/google/protobuf/util/json_util.h"), 'w') as f:
+        with open(os.path.join(self.ctx.arc, self.arcdir, "src/google/protobuf/util/json_util.h"), "w") as f:
             f.write('#define USE_DEPRECATED_NAMESPACE 1\n#include "google/protobuf/json/json.h"')