From d4e22c97b26d7c42d16c8f27d6ec569439607b99 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Mon, 23 Jun 2025 14:40:04 +0200 Subject: [PATCH] build: combine dependent libc patch (#47521) Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr --- patches/chromium/.patches | 1 - ...bcxx_abi_unstable_false_for_electron.patch | 8 +++++-- ...e_wrap_iter_in_string_view_and_array.patch | 22 ------------------- 3 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 patches/chromium/fix_enable_wrap_iter_in_string_view_and_array.patch diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 471d0813543a..42ea65a667cc 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -138,7 +138,6 @@ ignore_parse_errors_for_resolveshortcutproperties.patch feat_add_signals_when_embedder_cleanup_callbacks_run_for.patch feat_separate_content_settings_callback_for_sync_and_async_clipboard.patch fix_win32_synchronous_spellcheck.patch -fix_enable_wrap_iter_in_string_view_and_array.patch fix_linter_error.patch chore_grandfather_in_electron_views_and_delegates.patch refactor_patch_electron_permissiontypes_into_blink.patch diff --git a/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch b/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch index 172a0c2fe5a2..fa9cab2791a4 100644 --- a/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch +++ b/patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch @@ -5,16 +5,20 @@ Subject: build: make libcxx_abi_unstable false for electron https://nornagon.medium.com/a-libc-odyssey-973e51649063 +See also https://github.com/electron/electron/issues/45810#issuecomment-2691417213. + diff --git a/buildtools/third_party/libc++/__config_site b/buildtools/third_party/libc++/__config_site -index 67075bd8b4d42e6e6d651cb0988d64eccb64cc23..e240ff6fff94a6cebf8662996712fe7eb22e5fff 100644 +index 67075bd8b4d42e6e6d651cb0988d64eccb64cc23..ddf1693002aa171b3d91aa4ef08f5b360e4adddc 100644 --- a/buildtools/third_party/libc++/__config_site +++ b/buildtools/third_party/libc++/__config_site -@@ -18,7 +18,7 @@ +@@ -18,7 +18,9 @@ // _LIBCPP_ABI_NAMESPACE to a shorter value. #define _LIBCPP_ABI_NAMESPACE __Cr -#define _LIBCPP_ABI_VERSION 2 +#define _LIBCPP_ABI_VERSION 1 ++#define _LIBCPP_ABI_USE_WRAP_ITER_IN_STD_ARRAY ++#define _LIBCPP_ABI_USE_WRAP_ITER_IN_STD_STRING_VIEW #define _LIBCPP_ABI_FORCE_ITANIUM 0 #define _LIBCPP_ABI_FORCE_MICROSOFT 0 diff --git a/patches/chromium/fix_enable_wrap_iter_in_string_view_and_array.patch b/patches/chromium/fix_enable_wrap_iter_in_string_view_and_array.patch deleted file mode 100644 index 2c8066b61326..000000000000 --- a/patches/chromium/fix_enable_wrap_iter_in_string_view_and_array.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: deepak1556 -Date: Sat, 1 Mar 2025 05:11:41 +0900 -Subject: fix: enable __wrap_iter in string_view and array - -Refs https://github.com/electron/electron/issues/45810#issuecomment-2691417213 - -Patch can be removed when build_make_libcxx_abi_unstable_false_for_electron.patch is removed. - -diff --git a/buildtools/third_party/libc++/__config_site b/buildtools/third_party/libc++/__config_site -index e240ff6fff94a6cebf8662996712fe7eb22e5fff..ddf1693002aa171b3d91aa4ef08f5b360e4adddc 100644 ---- a/buildtools/third_party/libc++/__config_site -+++ b/buildtools/third_party/libc++/__config_site -@@ -19,6 +19,8 @@ - #define _LIBCPP_ABI_NAMESPACE __Cr - - #define _LIBCPP_ABI_VERSION 1 -+#define _LIBCPP_ABI_USE_WRAP_ITER_IN_STD_ARRAY -+#define _LIBCPP_ABI_USE_WRAP_ITER_IN_STD_STRING_VIEW - - #define _LIBCPP_ABI_FORCE_ITANIUM 0 - #define _LIBCPP_ABI_FORCE_MICROSOFT 0