summaryrefslogtreecommitdiff
path: root/devel/electron35
diff options
context:
space:
mode:
Diffstat (limited to 'devel/electron35')
-rw-r--r--devel/electron35/Makefile1
-rw-r--r--devel/electron35/Makefile.version2
-rw-r--r--devel/electron35/distinfo10
-rw-r--r--devel/electron35/files/patch-build_rust_allocator_lib.rs10
-rw-r--r--devel/electron35/files/patch-electron_BUILD.gn14
-rw-r--r--devel/electron35/files/patch-electron_shell_app_electron__main__delegate.cc14
6 files changed, 29 insertions, 22 deletions
diff --git a/devel/electron35/Makefile b/devel/electron35/Makefile
index a2ae5821a91c..85f863b05b49 100644
--- a/devel/electron35/Makefile
+++ b/devel/electron35/Makefile
@@ -24,6 +24,7 @@ LICENSE= BSD3CLAUSE LGPL21 MPL11 MIT
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/electron/LICENSE
+BROKEN_i386= fetch fails: node process stalls during fetch phase and eats up all CPUs
ONLY_FOR_ARCHS= aarch64 amd64 i386
FETCH_DEPENDS= yarn${NODEJS_SUFFIX}>0:www/yarn${NODEJS_SUFFIX}
diff --git a/devel/electron35/Makefile.version b/devel/electron35/Makefile.version
index 7671472a6fa4..54d31bd95ed2 100644
--- a/devel/electron35/Makefile.version
+++ b/devel/electron35/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER= 35.7.4
+ELECTRON_VER= 35.7.5
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron35/distinfo b/devel/electron35/distinfo
index ce34fbbc7b80..20e1aa401c01 100644
--- a/devel/electron35/distinfo
+++ b/devel/electron35/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1754565391
+TIMESTAMP = 1755725511
SHA256 (electron/chromium-134.0.6998.205.tar.xz.0) = 2de727120892e92fa40fed6c76104ed66dace4fe66ae3be0e055c51b913009e8
SIZE (electron/chromium-134.0.6998.205.tar.xz.0) = 2000000000
SHA256 (electron/chromium-134.0.6998.205.tar.xz.1) = 58024b9e01977a769576b4c2b3056c9d894a2c13b4f0729f0b8060b3984243c9
@@ -7,10 +7,10 @@ SHA256 (electron/chromium-134.0.6998.205.tar.xz.2) = 9631efe75d07b1f36799506e59b
SIZE (electron/chromium-134.0.6998.205.tar.xz.2) = 171552128
SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (electron/electron-yarn-cache-35.7.4.tar.xz) = d582f8f50f479816b284f636a7ee9b1e4b5fe966d9f1157e6b5a5cb93d46b397
-SIZE (electron/electron-yarn-cache-35.7.4.tar.xz) = 30487296
-SHA256 (electron/electron-electron-v35.7.4_GH0.tar.gz) = 22133e17f24982ebbe19ef58fdbbe9d3d2ef10fd6cbfffdfec74f3596eacddbd
-SIZE (electron/electron-electron-v35.7.4_GH0.tar.gz) = 14804123
+SHA256 (electron/electron-yarn-cache-35.7.5.tar.xz) = d582f8f50f479816b284f636a7ee9b1e4b5fe966d9f1157e6b5a5cb93d46b397
+SIZE (electron/electron-yarn-cache-35.7.5.tar.xz) = 30487296
+SHA256 (electron/electron-electron-v35.7.5_GH0.tar.gz) = 5adcbf3c671e4b1e8fc4f6a78425214a8e5c36eb89a1d06b02fbbf45ccf45f09
+SIZE (electron/electron-electron-v35.7.5_GH0.tar.gz) = 14805277
SHA256 (electron/nodejs-node-v22.16.0_GH0.tar.gz) = 00d7c2a8f315f201fe30e2f7ac5a137663ab1c79a5c6873df553aff0409ce291
SIZE (electron/nodejs-node-v22.16.0_GH0.tar.gz) = 122982623
SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb
diff --git a/devel/electron35/files/patch-build_rust_allocator_lib.rs b/devel/electron35/files/patch-build_rust_allocator_lib.rs
index 89fddf278294..90c48fdb94cc 100644
--- a/devel/electron35/files/patch-build_rust_allocator_lib.rs
+++ b/devel/electron35/files/patch-build_rust_allocator_lib.rs
@@ -1,6 +1,6 @@
---- build/rust/allocator/lib.rs.orig 2025-05-20 09:16:26 UTC
+--- build/rust/allocator/lib.rs.orig 2025-08-26 21:24:10 UTC
+++ build/rust/allocator/lib.rs
-@@ -0,0 +1,119 @@
+@@ -0,0 +1,125 @@
+// 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.
@@ -92,6 +92,12 @@
+ /// 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
++ #[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]
+ #[linkage = "weak"]
+ static __rust_no_alloc_shim_is_unstable: u8 = 0;
diff --git a/devel/electron35/files/patch-electron_BUILD.gn b/devel/electron35/files/patch-electron_BUILD.gn
index c788724fe500..07ff2439ad64 100644
--- a/devel/electron35/files/patch-electron_BUILD.gn
+++ b/devel/electron35/files/patch-electron_BUILD.gn
@@ -1,6 +1,6 @@
---- electron/BUILD.gn.orig 2025-05-27 20:59:13 UTC
+--- electron/BUILD.gn.orig 2025-08-19 00:41:48 UTC
+++ electron/BUILD.gn
-@@ -543,7 +543,7 @@ source_set("electron_lib") {
+@@ -547,7 +547,7 @@ source_set("electron_lib") {
defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ]
}
@@ -9,7 +9,7 @@
deps += [
"//components/crash/core/app",
"//components/crash/core/browser",
-@@ -636,6 +636,12 @@ source_set("electron_lib") {
+@@ -640,6 +640,12 @@ source_set("electron_lib") {
cflags_objcc = [ "-fobjc-weak" ]
}
}
@@ -22,7 +22,7 @@
if (is_linux) {
libs = [ "xshmfence" ]
deps += [
-@@ -1206,7 +1212,7 @@ if (is_mac) {
+@@ -1218,7 +1224,7 @@ if (is_mac) {
":electron_lib",
":electron_win32_resources",
":packed_resources",
@@ -31,7 +31,7 @@
"//content:sandbox_helper_win",
"//electron/buildflags",
"//third_party/electron_node:libnode",
-@@ -1233,7 +1239,7 @@ if (is_mac) {
+@@ -1245,7 +1251,7 @@ if (is_mac) {
public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ]
}
@@ -40,7 +40,7 @@
data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ]
}
-@@ -1300,7 +1306,7 @@ if (is_mac) {
+@@ -1312,7 +1318,7 @@ if (is_mac) {
configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
}
@@ -49,7 +49,7 @@
deps += [ "//sandbox/linux:chrome_sandbox" ]
}
}
-@@ -1408,7 +1414,7 @@ dist_zip("electron_dist_zip") {
+@@ -1420,7 +1426,7 @@ dist_zip("electron_dist_zip") {
":electron_version_file",
":licenses",
]
diff --git a/devel/electron35/files/patch-electron_shell_app_electron__main__delegate.cc b/devel/electron35/files/patch-electron_shell_app_electron__main__delegate.cc
index 5b4708fab656..a3f7f13937bd 100644
--- a/devel/electron35/files/patch-electron_shell_app_electron__main__delegate.cc
+++ b/devel/electron35/files/patch-electron_shell_app_electron__main__delegate.cc
@@ -1,6 +1,6 @@
---- electron/shell/app/electron_main_delegate.cc.orig 2025-01-29 20:10:57 UTC
+--- electron/shell/app/electron_main_delegate.cc.orig 2025-08-19 00:41:48 UTC
+++ electron/shell/app/electron_main_delegate.cc
-@@ -59,13 +59,13 @@
+@@ -63,13 +63,13 @@
#include "chrome/child/v8_crashpad_support_win.h"
#endif
@@ -16,7 +16,7 @@
#include "components/crash/core/app/crash_switches.h" // nogncheck
#include "components/crash/core/app/crashpad.h" // nogncheck
#include "components/crash/core/common/crash_key.h"
-@@ -156,7 +156,7 @@ bool ElectronPathProvider(int key, base::FilePath* res
+@@ -160,7 +160,7 @@ bool ElectronPathProvider(int key, base::FilePath* res
create_dir = true;
break;
}
@@ -25,7 +25,7 @@
case DIR_APP_DATA: {
auto env = base::Environment::Create();
cur = base::nix::GetXDGDirectory(
-@@ -282,7 +282,7 @@ std::optional<int> ElectronMainDelegate::BasicStartupC
+@@ -302,7 +302,7 @@ std::optional<int> ElectronMainDelegate::BasicStartupC
base::win::PinUser32();
#endif
@@ -34,7 +34,7 @@
// Check for --no-sandbox parameter when running as root.
if (getuid() == 0 && IsSandboxEnabled(command_line))
LOG(FATAL) << "Running as root without --"
-@@ -332,7 +332,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
+@@ -352,7 +352,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
/* is_preinit = */ IsBrowserProcess() || IsZygoteProcess());
#endif
@@ -43,7 +43,7 @@
crash_reporter::InitializeCrashKeys();
#endif
-@@ -367,7 +367,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
+@@ -387,7 +387,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
}
#endif
@@ -52,7 +52,7 @@
crash_keys::SetCrashKeysFromCommandLine(*command_line);
crash_keys::SetPlatformCrashKey();
#endif
-@@ -402,7 +402,7 @@ std::optional<int> ElectronMainDelegate::PreBrowserMai
+@@ -422,7 +422,7 @@ std::optional<int> ElectronMainDelegate::PreBrowserMai
#if BUILDFLAG(IS_MAC)
RegisterAtomCrApp();
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-28 00:38:51 +0000