rework nan patches

patches/nan/.patches

@@ -1,5 +1,5 @@
+remove_allcan_read_write.patch
 use_new_constructor_for_scriptorigin_when_17_x.patch
 fix_define_nan_copyablepersistenttraits_for_v8_12_5.patch
 remove_deprecated_v8_isolate_idlenotificationdeadline.patch
 remove_several_apis_deprecated_in_version_12_6.patch
-remove_allcan_read_write.patch

patches/nan/fix_define_nan_copyablepersistenttraits_for_v8_12_5.patch

@@ -7,10 +7,10 @@ Refs https://chromium-review.googlesource.com/c/v8/v8/+/5403708
 Should be upstreamed.
 
 diff --git a/nan.h b/nan.h
-index 2a68349448c163fa29af327a03b11678e61f5789..42285328055ddb7c76548258f3c4847d2c278ad6 100644
+index 6c4fe9e46f69234100e7e634826b38c9e3e17e37..a2c84afb9be624fb1a974563cd8335a87f98f2cd 100644
 --- a/nan.h
 +++ b/nan.h
-@@ -203,9 +203,11 @@ typedef v8::String::ExternalOneByteStringResource
+@@ -204,9 +204,11 @@ typedef v8::String::ExternalOneByteStringResource
  template<typename T>
  class NonCopyablePersistentTraits :
      public v8::NonCopyablePersistentTraits<T> {};

patches/nan/remove_allcan_read_write.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: deepak1556 <[email protected]>
-Date: Fri, 10 Nov 2023 22:51:53 +0900
+From: Samuel Attard <[email protected]>
+Date: Tue, 18 Jun 2024 15:59:42 -0700
 Subject: Remove AllCan Read/Write
 
 Refs https://chromium-review.googlesource.com/c/v8/v8/+/5006387
@@ -17,7 +17,7 @@ Steps for upstreaming this patch:
 - Upstream patch to nodejs/nan before Electron 29 is branched
 
 diff --git a/nan.h b/nan.h
-index 9a9112afe0cc94ce58ed3cce9763ace7c160a932..f4865a77e60d5105ed2426037984ddcbfa58bbca 100644
+index 2a68349448c163fa29af327a03b11678e61f5789..6c4fe9e46f69234100e7e634826b38c9e3e17e37 100644
 --- a/nan.h
 +++ b/nan.h
 @@ -47,6 +47,7 @@
@@ -28,7 +28,7 @@ index 9a9112afe0cc94ce58ed3cce9763ace7c160a932..f4865a77e60d5105ed2426037984ddcb
  
  #ifdef _MSC_VER
  # define NAN_HAS_CPLUSPLUS_11 (_MSC_VER >= 1800)
-@@ -2525,7 +2526,9 @@ NAN_DEPRECATED inline void SetAccessor(
+@@ -2517,7 +2518,9 @@ NAN_DEPRECATED inline void SetAccessor(
    , GetterCallback getter
    , SetterCallback setter
    , v8::Local<v8::Value> data
@@ -38,7 +38,7 @@ index 9a9112afe0cc94ce58ed3cce9763ace7c160a932..f4865a77e60d5105ed2426037984ddcb
    , v8::PropertyAttribute attribute
    , imp::Sig signature) {
    HandleScope scope;
-@@ -2553,17 +2556,28 @@ NAN_DEPRECATED inline void SetAccessor(
+@@ -2545,17 +2548,28 @@ NAN_DEPRECATED inline void SetAccessor(
      obj->SetInternalField(imp::kDataIndex, data);
    }
  
@@ -67,7 +67,7 @@ index 9a9112afe0cc94ce58ed3cce9763ace7c160a932..f4865a77e60d5105ed2426037984ddcb
  }
  
  inline void SetAccessor(
-@@ -2572,7 +2586,9 @@ inline void SetAccessor(
+@@ -2564,7 +2578,9 @@ inline void SetAccessor(
    , GetterCallback getter
    , SetterCallback setter = 0
    , v8::Local<v8::Value> data = v8::Local<v8::Value>()
@@ -77,7 +77,7 @@ index 9a9112afe0cc94ce58ed3cce9763ace7c160a932..f4865a77e60d5105ed2426037984ddcb
    , v8::PropertyAttribute attribute = v8::None) {
    HandleScope scope;
  
-@@ -2599,14 +2615,25 @@ inline void SetAccessor(
+@@ -2591,14 +2607,25 @@ inline void SetAccessor(
      obj->SetInternalField(imp::kDataIndex, data);
    }
  
@@ -103,7 +103,7 @@ index 9a9112afe0cc94ce58ed3cce9763ace7c160a932..f4865a77e60d5105ed2426037984ddcb
  }
  
  inline bool SetAccessor(
-@@ -2642,7 +2669,15 @@ inline bool SetAccessor(
+@@ -2634,7 +2661,15 @@ inline bool SetAccessor(
        , New<v8::External>(reinterpret_cast<void *>(setter)));
    }
  

patches/nan/remove_deprecated_v8_isolate_idlenotificationdeadline.patch

@@ -8,10 +8,10 @@ See https://chromium-review.googlesource.com/c/v8/v8/+/5539852
 Also https://github.com/nodejs/nan/issues/953#issuecomment-1791163429
 
 diff --git a/nan.h b/nan.h
-index 42285328055ddb7c76548258f3c4847d2c278ad6..9a9112afe0cc94ce58ed3cce9763ace7c160a932 100644
+index a2c84afb9be624fb1a974563cd8335a87f98f2cd..f4865a77e60d5105ed2426037984ddcbfa58bbca 100644
 --- a/nan.h
 +++ b/nan.h
-@@ -684,7 +684,13 @@ inline uv_loop_t* GetCurrentEventLoop() {
+@@ -685,7 +685,13 @@ inline uv_loop_t* GetCurrentEventLoop() {
      v8::Isolate::GetCurrent()->SetAddHistogramSampleFunction(cb);
    }