mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

build: reland bump Node.js to v22.9.0 (#44597)

Browse source 
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
Keeley Hammond 2024-11-13 06:34:30 -08:00 • committed by GitHub
parent 0fd16dc9e2
commit 946ab5f1d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
76 changed files with 1465 additions and 3997 deletions
Download patch file Download diff file Expand all files Collapse all files

1
patches/sqlite/.patches Normal file
View file

@ -0,0 +1 @@
fix_rename_sqlite_win32_exports_to_avoid_conflicts_with_node_js.patch

31
patches/sqlite/fix_rename_sqlite_win32_exports_to_avoid_conflicts_with_node_js.patch Normal file
View file

@ -0,0 +1,31 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Sun, 27 Oct 2024 21:01:11 +0100
Subject: fix: rename sqlite win32 exports to avoid conflicts with Node.js
As of https://github.com/nodejs/node/pull/53752, a number of symbols
exported by SQLite are now exported by Node.js. This change renames
the exported symbols in SQLite to avoid conflicts with Node.js.
This should be upstreamed to SQLite.
diff --git a/amalgamation/rename_exports.h b/amalgamation/rename_exports.h
index b1c485159a624ea1bfbec603aabc58074721e72a..8eb71ae67acc3e0ad17bae2e87e85bf12c10b9af 100644
--- a/amalgamation/rename_exports.h
+++ b/amalgamation/rename_exports.h
@@ -367,6 +367,15 @@
#define sqlite3session_patchset chrome_sqlite3session_patchset // Lines 11449-11453
#define sqlite3session_patchset_strm chrome_sqlite3session_patchset_strm // Lines 12728-12732
#define sqlite3session_table_filter chrome_sqlite3session_table_filter // Lines 11219-11226
+#define sqlite3_win32_write_debug chrome_sqlite3_win32_write_debug
+#define sqlite3_win32_sleep chrome_sqlite3_win32_sleep
+#define sqlite3_win32_is_nt chrome_sqlite3_win32_is_nt
+#define sqlite3_win32_utf8_to_unicode chrome_sqlite3_win32_utf8_to_unicode
+#define sqlite3_win32_unicode_to_utf8 chrome_sqlite3_win32_unicode_to_utf8
+#define sqlite3_win32_mbcs_to_utf8 chrome_sqlite3_win32_mbcs_to_utf8
+#define sqlite3_win32_utf8_to_mbcs_v2 chrome_sqlite3_win32_utf8_to_mbcs_v2
+#define sqlite3_win32_utf8_to_mbcs chrome_sqlite3_win32_utf8_to_mbcs
+#define sqlite3_win32_mbcs_to_utf8_v2 chrome_sqlite3_win32_mbcs_to_utf8_v2
#endif // THIRD_PARTY_SQLITE_AMALGAMATION_RENAME_EXPORTS_H_