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,25 +1,25 @@ -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 SIZE (electron/chromium-134.0.6998.205.tar.xz.1) = 2000000000 SHA256 (electron/chromium-134.0.6998.205.tar.xz.2) = 9631efe75d07b1f36799506e59b8d49e478d71535188b95aca088f9d6fa49b84 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 SIZE (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 180646 SHA256 (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = f4ebb40a8d85dbb7ef02aa0571b2f8e22182c6d73b6992484a53c90047779d01 SIZE (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = 2112918 SHA256 (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 88e65f116c7a06fccedb43970fba63080a57a4e5dc29147d2cdfe1ee58dd0546 SIZE (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 1136238 SHA256 (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = a365df6d83e0be3cc000b70bd39734d80c28f0d9983ebe44698337a2ca464bb1 SIZE (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = 62962 SHA256 (electron/EngFlow-reclient-configs-955335c30a752e9ef7bff375baab5e0819b6c00d_GH0.tar.gz) = c148f76220fc41a89ffeaf370c2cc175577be184688b12aa6fec5f8ac6c714c4 SIZE (electron/EngFlow-reclient-configs-955335c30a752e9ef7bff375baab5e0819b6c00d_GH0.tar.gz) = 13014 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,60 +1,60 @@ ---- 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" ] } - if (!is_mas_build) { + if (!is_mas_build && !is_bsd) { 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" ] } } + if (is_bsd) { + sources -= [ + "shell/common/crash_keys.cc", + "shell/common/crash_keys.h", + ] + } 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", - "//components/crash/core/app", + # "//components/crash/core/app", "//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" ] } - if (is_linux) { + if (is_linux && !is_bsd) { 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" ] } - if (is_linux) { + if (is_linux && !is_bsd) { 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", ] - if (is_linux) { + if (is_linux && !is_bsd) { data_deps += [ "//sandbox/linux:chrome_sandbox" ] } deps = data_deps 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,63 +1,63 @@ ---- 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 -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/nix/xdg_util.h" #include "v8/include/v8-wasm-trap-handler-posix.h" #include "v8/include/v8.h" #endif -#if !IS_MAS_BUILD() +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD) #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; } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) case DIR_APP_DATA: { auto env = base::Environment::Create(); cur = base::nix::GetXDGDirectory( -@@ -282,7 +282,7 @@ std::optional ElectronMainDelegate::BasicStartupC +@@ -302,7 +302,7 @@ std::optional ElectronMainDelegate::BasicStartupC base::win::PinUser32(); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // 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 -#if !IS_MAS_BUILD() +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD) crash_reporter::InitializeCrashKeys(); #endif -@@ -367,7 +367,7 @@ void ElectronMainDelegate::PreSandboxStartup() { +@@ -387,7 +387,7 @@ void ElectronMainDelegate::PreSandboxStartup() { } #endif -#if !IS_MAS_BUILD() +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD) crash_keys::SetCrashKeysFromCommandLine(*command_line); crash_keys::SetPlatformCrashKey(); #endif -@@ -402,7 +402,7 @@ std::optional ElectronMainDelegate::PreBrowserMai +@@ -422,7 +422,7 @@ std::optional ElectronMainDelegate::PreBrowserMai #if BUILDFLAG(IS_MAC) RegisterAtomCrApp(); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Set the global activation token sent as an environment variable. auto env = base::Environment::Create(); base::nix::ExtractXdgActivationTokenFromEnv(*env);