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

chore: bump node to v18.18.2 (main) (#40205)

Browse source 
* chore: bump node in DEPS to v18.18.2

* chore: update patches

* deps: update nghttp2 to 1.55.0

https://github.com/nodejs/node/pull/48746

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
electron-roller[bot] 2023-10-16 17:13:35 +02:00 • committed by GitHub
parent f362e089b1
commit 6d0d350e13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DEPS
View file

@ -4,7 +4,7 @@ vars = {
'chromium_version': 'chromium_version':
'119.0.6045.0', '119.0.6045.0',
'node_version': 'node_version':
'v18.18.1', 'v18.18.2',
'nan_version': 'nan_version':
'e14bdcd1f72d62bca1d541b66da43130384ec213', 'e14bdcd1f72d62bca1d541b66da43130384ec213',
'squirrel.mac_version': 'squirrel.mac_version':

9
patches/node/build_add_gn_build_files.patch
View file

@ -849,10 +849,10 @@ index 0000000000000000000000000000000000000000..fb000f8ee7647c375bc190d1729d67bb
+} +}
diff --git a/deps/nghttp2/BUILD.gn b/deps/nghttp2/BUILD.gn diff --git a/deps/nghttp2/BUILD.gn b/deps/nghttp2/BUILD.gn
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..23eed033d31eced6a85c794eee550655af7a9a1d index 0000000000000000000000000000000000000000..7d2ca477db2415f43ababa270d8aefa3124b2765
--- /dev/null --- /dev/null
+++ b/deps/nghttp2/BUILD.gn +++ b/deps/nghttp2/BUILD.gn
@@ -0,0 +1,48 @@ @@ -0,0 +1,51 @@
+config("nghttp2_config") { +config("nghttp2_config") {
+ defines = [ "NGHTTP2_STATICLIB" ] + defines = [ "NGHTTP2_STATICLIB" ]
+ include_dirs = [ "lib/includes" ] + include_dirs = [ "lib/includes" ]
@ -894,11 +894,14 @@ index 0000000000000000000000000000000000000000..23eed033d31eced6a85c794eee550655
+ "lib/nghttp2_pq.c", + "lib/nghttp2_pq.c",
+ "lib/nghttp2_priority_spec.c", + "lib/nghttp2_priority_spec.c",
+ "lib/nghttp2_queue.c", + "lib/nghttp2_queue.c",
+ "lib/nghttp2_ratelim.c",
+ "lib/nghttp2_rcbuf.c", + "lib/nghttp2_rcbuf.c",
+ "lib/nghttp2_session.c", + "lib/nghttp2_session.c",
+ "lib/nghttp2_stream.c", + "lib/nghttp2_stream.c",
+ "lib/nghttp2_submit.c", + "lib/nghttp2_submit.c",
+ "lib/nghttp2_time.c",
+ "lib/nghttp2_version.c", + "lib/nghttp2_version.c",
+ "lib/sfparse.c"
+ ] + ]
+} +}
diff --git a/deps/simdutf/BUILD.gn b/deps/simdutf/BUILD.gn diff --git a/deps/simdutf/BUILD.gn b/deps/simdutf/BUILD.gn
@ -2104,7 +2107,7 @@ index 0000000000000000000000000000000000000000..4ab828dcbf322a9e28674e48c4a6868b
+ args = rebase_path(inputs + outputs, root_build_dir) + args = rebase_path(inputs + outputs, root_build_dir)
+} +}
diff --git a/src/node_version.h b/src/node_version.h diff --git a/src/node_version.h b/src/node_version.h
index ac1fc294a412b1a63b6f6bb4c49cd5ce34fb8ad7..eaa480cd63217dc9cd6868dff411932adef4ef08 100644 index 88cc915177bcf8b86eb8f9f16b215cb6d06b3aa7..8df52c22dd76a850d421075effc44fbfb32307db 100644
--- a/src/node_version.h --- a/src/node_version.h
+++ b/src/node_version.h +++ b/src/node_version.h
@@ -89,7 +89,10 @@ @@ -89,7 +89,10 @@