summaryrefslogtreecommitdiff
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/patch-build_rust_allocator_lib.rs10
-rw-r--r--devel/electron36/files/patch-electron_BUILD.gn14
-rw-r--r--devel/electron36/files/patch-electron_shell_app_electron__main__delegate.cc14
-rw-r--r--devel/electron36/files/patch-net_dns_BUILD.gn18
7 files changed, 43 insertions, 26 deletions
diff --git a/devel/electron36/Makefile b/devel/electron36/Makefile
index 07024caddc7c..be9d93a8d942 100644
--- a/devel/electron36/Makefile
+++ b/devel/electron36/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/electron36/Makefile.version b/devel/electron36/Makefile.version
index ea22f9dc2511..95dcd5dbb623 100644
--- a/devel/electron36/Makefile.version
+++ b/devel/electron36/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER= 36.8.0
+ELECTRON_VER= 36.8.1
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron36/distinfo b/devel/electron36/distinfo
index fceffa6f71a0..6d7c84c4dd6a 100644
--- a/devel/electron36/distinfo
+++ b/devel/electron36/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1755312758
+TIMESTAMP = 1755784434
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.8.0.tar.xz) = 7823d2fceaf2aac5bb0b342866049b0dfdeca98a65ac00559abfaff47bdba536
-SIZE (electron/electron-yarn-cache-36.8.0.tar.xz) = 30480408
-SHA256 (electron/electron-electron-v36.8.0_GH0.tar.gz) = cd3865ee184dcbd64240ed9c4cf6c7d970bda5a65376207876c70e75c3da116e
-SIZE (electron/electron-electron-v36.8.0_GH0.tar.gz) = 15821288
+SHA256 (electron/electron-yarn-cache-36.8.1.tar.xz) = 7823d2fceaf2aac5bb0b342866049b0dfdeca98a65ac00559abfaff47bdba536
+SIZE (electron/electron-yarn-cache-36.8.1.tar.xz) = 30480408
+SHA256 (electron/electron-electron-v36.8.1_GH0.tar.gz) = c9ce73a67a2ec73eeaea05750d2f8a25986d2de5a1ce3cf3a4fc7ae588d76cbe
+SIZE (electron/electron-electron-v36.8.1_GH0.tar.gz) = 15822424
SHA256 (electron/nodejs-node-v22.18.0_GH0.tar.gz) = f0f7022d2bcf1e286a42ccf46bf184e67e469daa83ecd9fda2326e872bab7aa0
SIZE (electron/nodejs-node-v22.18.0_GH0.tar.gz) = 123027912
SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb
diff --git a/devel/electron36/files/patch-build_rust_allocator_lib.rs b/devel/electron36/files/patch-build_rust_allocator_lib.rs
index 89fddf278294..e6dbd2f7e553 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-05-20 09:16:26 UTC
+--- build/rust/allocator/lib.rs.orig 2025-08-26 21:39:41 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/electron36/files/patch-electron_BUILD.gn b/devel/electron36/files/patch-electron_BUILD.gn
index 32319d474890..1e399556d7df 100644
--- a/devel/electron36/files/patch-electron_BUILD.gn
+++ b/devel/electron36/files/patch-electron_BUILD.gn
@@ -1,6 +1,6 @@
---- electron/BUILD.gn.orig 2025-05-22 22:48:48 UTC
+--- electron/BUILD.gn.orig 2025-08-18 21:37: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/electron36/files/patch-electron_shell_app_electron__main__delegate.cc b/devel/electron36/files/patch-electron_shell_app_electron__main__delegate.cc
index 5b4708fab656..f98f4513390b 100644
--- a/devel/electron36/files/patch-electron_shell_app_electron__main__delegate.cc
+++ b/devel/electron36/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-18 21:37: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
diff --git a/devel/electron36/files/patch-net_dns_BUILD.gn b/devel/electron36/files/patch-net_dns_BUILD.gn
index d51291a1422a..e1fd322aea84 100644
--- a/devel/electron36/files/patch-net_dns_BUILD.gn
+++ b/devel/electron36/files/patch-net_dns_BUILD.gn
@@ -1,6 +1,6 @@
---- net/dns/BUILD.gn.orig 2025-04-06 11:53:44 UTC
+--- net/dns/BUILD.gn.orig 2025-03-29 00:50:57 UTC
+++ net/dns/BUILD.gn
-@@ -140,7 +140,7 @@ source_set("dns") {
+@@ -138,7 +138,7 @@ source_set("dns") {
"dns_config_service_android.cc",
"dns_config_service_android.h",
]
@@ -9,7 +9,17 @@
sources += [
"dns_config_service_linux.cc",
"dns_config_service_linux.h",
-@@ -181,6 +181,7 @@ source_set("dns") {
+@@ -172,6 +172,9 @@ source_set("dns") {
+ }
+
+ deps = [ "//net:net_deps" ]
++ if (is_bsd) {
++ deps += [ "//services/screen_ai/buildflags" ]
++ }
+
+ public_deps = [
+ ":dns_client",
+@@ -179,6 +182,7 @@ source_set("dns") {
":host_resolver_manager",
":mdns_client",
"//net:net_public_deps",
@@ -17,7 +27,7 @@
]
allow_circular_includes_from = [
-@@ -452,9 +453,9 @@ source_set("tests") {
+@@ -447,9 +451,9 @@ source_set("tests") {
if (is_android) {
sources += [ "dns_config_service_android_unittest.cc" ]
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-01 00:43:22 +0000