From 4602adb16495eee62ac3549a5a7735d32f0611ae Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Tue, 19 Sep 2023 22:35:19 +0200 Subject: [PATCH] fix: FTBTFS in ada dep https://github.com/ada-url/ada/pull/464 https://github.com/ada-url/idna/pull/31 --- patches/node/.patches | 1 - ...ftbfs_werror_wunreachable-code-break.patch | 30 ------------------- 2 files changed, 31 deletions(-) delete mode 100644 patches/node/fix_ftbfs_werror_wunreachable-code-break.patch diff --git a/patches/node/.patches b/patches/node/.patches index 64e34653c5c5ad..774b79f5303f3d 100644 --- a/patches/node/.patches +++ b/patches/node/.patches @@ -37,7 +37,6 @@ fix_account_for_createexternalizablestring_v8_global.patch fix_wunreachable-code_warning_in_ares_init_rand_engine.patch fix_-wshadow_warning.patch fix_do_not_resolve_electron_entrypoints.patch -fix_ftbfs_werror_wunreachable-code-break.patch fix_ftbfs_werror_wextra-semi.patch fix_isurl_implementation.patch ci_ensure_node_tests_set_electron_run_as_node.patch diff --git a/patches/node/fix_ftbfs_werror_wunreachable-code-break.patch b/patches/node/fix_ftbfs_werror_wunreachable-code-break.patch deleted file mode 100644 index 5aee0a822fdd6a..00000000000000 --- a/patches/node/fix_ftbfs_werror_wunreachable-code-break.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Charles Kerr -Date: Wed, 19 Jul 2023 15:57:19 -0500 -Subject: fix ftbfs Werror Wunreachable-code-break - -Fix a deps warning that causes FTBFS when building with -Werror. - -This patch can be removed if fixed upstream. -Upstream PR 1: https://github.com/ada-url/ada/pull/464 -Upstream PR 2: https://github.com/ada-url/idna/pull/31 - -diff --git a/deps/ada/ada.cpp b/deps/ada/ada.cpp -index 570a659d118de5404003d0cd3731523d863de16b..43147d495f78eea916f895258f9c1846bd55f40a 100644 ---- a/deps/ada/ada.cpp -+++ b/deps/ada/ada.cpp -@@ -2829,7 +2829,6 @@ std::u32string map(std::u32string_view input) { - break; - case 2: - return error; // disallowed -- break; - - // case 3 : - default: -@@ -15175,4 +15174,4 @@ const ada_url_components* ada_get_components(ada_url result) noexcept { - } - } // extern "C" - /* end file src/ada_c.cpp */ --/* end file src/ada.cpp */ -+/* end file src/ada.cpp */ -\ No newline at end of file