diff options
Diffstat (limited to 'devel/electron37/files')
8 files changed, 69 insertions, 28 deletions
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" ] |