diff options
Diffstat (limited to 'devel/electron36')
21 files changed, 134 insertions, 114 deletions
diff --git a/devel/electron36/Makefile b/devel/electron36/Makefile index b11673660f2e..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} @@ -223,7 +224,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER CHROMIUM_VER= 136.0.7103.177 # See ${WRKSRC}/electron/DEPS for NODE_VER -NODE_VER= 22.17.1 +NODE_VER= 22.18.0 # See ${WRKSRC}/electron/DEPS for NAN_VER NAN_VER= e14bdcd1f72d62bca1d541b66da43130384ec213 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER diff --git a/devel/electron36/Makefile.version b/devel/electron36/Makefile.version index 07c121dfeac8..95dcd5dbb623 100644 --- a/devel/electron36/Makefile.version +++ b/devel/electron36/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 36.7.3 +ELECTRON_VER= 36.8.1 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron36/distinfo b/devel/electron36/distinfo index 7656f8e6cef4..6d7c84c4dd6a 100644 --- a/devel/electron36/distinfo +++ b/devel/electron36/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1753303703 +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,12 +7,12 @@ 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.7.3.tar.xz) = 156bcfdc1d2066a4e3639d76851884f446942aa05a371cbf4b6f43381fed497b -SIZE (electron/electron-yarn-cache-36.7.3.tar.xz) = 30485132 -SHA256 (electron/electron-electron-v36.7.3_GH0.tar.gz) = 0437086a10a07e157114f162209debaca4ed2ce635ce5475e82cef303d0719c3 -SIZE (electron/electron-electron-v36.7.3_GH0.tar.gz) = 15812876 -SHA256 (electron/nodejs-node-v22.17.1_GH0.tar.gz) = 7a1dbcd53b7152df5592624698f987fd626d9240c33d59dfef13812e4c168eb2 -SIZE (electron/nodejs-node-v22.17.1_GH0.tar.gz) = 123061071 +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 SIZE (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 180646 SHA256 (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = f4ebb40a8d85dbb7ef02aa0571b2f8e22182c6d73b6992484a53c90047779d01 diff --git a/devel/electron36/files/package.json b/devel/electron36/files/package.json index 4a3a1d78f04b..bb15faa1f136 100644 --- a/devel/electron36/files/package.json +++ b/devel/electron36/files/package.json @@ -18,7 +18,6 @@ "@types/semver": "^7.5.8", "@types/stream-json": "^1.7.7", "@types/temp": "^0.9.4", - "@types/webpack-env": "^1.18.5", "@typescript-eslint/eslint-plugin": "^8.7.0", "@typescript-eslint/parser": "^8.7.0", "buffer": "^6.0.3", 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-electron_shell_browser_api_electron__api__app.cc b/devel/electron36/files/patch-electron_shell_browser_api_electron__api__app.cc index 44d2f28e3b06..29d309d9e2ca 100644 --- a/devel/electron36/files/patch-electron_shell_browser_api_electron__api__app.cc +++ b/devel/electron36/files/patch-electron_shell_browser_api_electron__api__app.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/api/electron_api_app.cc.orig 2025-05-07 07:36:13 UTC +--- electron/shell/browser/api/electron_api_app.cc.orig 2025-08-14 14:48:00 UTC +++ electron/shell/browser/api/electron_api_app.cc @@ -96,7 +96,7 @@ #include "shell/common/process_util.h" @@ -54,7 +54,7 @@ auto memory_info = process_metric.second->GetMemoryInfo(); auto memory_dict = gin_helper::Dictionary::CreateEmpty(isolate); -@@ -1731,7 +1731,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild +@@ -1733,7 +1733,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild .SetMethod( "removeAsDefaultProtocolClient", base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser)) @@ -63,7 +63,7 @@ .SetMethod( "getApplicationInfoForProtocol", base::BindRepeating(&Browser::GetApplicationInfoForProtocol, browser)) -@@ -1789,7 +1789,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild +@@ -1791,7 +1791,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild .SetMethod("getJumpListSettings", &App::GetJumpListSettings) .SetMethod("setJumpList", &App::SetJumpList) #endif diff --git a/devel/electron36/files/patch-electron_shell_browser_api_electron__api__base__window.cc b/devel/electron36/files/patch-electron_shell_browser_api_electron__api__base__window.cc index bb00052d766a..3d9691fc033d 100644 --- a/devel/electron36/files/patch-electron_shell_browser_api_electron__api__base__window.cc +++ b/devel/electron36/files/patch-electron_shell_browser_api_electron__api__base__window.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/api/electron_api_base_window.cc.orig 2025-05-22 22:48:48 UTC +--- electron/shell/browser/api/electron_api_base_window.cc.orig 2025-08-14 14:48:00 UTC +++ electron/shell/browser/api/electron_api_base_window.cc @@ -42,7 +42,7 @@ #include "shell/browser/ui/views/win_frame_view.h" @@ -18,7 +18,7 @@ static_cast<NativeWindowViews*>(window_.get()) ->SetIcon(native_image->image().AsImageSkia()); #endif -@@ -1091,7 +1091,7 @@ bool BaseWindow::IsSnapped() const { +@@ -1118,7 +1118,7 @@ v8::Local<v8::Value> BaseWindow::GetAccentColor() cons } #endif @@ -27,7 +27,7 @@ void BaseWindow::SetTitleBarOverlay(const gin_helper::Dictionary& options, gin_helper::Arguments* args) { // Ensure WCO is already enabled on this window -@@ -1342,7 +1342,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate, +@@ -1371,7 +1371,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate, .SetMethod("setThumbnailToolTip", &BaseWindow::SetThumbnailToolTip) .SetMethod("setAppDetails", &BaseWindow::SetAppDetails) #endif diff --git a/devel/electron36/files/patch-electron_shell_browser_api_electron__api__base__window.h b/devel/electron36/files/patch-electron_shell_browser_api_electron__api__base__window.h index 20efa3ef927e..daf066932eef 100644 --- a/devel/electron36/files/patch-electron_shell_browser_api_electron__api__base__window.h +++ b/devel/electron36/files/patch-electron_shell_browser_api_electron__api__base__window.h @@ -1,7 +1,7 @@ ---- electron/shell/browser/api/electron_api_base_window.h.orig 2025-05-07 07:36:13 UTC +--- electron/shell/browser/api/electron_api_base_window.h.orig 2025-08-14 14:48:00 UTC +++ electron/shell/browser/api/electron_api_base_window.h -@@ -257,7 +257,7 @@ class BaseWindow : public gin_helper::TrackableObject< - bool IsSnapped() const; +@@ -259,7 +259,7 @@ class BaseWindow : public gin_helper::TrackableObject< + v8::Local<v8::Value> GetAccentColor() const; #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) diff --git a/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index a8f025d7e547..2f405c1ab390 100644 --- a/devel/electron36/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron36/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-06-16 21:48:02 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-08-05 14:34:17 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -160,11 +160,11 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -32,7 +32,7 @@ if (auto* linux_ui = ui::LinuxUi::instance()) return linux_ui->GetCursorBlinkInterval(); #elif BUILDFLAG(IS_WIN) -@@ -930,7 +930,7 @@ void WebContents::InitWithSessionAndOptions( +@@ -931,7 +931,7 @@ void WebContents::InitWithSessionAndOptions( accept_languages.pop_back(); prefs->accept_languages = accept_languages; @@ -41,7 +41,7 @@ // Update font settings. static const gfx::FontRenderParams params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -2672,13 +2672,13 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2680,13 +2680,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); -@@ -3355,7 +3355,7 @@ void WebContents::Focus() { +@@ -3369,7 +3369,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 -@@ -4236,7 +4236,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4250,7 +4250,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif diff --git a/devel/electron36/files/patch-electron_shell_browser_browser.h b/devel/electron36/files/patch-electron_shell_browser_browser.h index 8abb0580770a..bd3d48cb4d56 100644 --- a/devel/electron36/files/patch-electron_shell_browser_browser.h +++ b/devel/electron36/files/patch-electron_shell_browser_browser.h @@ -1,6 +1,6 @@ ---- electron/shell/browser/browser.h.orig 2024-10-22 02:29:46 UTC +--- electron/shell/browser/browser.h.orig 2025-08-14 14:48:00 UTC +++ electron/shell/browser/browser.h -@@ -144,7 +144,7 @@ class Browser : private WindowListObserver { +@@ -147,7 +147,7 @@ class Browser : private WindowListObserver { std::u16string GetApplicationNameForProtocol(const GURL& url); @@ -9,7 +9,7 @@ // get the name, icon and path for an application v8::Local<v8::Promise> GetApplicationInfoForProtocol(v8::Isolate* isolate, const GURL& url); -@@ -272,10 +272,10 @@ class Browser : private WindowListObserver { +@@ -275,10 +275,10 @@ class Browser : private WindowListObserver { PCWSTR GetAppUserModelID(); #endif // BUILDFLAG(IS_WIN) diff --git a/devel/electron36/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron36/files/patch-electron_shell_browser_native__window__views.cc index 07903bc01387..6a1b8f59ec44 100644 --- a/devel/electron36/files/patch-electron_shell_browser_native__window__views.cc +++ b/devel/electron36/files/patch-electron_shell_browser_native__window__views.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/native_window_views.cc.orig 2025-07-22 07:50:49 UTC +--- electron/shell/browser/native_window_views.cc.orig 2025-08-14 14:48:00 UTC +++ electron/shell/browser/native_window_views.cc -@@ -51,7 +51,7 @@ +@@ -52,7 +52,7 @@ #include "ui/wm/core/shadow_types.h" #include "ui/wm/core/window_util.h" @@ -9,7 +9,7 @@ #include "base/strings/string_util.h" #include "shell/browser/browser.h" #include "shell/browser/linux/unity_service.h" -@@ -281,7 +281,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -285,7 +285,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: params.parent = parent->GetNativeWindow(); params.native_widget = new ElectronDesktopNativeWidgetAura(this); @@ -18,7 +18,7 @@ std::string name = Browser::Get()->GetName(); // Set WM_WINDOW_ROLE. params.wm_role_name = "browser-window"; -@@ -306,7 +306,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -310,7 +310,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: std::string window_type; options.Get(options::kType, &window_type); @@ -27,7 +27,7 @@ // Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set. if (options.ValueOrDefault(options::kDarkTheme, false)) SetGTKDarkThemeEnabled(true); -@@ -428,7 +428,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -431,7 +431,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: if (window) window->AddPreTargetHandler(this); @@ -36,7 +36,7 @@ // On linux after the widget is initialized we might have to force set the // bounds if the bounds are smaller than the current display SetBounds(gfx::Rect(GetPosition(), bounds.size()), false); -@@ -464,7 +464,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us +@@ -467,7 +467,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us } void NativeWindowViews::SetGTKDarkThemeEnabled(bool use_dark_theme) { @@ -45,7 +45,7 @@ if (x11_util::IsX11()) { const std::string color = use_dark_theme ? "dark" : "light"; auto* connection = x11::Connection::Get(); -@@ -525,7 +525,7 @@ void NativeWindowViews::Show() { +@@ -528,7 +528,7 @@ void NativeWindowViews::Show() { NotifyWindowShow(); @@ -54,7 +54,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowMapped(); -@@ -541,7 +541,7 @@ void NativeWindowViews::ShowInactive() { +@@ -544,7 +544,7 @@ void NativeWindowViews::ShowInactive() { NotifyWindowShow(); @@ -63,7 +63,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowMapped(); -@@ -560,7 +560,7 @@ void NativeWindowViews::Hide() { +@@ -563,7 +563,7 @@ void NativeWindowViews::Hide() { NotifyWindowHide(); @@ -72,7 +72,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowUnmapped(); #endif -@@ -591,7 +591,7 @@ bool NativeWindowViews::IsEnabled() const { +@@ -594,7 +594,7 @@ bool NativeWindowViews::IsEnabled() const { bool NativeWindowViews::IsEnabled() const { #if BUILDFLAG(IS_WIN) return ::IsWindowEnabled(GetAcceleratedWidget()); @@ -81,7 +81,7 @@ if (x11_util::IsX11()) return !event_disabler_.get(); NOTIMPLEMENTED(); -@@ -841,7 +841,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou +@@ -828,7 +828,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou } #endif @@ -90,7 +90,7 @@ // On Linux and Windows the minimum and maximum size should be updated with // window size when window is not resizable. if (!resizable_) { -@@ -1099,7 +1099,7 @@ bool NativeWindowViews::IsClosable() const { +@@ -1086,7 +1086,7 @@ bool NativeWindowViews::IsClosable() const { return false; } return !(info.fState & MFS_DISABLED); @@ -99,7 +99,7 @@ return true; #endif } -@@ -1139,7 +1139,7 @@ void NativeWindowViews::Center() { +@@ -1126,7 +1126,7 @@ void NativeWindowViews::Center() { // for now to avoid breaking API contract, but should consider the long // term plan for this aligning with upstream. void NativeWindowViews::Center() { @@ -108,7 +108,7 @@ auto display = display::Screen::GetScreen()->GetDisplayNearestWindow(GetNativeWindow()); gfx::Rect window_bounds_in_screen = display.work_area(); -@@ -1363,7 +1363,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men +@@ -1350,7 +1350,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men } void NativeWindowViews::SetMenu(ElectronMenuModel* menu_model) { @@ -117,7 +117,7 @@ // Remove global menu bar. if (global_menu_bar_ && menu_model == nullptr) { global_menu_bar_.reset(); -@@ -1419,7 +1419,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* +@@ -1406,7 +1406,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* void NativeWindowViews::SetParentWindow(NativeWindow* parent) { NativeWindow::SetParentWindow(parent); @@ -126,7 +126,7 @@ if (x11_util::IsX11()) { auto* connection = x11::Connection::Get(); connection->SetProperty( -@@ -1465,7 +1465,7 @@ void NativeWindowViews::SetProgressBar(double progress +@@ -1452,7 +1452,7 @@ void NativeWindowViews::SetProgressBar(double progress NativeWindow::ProgressState state) { #if BUILDFLAG(IS_WIN) taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state); @@ -135,7 +135,7 @@ if (unity::IsRunning()) { unity::SetProgressFraction(progress); } -@@ -1559,7 +1559,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con +@@ -1574,7 +1574,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con if (const auto* view_native_widget = widget()->native_widget_private()) return view_native_widget->IsVisibleOnAllWorkspaces(); @@ -144,7 +144,7 @@ if (x11_util::IsX11()) { // Use the presence/absence of _NET_WM_STATE_STICKY in _NET_WM_STATE to // determine whether the current window is visible on all workspaces. -@@ -1582,7 +1582,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM +@@ -1597,7 +1597,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM #if BUILDFLAG(IS_WIN) window_handle = reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget); @@ -153,7 +153,7 @@ window_handle = static_cast<uint32_t>(accelerated_widget); #endif aura::WindowTreeHost* const host = -@@ -1680,7 +1680,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC +@@ -1695,7 +1695,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC SendMessage(hwnd, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(app_icon_.get())); } @@ -162,7 +162,7 @@ void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) { auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget( GetAcceleratedWidget()); -@@ -1776,7 +1776,7 @@ bool NativeWindowViews::CanMinimize() const { +@@ -1807,7 +1807,7 @@ bool NativeWindowViews::CanMinimize() const { bool NativeWindowViews::CanMinimize() const { #if BUILDFLAG(IS_WIN) return minimizable_; @@ -171,7 +171,7 @@ return true; #endif } -@@ -1832,7 +1832,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1863,7 +1863,7 @@ void NativeWindowViews::HandleKeyboardEvent( if (widget_destroyed_) return; @@ -180,7 +180,7 @@ if (event.windows_key_code == ui::VKEY_BROWSER_BACK) NotifyWindowExecuteAppCommand(kBrowserBackward); else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD) -@@ -1851,7 +1851,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e +@@ -1882,7 +1882,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e // Alt+Click should not toggle menu bar. root_view_.ResetAltState(); diff --git a/devel/electron36/files/patch-electron_shell_browser_native__window__views.h b/devel/electron36/files/patch-electron_shell_browser_native__window__views.h index d8a0e7419221..a3b94c7e82d1 100644 --- a/devel/electron36/files/patch-electron_shell_browser_native__window__views.h +++ b/devel/electron36/files/patch-electron_shell_browser_native__window__views.h @@ -1,4 +1,4 @@ ---- electron/shell/browser/native_window_views.h.orig 2025-06-25 22:07:23 UTC +--- electron/shell/browser/native_window_views.h.orig 2025-08-14 14:48:00 UTC +++ electron/shell/browser/native_window_views.h @@ -25,7 +25,7 @@ namespace electron { @@ -9,7 +9,7 @@ class GlobalMenuBarX11; #endif -@@ -163,7 +163,7 @@ class NativeWindowViews : public NativeWindow, +@@ -164,7 +164,7 @@ class NativeWindowViews : public NativeWindow, LPARAM l_param, LRESULT* result); void SetIcon(HICON small_icon, HICON app_icon); @@ -18,7 +18,7 @@ void SetIcon(const gfx::ImageSkia& icon); #endif -@@ -248,7 +248,7 @@ class NativeWindowViews : public NativeWindow, +@@ -253,7 +253,7 @@ class NativeWindowViews : public NativeWindow, // events from resizing the window. extensions::SizeConstraints old_size_constraints_; diff --git a/devel/electron36/files/patch-electron_spec_api-app-spec.ts b/devel/electron36/files/patch-electron_spec_api-app-spec.ts index af8cd3c05eb1..7224e73be380 100644 --- a/devel/electron36/files/patch-electron_spec_api-app-spec.ts +++ b/devel/electron36/files/patch-electron_spec_api-app-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-app-spec.ts.orig 2025-05-27 16:50:03 UTC +--- electron/spec/api-app-spec.ts.orig 2025-08-14 14:48:00 UTC +++ electron/spec/api-app-spec.ts -@@ -126,11 +126,11 @@ describe('app module', () => { +@@ -129,11 +129,11 @@ describe('app module', () => { }); describe('app.getPreferredSystemLanguages()', () => { @@ -14,7 +14,7 @@ const languages = app.getPreferredSystemLanguages(); if (languages.length) { expect(languages).to.not.include('C'); -@@ -193,7 +193,7 @@ describe('app module', () => { +@@ -196,7 +196,7 @@ describe('app module', () => { expect(code).to.equal(123, 'exit code should be 123, if you see this please tag @MarshallOfSound'); }); @@ -23,7 +23,16 @@ const electronPath = process.execPath; const appPath = path.join(fixturesPath, 'api', 'singleton'); appProcess = cp.spawn(electronPath, [appPath]); -@@ -447,7 +447,7 @@ describe('app module', () => { +@@ -360,7 +360,7 @@ describe('app module', () => { + }); + + // GitHub Actions macOS-13 runners used for x64 seem to have a problem with this test. +- ifdescribe(process.platform !== 'linux' && !isMacOSx64)('app.{add|get|clear}RecentDocument(s)', () => { ++ ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd' && !isMacOSx64)('app.{add|get|clear}RecentDocument(s)', () => { + const tempFiles = [ + path.join(fixturesPath, 'foo.txt'), + path.join(fixturesPath, 'bar.txt'), +@@ -488,7 +488,7 @@ describe('app module', () => { // let w = null // before(function () { @@ -32,16 +41,16 @@ // this.skip() // } // }) -@@ -554,7 +554,7 @@ describe('app module', () => { +@@ -595,7 +595,7 @@ describe('app module', () => { describe('app.badgeCount', () => { const platformIsNotSupported = - (process.platform === 'win32') || -- (process.platform === 'linux' && !app.isUnityRunning()); -+ ((process.platform === 'linux' || process.platform === 'freebsd') && !app.isUnityRunning()); + (process.platform === 'win32') || +- (process.platform === 'linux' && !app.isUnityRunning()); ++ (process.platform === 'linux' && !app.isUnityRunning()) || (process.platform === 'freebsd'); const expectedBadgeCount = 42; -@@ -598,7 +598,7 @@ describe('app module', () => { +@@ -639,7 +639,7 @@ describe('app module', () => { }); }); @@ -50,7 +59,7 @@ const isMac = process.platform === 'darwin'; const isWin = process.platform === 'win32'; -@@ -978,7 +978,7 @@ describe('app module', () => { +@@ -1019,7 +1019,7 @@ describe('app module', () => { }); }); @@ -59,7 +68,7 @@ it('is mutable', () => { const values = [false, true, false]; const setters: Array<(arg: boolean) => void> = [ -@@ -1178,7 +1178,7 @@ describe('app module', () => { +@@ -1219,7 +1219,7 @@ describe('app module', () => { }); }); @@ -68,7 +77,7 @@ let w: BrowserWindow; before(function () { -@@ -1313,7 +1313,7 @@ describe('app module', () => { +@@ -1354,7 +1354,7 @@ describe('app module', () => { describe('getApplicationNameForProtocol()', () => { // TODO: Linux CI doesn't have registered http & https handlers @@ -77,7 +86,7 @@ // We can't expect particular app names here, but these protocols should // at least have _something_ registered. Except on our Linux CI // environment apparently. -@@ -1331,7 +1331,7 @@ describe('app module', () => { +@@ -1372,7 +1372,7 @@ describe('app module', () => { }); }); @@ -86,7 +95,7 @@ it('returns promise rejection for a bogus protocol', async function () { await expect( app.getApplicationInfoForProtocol('bogus-protocol://') -@@ -1381,7 +1381,7 @@ describe('app module', () => { +@@ -1422,7 +1422,7 @@ describe('app module', () => { }); // FIXME Get these specs running on Linux CI @@ -95,7 +104,7 @@ const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico'); const sizes = { small: 16, -@@ -1463,7 +1463,7 @@ describe('app module', () => { +@@ -1504,7 +1504,7 @@ describe('app module', () => { expect(entry.memory).to.have.property('privateBytes').that.is.greaterThan(0); } @@ -104,7 +113,7 @@ expect(entry.sandboxed).to.be.a('boolean'); } -@@ -1537,7 +1537,7 @@ describe('app module', () => { +@@ -1578,7 +1578,7 @@ describe('app module', () => { it('succeeds with complete GPUInfo', async () => { const completeInfo = await getGPUInfo('complete'); @@ -113,7 +122,7 @@ // For linux and macOS complete info is same as basic info await verifyBasicGPUInfo(completeInfo); const basicInfo = await getGPUInfo('basic'); -@@ -1561,7 +1561,7 @@ describe('app module', () => { +@@ -1602,7 +1602,7 @@ describe('app module', () => { }); }); diff --git a/devel/electron36/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron36/files/patch-electron_spec_api-browser-window-spec.ts index f22d6bc7e526..ed5a58bd0baa 100644 --- a/devel/electron36/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron36/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2025-07-22 07:50:49 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2025-08-14 14:48:00 UTC +++ electron/spec/api-browser-window-spec.ts @@ -68,7 +68,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); @@ -72,7 +72,7 @@ it('checks normal bounds when minimized', async () => { const bounds = w.getBounds(); const minimize = once(w, 'minimize'); -@@ -2983,7 +2983,7 @@ describe('BrowserWindow module', () => { +@@ -3069,7 +3069,7 @@ describe('BrowserWindow module', () => { describe('BrowserWindow.setOpacity(opacity)', () => { afterEach(closeAllWindows); @@ -81,7 +81,7 @@ it('make window with initial opacity', () => { const w = new BrowserWindow({ show: false, opacity: 0.5 }); expect(w.getOpacity()).to.equal(0.5); -@@ -3009,7 +3009,7 @@ describe('BrowserWindow module', () => { +@@ -3095,7 +3095,7 @@ describe('BrowserWindow module', () => { }); }); @@ -90,7 +90,7 @@ it('sets 1 regardless of parameter', () => { const w = new BrowserWindow({ show: false }); w.setOpacity(0); -@@ -3220,7 +3220,7 @@ describe('BrowserWindow module', () => { +@@ -3306,7 +3306,7 @@ describe('BrowserWindow module', () => { expect(overlayRectPreMax.height).to.equal(size); // 'maximize' event is not emitted on Linux in CI. @@ -99,7 +99,7 @@ const maximize = once(w, 'maximize'); w.show(); w.maximize(); -@@ -3286,7 +3286,7 @@ describe('BrowserWindow module', () => { +@@ -3372,7 +3372,7 @@ describe('BrowserWindow module', () => { expect(preMaxHeight).to.equal(size); // 'maximize' event is not emitted on Linux in CI. @@ -108,7 +108,7 @@ const maximize = once(w, 'maximize'); w.show(); w.maximize(); -@@ -3951,7 +3951,7 @@ describe('BrowserWindow module', () => { +@@ -4037,7 +4037,7 @@ describe('BrowserWindow module', () => { expect(test.nodeTimers).to.equal(true); expect(test.nodeUrl).to.equal(true); @@ -117,7 +117,7 @@ expect(test.creationTime).to.be.null('creation time'); expect(test.systemMemoryInfo).to.be.null('system memory info'); } else { -@@ -4456,7 +4456,7 @@ describe('BrowserWindow module', () => { +@@ -4542,7 +4542,7 @@ describe('BrowserWindow module', () => { }); }); @@ -126,7 +126,7 @@ afterEach(closeAllWindows); it('emits an event when window is maximized', async () => { const w = new BrowserWindow({ show: false }); -@@ -4727,7 +4727,7 @@ describe('BrowserWindow module', () => { +@@ -4813,7 +4813,7 @@ describe('BrowserWindow module', () => { // TODO(zcbenz): // This test does not run on Linux CI. See: // https://github.com/electron/electron/issues/28699 @@ -135,7 +135,7 @@ const w = new BrowserWindow({}); const maximize = once(w, 'maximize'); w.maximize(); -@@ -4744,7 +4744,7 @@ describe('BrowserWindow module', () => { +@@ -4830,7 +4830,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable once maximize event works on Linux again on CI @@ -144,7 +144,7 @@ afterEach(closeAllWindows); it('should show the window if it is not currently shown', async () => { const w = new BrowserWindow({ show: false }); -@@ -4781,7 +4781,7 @@ describe('BrowserWindow module', () => { +@@ -4867,7 +4867,7 @@ describe('BrowserWindow module', () => { // TODO(dsanders11): Enable once minimize event works on Linux again. // See https://github.com/electron/electron/issues/28699 @@ -153,7 +153,7 @@ const w = new BrowserWindow(); const minimize = once(w, 'minimize'); w.minimize(); -@@ -5267,7 +5267,7 @@ describe('BrowserWindow module', () => { +@@ -5353,7 +5353,7 @@ describe('BrowserWindow module', () => { }); // On Linux there is no "resizable" property of a window. @@ -162,7 +162,7 @@ const w = new BrowserWindow({ show: false }); expect(w.resizable).to.be.true('resizable'); -@@ -5477,7 +5477,7 @@ describe('BrowserWindow module', () => { +@@ -5563,7 +5563,7 @@ describe('BrowserWindow module', () => { }); }); @@ -171,7 +171,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -6678,7 +6678,7 @@ describe('BrowserWindow module', () => { +@@ -6764,7 +6764,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows); diff --git a/devel/electron36/files/patch-electron_spec_api-utility-process-spec.ts b/devel/electron36/files/patch-electron_spec_api-utility-process-spec.ts index d080f5ffca9a..113c902292ed 100644 --- a/devel/electron36/files/patch-electron_spec_api-utility-process-spec.ts +++ b/devel/electron36/files/patch-electron_spec_api-utility-process-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-utility-process-spec.ts.orig 2025-04-04 05:26:44 UTC +--- electron/spec/api-utility-process-spec.ts.orig 2025-08-14 14:48:00 UTC +++ electron/spec/api-utility-process-spec.ts -@@ -467,7 +467,7 @@ describe('utilityProcess module', () => { +@@ -502,7 +502,7 @@ describe('utilityProcess module', () => { expect(output).to.include(result); }); @@ -9,7 +9,7 @@ const message = 'Message from utility process'; const child = utilityProcess.fork(path.join(fixturesPath, 'expose-main-process-module.js')); await once(child, 'spawn'); -@@ -504,7 +504,7 @@ describe('utilityProcess module', () => { +@@ -539,7 +539,7 @@ describe('utilityProcess module', () => { await closeWindow(w); }); diff --git a/devel/electron36/files/patch-electron_spec_api-web-contents-spec.ts b/devel/electron36/files/patch-electron_spec_api-web-contents-spec.ts index 91ee421c5a05..881647911d72 100644 --- a/devel/electron36/files/patch-electron_spec_api-web-contents-spec.ts +++ b/devel/electron36/files/patch-electron_spec_api-web-contents-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-web-contents-spec.ts.orig 2025-06-16 21:48:02 UTC +--- electron/spec/api-web-contents-spec.ts.orig 2025-08-14 14:48:00 UTC +++ electron/spec/api-web-contents-spec.ts -@@ -2754,7 +2754,7 @@ describe('webContents module', () => { +@@ -2797,7 +2797,7 @@ describe('webContents module', () => { }); // TODO(codebytere): OOPIF printing is disabled on Linux at the moment due to crashes. diff --git a/devel/electron36/files/patch-electron_spec_chromium-spec.ts b/devel/electron36/files/patch-electron_spec_chromium-spec.ts index b7bd72ef2622..6cb436cfaaca 100644 --- a/devel/electron36/files/patch-electron_spec_chromium-spec.ts +++ b/devel/electron36/files/patch-electron_spec_chromium-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/chromium-spec.ts.orig 2025-07-22 07:50:49 UTC +--- electron/spec/chromium-spec.ts.orig 2025-08-14 14:48:00 UTC +++ electron/spec/chromium-spec.ts @@ -475,13 +475,13 @@ describe('command line switches', () => { it('should not set an invalid locale', async () => testLocale('asdfkl', `${currentLocale}|${currentSystemLocale}|${currentPreferredLanguages}`)); @@ -33,7 +33,7 @@ const html = ` <html lang="ja-JP"> <head> -@@ -3515,7 +3515,7 @@ describe('paste execCommand', () => { +@@ -3516,7 +3516,7 @@ describe('paste execCommand', () => { }); }); 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" ] diff --git a/devel/electron36/files/yarn.lock b/devel/electron36/files/yarn.lock index 05eef81f0ca3..a12aa3686643 100644 --- a/devel/electron36/files/yarn.lock +++ b/devel/electron36/files/yarn.lock @@ -1058,11 +1058,6 @@ resolved "https://registry.yarnpkg.com/@types/unist/-/unist-3.0.2.tgz#6dd61e43ef60b34086287f83683a5c1b2dc53d20" integrity sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ== -"@types/webpack-env@^1.18.5": - version "1.18.5" - resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.18.5.tgz#eccda0b04fe024bed505881e2e532f9c119169bf" - integrity sha512-wz7kjjRRj8/Lty4B+Kr0LN6Ypc/3SymeCCGSbaXp2leH0ZVg/PriNiOwNj4bD4uphI7A8NXS4b6Gl373sfO5mA== - "@types/yauzl@^2.9.1": version "2.10.0" resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" |