5 files changed, 28 insertions, 23 deletions
diff --git a/devel/electron37/files/package.json b/devel/electron37/files/package.json
index bb15faa1f136..9f65235eaa4b 100644
--- a/devel/electron37/files/package.json
+++ b/devel/electron37/files/package.json
@@ -20,6 +20,7 @@
     "@types/temp": "^0.9.4",
     "@typescript-eslint/eslint-plugin": "^8.7.0",
     "@typescript-eslint/parser": "^8.7.0",
+    "@xmldom/xmldom": "^0.8.11",
     "buffer": "^6.0.3",
     "chalk": "^4.1.0",
     "check-for-leaks": "^1.2.1",
diff --git a/devel/electron37/files/patch-build_rust_allocator_lib.rs b/devel/electron37/files/patch-build_rust_allocator_lib.rs
index c7a59f7ef428..cbffdab47210 100644
--- a/devel/electron37/files/patch-build_rust_allocator_lib.rs
+++ b/devel/electron37/files/patch-build_rust_allocator_lib.rs
@@ -1,15 +1,21 @@
 --- build/rust/allocator/lib.rs.orig	2025-08-11 20:33:34 UTC
 +++ build/rust/allocator/lib.rs
-@@ -86,6 +86,12 @@ mod both_allocators {
-     /// As part of rustc's contract for using `#[global_allocator]` without
-     /// rustc-generated shims we must define this symbol, since we are opting in
-     /// to unstable functionality. See https://github.com/rust-lang/rust/issues/123015
+@@ -90,7 +90,18 @@ mod both_allocators {
+     #[linkage = "weak"]
+     static __rust_no_alloc_shim_is_unstable: u8 = 0;
+ 
 +    #[rustc_std_internal_symbol]
 +    #[linkage = "weak"]
 +    fn __rust_no_alloc_shim_is_unstable_v2() {}
 +
-+    // TODO(crbug.com/422538133) Remove after rolling past
-+    // https://github.com/rust-lang/rust/pull/141061
-     #[no_mangle]
++    #[rustc_std_internal_symbol]
++    #[linkage = "weak"]
++    fn __rust_alloc_error_handler_should_panic_v2() -> u8 {
++        0
++    }
++
+     // Mangle the symbol name as rustc expects.
++    // TODO(crbug.com/440481922): Remove this after rolling past https://github.com/rust-lang/rust/pull/143387
+     #[rustc_std_internal_symbol]
+     #[allow(non_upper_case_globals)]
      #[linkage = "weak"]
-     static __rust_no_alloc_shim_is_unstable: u8 = 0;
diff --git a/devel/electron37/files/patch-electron_script_spec-runner.js b/devel/electron37/files/patch-electron_script_spec-runner.js
index 48b303bb179e..8901659df179 100644
--- a/devel/electron37/files/patch-electron_script_spec-runner.js
+++ b/devel/electron37/files/patch-electron_script_spec-runner.js
@@ -1,9 +1,9 @@
---- electron/script/spec-runner.js.orig	2025-03-10 00:01:50 UTC
+--- electron/script/spec-runner.js.orig	2025-09-27 17:30:52 UTC
 +++ electron/script/spec-runner.js
-@@ -200,7 +200,7 @@ async function runTestUsingElectron (specDir, testName
-     exe = path.resolve(BASE, utils.getElectronExec());
+@@ -359,7 +359,7 @@ async function runTestUsingElectron (specDir, testName
+     argsToPass = argsToPass.filter(arg => (arg.toString().indexOf('--files') === -1 && arg.toString().indexOf('spec/') === -1));
    }
-   const runnerArgs = [`electron/${specDir}`, ...unknownArgs.slice(2)];
+   const runnerArgs = [`electron/${specDir}`, ...argsToPass, ...additionalArgs];
 -  if (process.platform === 'linux') {
 +  if (process.platform === 'linux' || process.platform === 'freebsd') {
      runnerArgs.unshift(path.resolve(__dirname, 'dbus_mock.py'), exe);
diff --git a/devel/electron37/files/patch-electron_spec_chromium-spec.ts b/devel/electron37/files/patch-electron_spec_chromium-spec.ts
index 629ead59ad59..2d4b6ea82803 100644
--- a/devel/electron37/files/patch-electron_spec_chromium-spec.ts
+++ b/devel/electron37/files/patch-electron_spec_chromium-spec.ts
@@ -1,4 +1,4 @@
---- electron/spec/chromium-spec.ts.orig	2025-08-13 14:21:20 UTC
+--- electron/spec/chromium-spec.ts.orig	2025-09-27 17:30:52 UTC
 +++ electron/spec/chromium-spec.ts
 @@ -475,13 +475,13 @@ describe('command line switches', () => {
      it('should not set an invalid locale', async () => testLocale('asdfkl', `${currentLocale}|${currentSystemLocale}|${currentPreferredLanguages}`));
@@ -18,7 +18,7 @@
    });
  
    describe('--remote-debugging-pipe switch', () => {
-@@ -2958,12 +2958,12 @@ describe('font fallback', () => {
+@@ -3213,12 +3213,12 @@ describe('font fallback', () => {
        expect(fonts[0].familyName).to.equal('Arial');
      } else if (process.platform === 'darwin') {
        expect(fonts[0].familyName).to.equal('Helvetica');
@@ -33,7 +33,7 @@
      const html = `
      <html lang="ja-JP">
        <head>
-@@ -3516,7 +3516,7 @@ describe('paste execCommand', () => {
+@@ -3771,7 +3771,7 @@ describe('paste execCommand', () => {
    });
  });
  
diff --git a/devel/electron37/files/yarn.lock b/devel/electron37/files/yarn.lock
index a12aa3686643..11e117a506a8 100644
--- a/devel/electron37/files/yarn.lock
+++ b/devel/electron37/files/yarn.lock
@@ -1292,6 +1292,11 @@
   resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e"
   integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==
 
+"@xmldom/xmldom@^0.8.11":
+  version "0.8.11"
+  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.11.tgz#b79de2d67389734c57c52595f7a7305e30c2d608"
+  integrity sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==
+
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -7280,14 +7285,7 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==