зеркало из https://github.com/electron/electron.git
chore: remove redundant Node.js patch (#37279)
* chore: fix patch for other patch * chore: update patches --------- Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
Родитель
beed240454
Коммит
3138acc377
|
@ -25,7 +25,6 @@ build_ensure_native_module_compilation_fails_if_not_using_a_new.patch
|
||||||
fix_override_createjob_in_node_platform.patch
|
fix_override_createjob_in_node_platform.patch
|
||||||
v8_api_advance_api_deprecation.patch
|
v8_api_advance_api_deprecation.patch
|
||||||
fixup_for_error_declaration_shadows_a_local_variable.patch
|
fixup_for_error_declaration_shadows_a_local_variable.patch
|
||||||
fixup_for_wc_98-compat-extra-semi.patch
|
|
||||||
fix_parallel_test-v8-stats.patch
|
fix_parallel_test-v8-stats.patch
|
||||||
fix_expose_the_built-in_electron_module_via_the_esm_loader.patch
|
fix_expose_the_built-in_electron_module_via_the_esm_loader.patch
|
||||||
heap_remove_allocationspace_map_space_enum_constant.patch
|
heap_remove_allocationspace_map_space_enum_constant.patch
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: John Kleinschmidt <jkleinsc@electronjs.org>
|
|
||||||
Date: Thu, 1 Sep 2022 21:55:57 -0400
|
|
||||||
Subject: fixup for Wc++98-compat-extra-semi
|
|
||||||
|
|
||||||
Wc++98-compat-extra-semi is turned on for Electron so this
|
|
||||||
patch fixes that error in node.
|
|
||||||
|
|
||||||
diff --git a/src/node_serdes.cc b/src/node_serdes.cc
|
|
||||||
index 1cdd436b343861a96582a803b460aefe1e81cdd0..0249574c4431fb5b98852699f1368f71b49691c1 100644
|
|
||||||
--- a/src/node_serdes.cc
|
|
||||||
+++ b/src/node_serdes.cc
|
|
||||||
@@ -32,7 +32,7 @@ namespace serdes {
|
|
||||||
v8::ArrayBuffer::Allocator* GetAllocator() {
|
|
||||||
static v8::ArrayBuffer::Allocator* allocator = v8::ArrayBuffer::Allocator::NewDefaultAllocator();
|
|
||||||
return allocator;
|
|
||||||
-};
|
|
||||||
+}
|
|
||||||
|
|
||||||
class SerializerContext : public BaseObject,
|
|
||||||
public ValueSerializer::Delegate {
|
|
|
@ -155,7 +155,7 @@ index ece9a4cfd45bf885169fdd278e09c467c6b4bbab..0c0dac67c0834ab7feba426079629245
|
||||||
|
|
||||||
// Delegate to V8's allocator for compatibility with the V8 memory cage.
|
// Delegate to V8's allocator for compatibility with the V8 memory cage.
|
||||||
diff --git a/src/node_serdes.cc b/src/node_serdes.cc
|
diff --git a/src/node_serdes.cc b/src/node_serdes.cc
|
||||||
index 6864f2d88b34abfa4090780d6993684cd0b366a3..1cdd436b343861a96582a803b460aefe1e81cdd0 100644
|
index 6864f2d88b34abfa4090780d6993684cd0b366a3..0249574c4431fb5b98852699f1368f71b49691c1 100644
|
||||||
--- a/src/node_serdes.cc
|
--- a/src/node_serdes.cc
|
||||||
+++ b/src/node_serdes.cc
|
+++ b/src/node_serdes.cc
|
||||||
@@ -29,6 +29,11 @@ using v8::ValueSerializer;
|
@@ -29,6 +29,11 @@ using v8::ValueSerializer;
|
||||||
|
@ -165,7 +165,7 @@ index 6864f2d88b34abfa4090780d6993684cd0b366a3..1cdd436b343861a96582a803b460aefe
|
||||||
+v8::ArrayBuffer::Allocator* GetAllocator() {
|
+v8::ArrayBuffer::Allocator* GetAllocator() {
|
||||||
+ static v8::ArrayBuffer::Allocator* allocator = v8::ArrayBuffer::Allocator::NewDefaultAllocator();
|
+ static v8::ArrayBuffer::Allocator* allocator = v8::ArrayBuffer::Allocator::NewDefaultAllocator();
|
||||||
+ return allocator;
|
+ return allocator;
|
||||||
+};
|
+}
|
||||||
+
|
+
|
||||||
class SerializerContext : public BaseObject,
|
class SerializerContext : public BaseObject,
|
||||||
public ValueSerializer::Delegate {
|
public ValueSerializer::Delegate {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче