aboutsummaryrefslogtreecommitdiff
path: root/devel/electron36
diff options
context:
space:
mode:
Diffstat (limited to 'devel/electron36')
-rw-r--r--devel/electron36/Makefile1
-rw-r--r--devel/electron36/Makefile.version2
-rw-r--r--devel/electron36/distinfo10
-rw-r--r--devel/electron36/files/package.json1
-rw-r--r--devel/electron36/files/patch-build_rust_allocator_lib.rs11
-rw-r--r--devel/electron36/files/patch-electron_script_spec-runner.js8
-rw-r--r--devel/electron36/files/yarn.lock14
7 files changed, 26 insertions, 21 deletions
diff --git a/devel/electron36/Makefile b/devel/electron36/Makefile
index 364b21497bdf..18efc64ae1a2 100644
--- a/devel/electron36/Makefile
+++ b/devel/electron36/Makefile
@@ -1,7 +1,6 @@
PORTNAME= electron
DISTVERSIONPREFIX= v
DISTVERSION= ${ELECTRON_VER}
-PORTREVISION= 1
PULSEMV= 16
PULSEV= ${PULSEMV}.1
CATEGORIES= devel
diff --git a/devel/electron36/Makefile.version b/devel/electron36/Makefile.version
index af8892af2378..3c6b270a47c8 100644
--- a/devel/electron36/Makefile.version
+++ b/devel/electron36/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER= 36.9.2
+ELECTRON_VER= 36.9.4
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron36/distinfo b/devel/electron36/distinfo
index a76d2c98f242..02d66418afad 100644
--- a/devel/electron36/distinfo
+++ b/devel/electron36/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1759217951
+TIMESTAMP = 1760018491
SHA256 (electron/chromium-136.0.7103.177.tar.xz.0) = 75e7a4c47e9a958aae70a026c8d005c07b76b02bf315071f209070fddaaa7665
SIZE (electron/chromium-136.0.7103.177.tar.xz.0) = 2000000000
SHA256 (electron/chromium-136.0.7103.177.tar.xz.1) = a86bdf58829129e0ef42a1bc6e5864701fba4572456631660c04c20e6d5bcee3
@@ -7,10 +7,10 @@ SHA256 (electron/chromium-136.0.7103.177.tar.xz.2) = 81a0db12277369bfae95002de9b
SIZE (electron/chromium-136.0.7103.177.tar.xz.2) = 248456988
SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (electron/electron-yarn-cache-36.9.2.tar.xz) = 7823d2fceaf2aac5bb0b342866049b0dfdeca98a65ac00559abfaff47bdba536
-SIZE (electron/electron-yarn-cache-36.9.2.tar.xz) = 30480408
-SHA256 (electron/electron-electron-v36.9.2_GH0.tar.gz) = e0295cbe9f1bef95f3a695e52d7f5afb35f38ceaa927a00f6e421c5cb3443d56
-SIZE (electron/electron-electron-v36.9.2_GH0.tar.gz) = 15826007
+SHA256 (electron/electron-yarn-cache-36.9.4.tar.xz) = 34a44bb3ceaa38384ab57905ac82eb29f3cb66db5f731479d67b306211916e3d
+SIZE (electron/electron-yarn-cache-36.9.4.tar.xz) = 30531168
+SHA256 (electron/electron-electron-v36.9.4_GH0.tar.gz) = eeee3745bb6eeaa357b42ff78143421c8d124830e0d327ec64ef0d16a523b9ca
+SIZE (electron/electron-electron-v36.9.4_GH0.tar.gz) = 15830187
SHA256 (electron/nodejs-node-v22.19.0_GH0.tar.gz) = 8f28e6635c2fe9d1ea29347606df81128c52bc3a2b820aca5851bd6b89c96aa4
SIZE (electron/nodejs-node-v22.19.0_GH0.tar.gz) = 123089614
SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb
diff --git a/devel/electron36/files/package.json b/devel/electron36/files/package.json
index bb15faa1f136..9f65235eaa4b 100644
--- a/devel/electron36/files/package.json
+++ b/devel/electron36/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/electron36/files/patch-build_rust_allocator_lib.rs b/devel/electron36/files/patch-build_rust_allocator_lib.rs
index e6dbd2f7e553..169f7b234830 100644
--- a/devel/electron36/files/patch-build_rust_allocator_lib.rs
+++ b/devel/electron36/files/patch-build_rust_allocator_lib.rs
@@ -1,6 +1,6 @@
---- build/rust/allocator/lib.rs.orig 2025-08-26 21:39:41 UTC
+--- build/rust/allocator/lib.rs.orig 2025-10-04 08:35:33 UTC
+++ build/rust/allocator/lib.rs
-@@ -0,0 +1,125 @@
+@@ -0,0 +1,132 @@
+// Copyright 2025 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -102,7 +102,14 @@
+ #[linkage = "weak"]
+ static __rust_no_alloc_shim_is_unstable: u8 = 0;
+
++ #[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"]
diff --git a/devel/electron36/files/patch-electron_script_spec-runner.js b/devel/electron36/files/patch-electron_script_spec-runner.js
index 48b303bb179e..44489b4673cd 100644
--- a/devel/electron36/files/patch-electron_script_spec-runner.js
+++ b/devel/electron36/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-10-06 01:13:10 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/electron36/files/yarn.lock b/devel/electron36/files/yarn.lock
index a12aa3686643..11e117a506a8 100644
--- a/devel/electron36/files/yarn.lock
+++ b/devel/electron36/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==