diff --git a/devel/electron33/Makefile.version b/devel/electron33/Makefile.version index 17a91cbbeb1e..91420f614e37 100644 --- a/devel/electron33/Makefile.version +++ b/devel/electron33/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 33.4.6 +ELECTRON_VER= 33.4.8 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron33/distinfo b/devel/electron33/distinfo index 58758fecb416..c60973f2aeb3 100644 --- a/devel/electron33/distinfo +++ b/devel/electron33/distinfo @@ -1,25 +1,25 @@ -TIMESTAMP = 1742903572 +TIMESTAMP = 1743281298 SHA256 (electron/chromium-130.0.6723.191.tar.xz.0) = 5d75efea5a8e43b99e7fd86e20835218a2b80115e55f261e31d7c3723ebe067a SIZE (electron/chromium-130.0.6723.191.tar.xz.0) = 2000000000 SHA256 (electron/chromium-130.0.6723.191.tar.xz.1) = adf26a3c24a77e0eb119ddb3932c0ee4f9127a1b7e63c7881047d482742d716a SIZE (electron/chromium-130.0.6723.191.tar.xz.1) = 2000000000 SHA256 (electron/chromium-130.0.6723.191.tar.xz.2) = 16a8c26a52ed95dae9a5a0d69606f2847b267a2ee3fe55d319d26ea527b9db1e SIZE (electron/chromium-130.0.6723.191.tar.xz.2) = 417583932 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (electron/electron-yarn-cache-33.4.6.tar.xz) = fbfce89a9781eba6a8dc2582fcc979f2cb4adbd95c42a09f595c7dfa45a47fdf -SIZE (electron/electron-yarn-cache-33.4.6.tar.xz) = 32181868 -SHA256 (electron/electron-electron-v33.4.6_GH0.tar.gz) = a73da970f61d2b77ec2fa0f7540cf6a19ff58bbe4767b5e3ef1a473ad89aec4d -SIZE (electron/electron-electron-v33.4.6_GH0.tar.gz) = 14860583 +SHA256 (electron/electron-yarn-cache-33.4.8.tar.xz) = fbfce89a9781eba6a8dc2582fcc979f2cb4adbd95c42a09f595c7dfa45a47fdf +SIZE (electron/electron-yarn-cache-33.4.8.tar.xz) = 32181868 +SHA256 (electron/electron-electron-v33.4.8_GH0.tar.gz) = 323774a9b54dd2c4a70be901c67f8dab0ca58f367c9f63749106c0dda9ebffad +SIZE (electron/electron-electron-v33.4.8_GH0.tar.gz) = 14863100 SHA256 (electron/nodejs-node-v20.18.3_GH0.tar.gz) = a2049a1607fbc5b9ec4336d9d04faeeb9b8efdc9ec853e8ddf7cf419be9dbb3d SIZE (electron/nodejs-node-v20.18.3_GH0.tar.gz) = 115601859 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/electron33/files/patch-electron_shell_browser_api_electron__api__base__window.cc b/devel/electron33/files/patch-electron_shell_browser_api_electron__api__base__window.cc index 2140fe7df63c..901bbad6b34c 100644 --- a/devel/electron33/files/patch-electron_shell_browser_api_electron__api__base__window.cc +++ b/devel/electron33/files/patch-electron_shell_browser_api_electron__api__base__window.cc @@ -1,38 +1,38 @@ ---- electron/shell/browser/api/electron_api_base_window.cc.orig 2024-10-22 02:29:46 UTC +--- electron/shell/browser/api/electron_api_base_window.cc.orig 2025-03-26 23:59:37 UTC +++ electron/shell/browser/api/electron_api_base_window.cc -@@ -42,7 +42,7 @@ +@@ -41,7 +41,7 @@ #include "shell/browser/ui/views/win_frame_view.h" #include "shell/browser/ui/win/taskbar_host.h" #include "ui/base/win/shell.h" -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "shell/browser/ui/views/opaque_frame_view.h" #endif -@@ -995,7 +995,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate, +@@ -994,7 +994,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate, static_cast(window_.get()) ->SetIcon(native_image->GetHICON(GetSystemMetrics(SM_CXSMICON)), native_image->GetHICON(GetSystemMetrics(SM_CXICON))); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) static_cast(window_.get()) ->SetIcon(native_image->image().AsImageSkia()); #endif -@@ -1052,7 +1052,7 @@ void BaseWindow::SetAppDetails(const gin_helper::Dicti +@@ -1051,7 +1051,7 @@ void BaseWindow::SetAppDetails(const gin_helper::Dicti } #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void BaseWindow::SetTitleBarOverlay(const gin_helper::Dictionary& options, gin_helper::Arguments* args) { // Ensure WCO is already enabled on this window -@@ -1302,7 +1302,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate, +@@ -1301,7 +1301,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate, .SetMethod("setThumbnailToolTip", &BaseWindow::SetThumbnailToolTip) .SetMethod("setAppDetails", &BaseWindow::SetAppDetails) #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) .SetMethod("setTitleBarOverlay", &BaseWindow::SetTitleBarOverlay) #endif .SetProperty("id", &BaseWindow::GetID); diff --git a/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index f923bb97e8dc..0f2b810e0a47 100644 --- a/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.cc @@ -1,77 +1,77 @@ ---- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-02-26 12:19:50 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2025-03-26 23:59:37 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc -@@ -155,11 +155,11 @@ +@@ -154,11 +154,11 @@ #include "ui/base/cocoa/defaults_utils.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/linux/linux_ui.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "ui/aura/window.h" #include "ui/gfx/font_render_params.h" #endif -@@ -190,7 +190,7 @@ +@@ -189,7 +189,7 @@ #include "content/public/browser/plugin_service.h" #endif -#if !IS_MAS_BUILD() +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD) #include "chrome/browser/hang_monitor/hang_crash_dump.h" // nogncheck #endif -@@ -518,7 +518,7 @@ std::optional GetCursorBlinkInterval( +@@ -517,7 +517,7 @@ std::optional GetCursorBlinkInterval( ui::TextInsertionCaretBlinkPeriodFromDefaults()); if (system_value) return *system_value; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (auto* linux_ui = ui::LinuxUi::instance()) return linux_ui->GetCursorBlinkInterval(); #elif BUILDFLAG(IS_WIN) -@@ -888,7 +888,7 @@ void WebContents::InitWithSessionAndOptions( +@@ -886,7 +886,7 @@ void WebContents::InitWithSessionAndOptions( accept_languages.pop_back(); prefs->accept_languages = accept_languages; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Update font settings. static const gfx::FontRenderParams params( gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); -@@ -2678,13 +2678,13 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2676,13 +2676,13 @@ void WebContents::ForcefullyCrashRenderer() { content::RenderProcessHost* rph = rwh->GetProcess(); if (rph) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // A generic |CrashDumpHungChildProcess()| is not implemented for Linux. // Instead we send an explicit IPC to crash on the renderer's IO thread. rph->ForceCrash(); #else // Try to generate a crash report for the hung process. -#if !IS_MAS_BUILD() +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD) CrashDumpHungChildProcess(rph->GetProcess().Handle()); #endif rph->Shutdown(content::RESULT_CODE_HUNG); -@@ -3357,7 +3357,7 @@ void WebContents::Focus() { +@@ -3355,7 +3355,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. -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (owner_window()) owner_window()->Focus(true); #endif -@@ -4233,7 +4233,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4231,7 +4231,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { } #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void WebContents::GetDevToolsWindowWMClass(std::string* name, std::string* class_name) { *class_name = Browser::Get()->GetName(); diff --git a/devel/electron33/files/patch-electron_shell_common_api_electron__api__clipboard.cc b/devel/electron33/files/patch-electron_shell_common_api_electron__api__clipboard.cc index 522579b9d581..fabd3c4c7075 100644 --- a/devel/electron33/files/patch-electron_shell_common_api_electron__api__clipboard.cc +++ b/devel/electron33/files/patch-electron_shell_common_api_electron__api__clipboard.cc @@ -1,20 +1,20 @@ ---- electron/shell/common/api/electron_api_clipboard.cc.orig 2024-11-27 04:18:00 UTC +--- electron/shell/common/api/electron_api_clipboard.cc.orig 2025-03-26 23:59:37 UTC +++ electron/shell/common/api/electron_api_clipboard.cc -@@ -59,7 +59,7 @@ std::string Clipboard::Read(const std::string& format_ +@@ -58,7 +58,7 @@ std::string Clipboard::Read(const std::string& format_ ui::ClipboardFormatType::CustomPlatformType(format_string)); bool rawFormatAvailable = clipboard->IsFormatAvailable( rawFormat, ui::ClipboardBuffer::kCopyPaste, /* data_dst = */ nullptr); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (!rawFormatAvailable) { rawFormatAvailable = clipboard->IsFormatAvailable( rawFormat, ui::ClipboardBuffer::kSelection, /* data_dst = */ nullptr); -@@ -75,7 +75,7 @@ std::string Clipboard::Read(const std::string& format_ +@@ -74,7 +74,7 @@ std::string Clipboard::Read(const std::string& format_ custom_format_names = clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kCopyPaste, /* data_dst = */ nullptr); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (!base::Contains(custom_format_names, format_string)) { + if (!custom_format_names.contains(format_string)) { custom_format_names = clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kSelection,