summaryrefslogtreecommitdiff
path: root/devel/electron37
diff options
context:
space:
mode:
Diffstat (limited to 'devel/electron37')
-rw-r--r--devel/electron37/Makefile5
-rw-r--r--devel/electron37/Makefile.version2
-rw-r--r--devel/electron37/distinfo22
-rw-r--r--devel/electron37/files/patch-build_rust_allocator_lib.rs15
-rw-r--r--devel/electron37/files/patch-electron_BUILD.gn14
-rw-r--r--devel/electron37/files/patch-electron_shell_app_electron__main__delegate.cc14
-rw-r--r--devel/electron37/files/patch-electron_shell_browser_api_electron__api__web__contents.cc8
-rw-r--r--devel/electron37/files/patch-electron_shell_browser_api_electron__api__web__contents.h4
-rw-r--r--devel/electron37/files/patch-electron_shell_services_node_node__service.cc6
-rw-r--r--devel/electron37/files/patch-electron_spec_api-tray-spec.ts18
-rw-r--r--devel/electron37/files/patch-net_dns_BUILD.gn18
11 files changed, 84 insertions, 42 deletions
diff --git a/devel/electron37/Makefile b/devel/electron37/Makefile
index 5ce4c11b17e5..cfd71a8f372e 100644
--- a/devel/electron37/Makefile
+++ b/devel/electron37/Makefile
@@ -4,7 +4,7 @@ DISTVERSION= ${ELECTRON_VER}
PULSEMV= 16
PULSEV= ${PULSEMV}.1
CATEGORIES= devel
-MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v37.3.0/:chromium \
+MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v37.4.0/:chromium \
https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR}
DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.0:chromium \
@@ -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}
@@ -224,7 +225,7 @@ SNDIO_VARS= GN_ARGS+=use_sndio=true
SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
# See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
-CHROMIUM_VER= 138.0.7204.224
+CHROMIUM_VER= 138.0.7204.243
# See ${WRKSRC}/electron/DEPS for NODE_VER
NODE_VER= 22.18.0
# See ${WRKSRC}/electron/DEPS for NAN_VER
diff --git a/devel/electron37/Makefile.version b/devel/electron37/Makefile.version
index 1643dd117eff..316992727560 100644
--- a/devel/electron37/Makefile.version
+++ b/devel/electron37/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER= 37.3.0
+ELECTRON_VER= 37.4.0
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron37/distinfo b/devel/electron37/distinfo
index b309c2f50537..24e208c6a0dc 100644
--- a/devel/electron37/distinfo
+++ b/devel/electron37/distinfo
@@ -1,16 +1,16 @@
-TIMESTAMP = 1755380758
-SHA256 (electron/chromium-138.0.7204.224.tar.xz.0) = 13050324d4260aa3f54e289036837a34ed07822452036a0bc6c51f54a3162472
-SIZE (electron/chromium-138.0.7204.224.tar.xz.0) = 2000000000
-SHA256 (electron/chromium-138.0.7204.224.tar.xz.1) = 208c88ddd1874ed09761aa865b4c28d9e2ece2426f0ad71f9d11361194120469
-SIZE (electron/chromium-138.0.7204.224.tar.xz.1) = 2000000000
-SHA256 (electron/chromium-138.0.7204.224.tar.xz.2) = 26ff0135621e9ef07d13f3eb0cfa4d96a353fbf15af3fab4a9a8cfc81892545c
-SIZE (electron/chromium-138.0.7204.224.tar.xz.2) = 273467888
+TIMESTAMP = 1756372577
+SHA256 (electron/chromium-138.0.7204.243.tar.xz.0) = 6de4153de04a391369af78bf7e6e88872f8404486ad8a587fe25ed21e6a408dd
+SIZE (electron/chromium-138.0.7204.243.tar.xz.0) = 2000000000
+SHA256 (electron/chromium-138.0.7204.243.tar.xz.1) = ae7fc8e34ad25e4be009722383d862bbee6823fbeb237edb4376f4c21a4a72a0
+SIZE (electron/chromium-138.0.7204.243.tar.xz.1) = 2000000000
+SHA256 (electron/chromium-138.0.7204.243.tar.xz.2) = 06a4639f0361fbcd6d0fac04931986886c140c24f98b6cc50febc6921cd32d0f
+SIZE (electron/chromium-138.0.7204.243.tar.xz.2) = 274022020
SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (electron/electron-yarn-cache-37.3.0.tar.xz) = 7823d2fceaf2aac5bb0b342866049b0dfdeca98a65ac00559abfaff47bdba536
-SIZE (electron/electron-yarn-cache-37.3.0.tar.xz) = 30480408
-SHA256 (electron/electron-electron-v37.3.0_GH0.tar.gz) = 3dafe62b05fad97613a0a5605d72e16da2bad7ebfcda841d55c4ceb4001d2f6d
-SIZE (electron/electron-electron-v37.3.0_GH0.tar.gz) = 15833154
+SHA256 (electron/electron-yarn-cache-37.4.0.tar.xz) = 7823d2fceaf2aac5bb0b342866049b0dfdeca98a65ac00559abfaff47bdba536
+SIZE (electron/electron-yarn-cache-37.4.0.tar.xz) = 30480408
+SHA256 (electron/electron-electron-v37.4.0_GH0.tar.gz) = 43ccbd61351999cd09314b5ac28e97c78f584f40fb85dfd09564aad92a6d37a8
+SIZE (electron/electron-electron-v37.4.0_GH0.tar.gz) = 15838013
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/electron37/files/patch-build_rust_allocator_lib.rs b/devel/electron37/files/patch-build_rust_allocator_lib.rs
new file mode 100644
index 000000000000..c7a59f7ef428
--- /dev/null
+++ b/devel/electron37/files/patch-build_rust_allocator_lib.rs
@@ -0,0 +1,15 @@
+--- 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
++ #[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/electron37/files/patch-electron_BUILD.gn b/devel/electron37/files/patch-electron_BUILD.gn
index 32319d474890..5d4a0e24bf71 100644
--- a/devel/electron37/files/patch-electron_BUILD.gn
+++ b/devel/electron37/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:38 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/electron37/files/patch-electron_shell_app_electron__main__delegate.cc b/devel/electron37/files/patch-electron_shell_app_electron__main__delegate.cc
index 171564c219b8..4a361e9da833 100644
--- a/devel/electron37/files/patch-electron_shell_app_electron__main__delegate.cc
+++ b/devel/electron37/files/patch-electron_shell_app_electron__main__delegate.cc
@@ -1,6 +1,6 @@
---- electron/shell/app/electron_main_delegate.cc.orig 2025-07-02 10:12:01 UTC
+--- electron/shell/app/electron_main_delegate.cc.orig 2025-08-18 21:37:38 UTC
+++ electron/shell/app/electron_main_delegate.cc
-@@ -60,13 +60,13 @@
+@@ -66,13 +66,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"
-@@ -158,7 +158,7 @@ bool ElectronPathProvider(int key, base::FilePath* res
+@@ -164,7 +164,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(
-@@ -284,7 +284,7 @@ std::optional<int> ElectronMainDelegate::BasicStartupC
+@@ -306,7 +306,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 --"
-@@ -334,7 +334,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
+@@ -356,7 +356,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
/* is_preinit = */ IsBrowserProcess() || IsZygoteProcess());
#endif
@@ -43,7 +43,7 @@
crash_reporter::InitializeCrashKeys();
#endif
-@@ -369,7 +369,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
+@@ -391,7 +391,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
}
#endif
@@ -52,7 +52,7 @@
crash_keys::SetCrashKeysFromCommandLine(*command_line);
crash_keys::SetPlatformCrashKey();
#endif
-@@ -404,7 +404,7 @@ std::optional<int> ElectronMainDelegate::PreBrowserMai
+@@ -426,7 +426,7 @@ std::optional<int> ElectronMainDelegate::PreBrowserMai
#if BUILDFLAG(IS_MAC)
RegisterAtomCrApp();
#endif
diff --git a/devel/electron37/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron37/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
index 5ab6f85cd1cf..060da520901c 100644
--- a/devel/electron37/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
+++ b/devel/electron37/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-08-06 01:20:29 UTC
+--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-08-18 21:37:38 UTC
+++ electron/shell/browser/api/electron_api_web_contents.cc
@@ -160,11 +160,11 @@
#include "ui/base/cocoa/defaults_utils.h"
@@ -41,7 +41,7 @@
// Update font settings.
static const gfx::FontRenderParams params(
gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
-@@ -2681,13 +2681,13 @@ void WebContents::ForcefullyCrashRenderer() {
+@@ -2710,13 +2710,13 @@ void WebContents::ForcefullyCrashRenderer() {
content::RenderProcessHost* rph = rwh->GetProcess();
if (rph) {
@@ -57,7 +57,7 @@
CrashDumpHungChildProcess(rph->GetProcess().Handle());
#endif
rph->Shutdown(content::RESULT_CODE_HUNG);
-@@ -3370,7 +3370,7 @@ void WebContents::Focus() {
+@@ -3399,7 +3399,7 @@ void WebContents::Focus() {
void WebContents::Focus() {
// Focusing on WebContents does not automatically focus the window on macOS
// and Linux, do it manually to match the behavior on Windows.
@@ -66,7 +66,7 @@
if (owner_window())
owner_window()->Focus(true);
#endif
-@@ -4239,7 +4239,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
+@@ -4268,7 +4268,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
}
#endif
diff --git a/devel/electron37/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron37/files/patch-electron_shell_browser_api_electron__api__web__contents.h
index 067cdf21a89b..de1cc8f43ef2 100644
--- a/devel/electron37/files/patch-electron_shell_browser_api_electron__api__web__contents.h
+++ b/devel/electron37/files/patch-electron_shell_browser_api_electron__api__web__contents.h
@@ -1,6 +1,6 @@
---- electron/shell/browser/api/electron_api_web_contents.h.orig 2025-06-16 21:48:02 UTC
+--- electron/shell/browser/api/electron_api_web_contents.h.orig 2025-08-18 21:37:38 UTC
+++ electron/shell/browser/api/electron_api_web_contents.h
-@@ -741,7 +741,7 @@ class WebContents final : public ExclusiveAccessContex
+@@ -743,7 +743,7 @@ class WebContents final : public ExclusiveAccessContex
#if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC)
ui::ImageModel GetDevToolsWindowIcon() override;
#endif
diff --git a/devel/electron37/files/patch-electron_shell_services_node_node__service.cc b/devel/electron37/files/patch-electron_shell_services_node_node__service.cc
index a69bf043abda..c12b95169c24 100644
--- a/devel/electron37/files/patch-electron_shell_services_node_node__service.cc
+++ b/devel/electron37/files/patch-electron_shell_services_node_node__service.cc
@@ -1,6 +1,6 @@
---- electron/shell/services/node/node_service.cc.orig 2025-07-02 10:12:01 UTC
+--- electron/shell/services/node/node_service.cc.orig 2025-08-25 07:57:03 UTC
+++ electron/shell/services/node/node_service.cc
-@@ -23,7 +23,7 @@
+@@ -24,7 +24,7 @@
#include "shell/common/node_includes.h"
#include "shell/services/node/parent_port.h"
@@ -9,7 +9,7 @@
#include "shell/common/crash_keys.h"
#endif
-@@ -40,7 +40,7 @@ void V8FatalErrorCallback(const char* location, const
+@@ -41,7 +41,7 @@ void V8FatalErrorCallback(const char* location, const
g_client_remote->OnV8FatalError(location, outstream.str());
}
diff --git a/devel/electron37/files/patch-electron_spec_api-tray-spec.ts b/devel/electron37/files/patch-electron_spec_api-tray-spec.ts
index cb822fdca402..a2cc8bcf183b 100644
--- a/devel/electron37/files/patch-electron_spec_api-tray-spec.ts
+++ b/devel/electron37/files/patch-electron_spec_api-tray-spec.ts
@@ -1,5 +1,21 @@
---- electron/spec/api-tray-spec.ts.orig 2024-10-09 13:53:06 UTC
+--- electron/spec/api-tray-spec.ts.orig 2025-08-25 07:57:03 UTC
+++ electron/spec/api-tray-spec.ts
+@@ -30,13 +30,13 @@ describe('tray module', () => {
+ }).to.throw(/Failed to load image from path (.+)/);
+ });
+
+- ifit(process.platform !== 'linux')('throws a descriptive error if an invalid guid is given', () => {
++ ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('throws a descriptive error if an invalid guid is given', () => {
+ expect(() => {
+ tray = new Tray(nativeImage.createEmpty(), 'I am not a guid');
+ }).to.throw('Invalid GUID format');
+ });
+
+- ifit(process.platform !== 'linux')('accepts a valid guid', () => {
++ ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('accepts a valid guid', () => {
+ expect(() => {
+ tray = new Tray(nativeImage.createEmpty(), '0019A433-3526-48BA-A66C-676742C0FEFB');
+ }).to.not.throw();
@@ -131,7 +131,7 @@ describe('tray module', () => {
describe('tray.getBounds()', () => {
afterEach(() => { tray.destroy(); });
diff --git a/devel/electron37/files/patch-net_dns_BUILD.gn b/devel/electron37/files/patch-net_dns_BUILD.gn
index d51291a1422a..e1fd322aea84 100644
--- a/devel/electron37/files/patch-net_dns_BUILD.gn
+++ b/devel/electron37/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" ]