diff --git a/devel/electron27/Makefile.version b/devel/electron27/Makefile.version index 8ee1bf3c36f6..da333163d75f 100644 --- a/devel/electron27/Makefile.version +++ b/devel/electron27/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 27.3.3 +ELECTRON_VER= 27.3.4 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron27/distinfo b/devel/electron27/distinfo index b353f57c7958..1d13a05e733d 100644 --- a/devel/electron27/distinfo +++ b/devel/electron27/distinfo @@ -1,21 +1,21 @@ -TIMESTAMP = 1708684875 +TIMESTAMP = 1709196640 SHA256 (electron/chromium-118.0.5993.159.tar.xz) = 47fdd7677470f4f4daf68e59dcacbafb99f5ed0c07501162b6af168f760b4359 SIZE (electron/chromium-118.0.5993.159.tar.xz) = 1602730244 SHA256 (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = f7f7f38661b107fc1d91b7918f36362d9180e87f34e3027562eb5db8735746fe SIZE (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = 8881070 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-27.3.3.tar.xz) = b1d33fa2bf412990a64b1720140fdd712b5945f41f781a4b2c154915061c6d75 -SIZE (electron/electron-yarn-cache-27.3.3.tar.xz) = 29116528 -SHA256 (electron/electron-electron-v27.3.3_GH0.tar.gz) = 4c1408adf045c66f150a6bbcbdfbf2d5f9893eb30b05f1d83c89c9d44ccae9ee -SIZE (electron/electron-electron-v27.3.3_GH0.tar.gz) = 11429098 +SHA256 (electron/electron-yarn-cache-27.3.4.tar.xz) = b1d33fa2bf412990a64b1720140fdd712b5945f41f781a4b2c154915061c6d75 +SIZE (electron/electron-yarn-cache-27.3.4.tar.xz) = 29116528 +SHA256 (electron/electron-electron-v27.3.4_GH0.tar.gz) = 640ca87244a93160abbeaab633926957fc2131e2e75a2d07192967fbb1456e18 +SIZE (electron/electron-electron-v27.3.4_GH0.tar.gz) = 11432660 SHA256 (electron/nodejs-node-v18.17.1_GH0.tar.gz) = 1cc1670bc183eaf9e0afe0258391695d1d6ae1be02ba4c26e0218cf5f19b96f7 SIZE (electron/nodejs-node-v18.17.1_GH0.tar.gz) = 112512847 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 SIZE (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 179355 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 diff --git a/devel/electron27/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron27/files/patch-electron_shell_browser_api_electron__api__web__contents.cc index 02d5f72691c2..54e3111e8aa0 100644 --- a/devel/electron27/files/patch-electron_shell_browser_api_electron__api__web__contents.cc +++ b/devel/electron27/files/patch-electron_shell_browser_api_electron__api__web__contents.cc @@ -1,61 +1,61 @@ ---- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-11-15 10:20:22 UTC +--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2024-02-28 05:54:17 UTC +++ electron/shell/browser/api/electron_api_web_contents.cc @@ -153,11 +153,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/gfx/font_render_params.h" #endif @@ -488,7 +488,7 @@ absl::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) @@ -937,7 +937,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)); -@@ -2609,7 +2609,7 @@ void WebContents::ForcefullyCrashRenderer() { +@@ -2605,7 +2605,7 @@ 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(); -@@ -3290,7 +3290,7 @@ void WebContents::CopyImageAt(int x, int y) { +@@ -3286,7 +3286,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 -@@ -4080,7 +4080,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() { +@@ -4072,7 +4072,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/electron27/files/patch-electron_shell_browser_browser__process__impl.cc b/devel/electron27/files/patch-electron_shell_browser_browser__process__impl.cc index 56ba4b8759de..da8cd9af49bd 100644 --- a/devel/electron27/files/patch-electron_shell_browser_browser__process__impl.cc +++ b/devel/electron27/files/patch-electron_shell_browser_browser__process__impl.cc @@ -1,20 +1,20 @@ ---- electron/shell/browser/browser_process_impl.cc.orig 2023-10-20 08:29:17 UTC +--- electron/shell/browser/browser_process_impl.cc.orig 2024-02-28 05:54:17 UTC +++ electron/shell/browser/browser_process_impl.cc @@ -309,7 +309,7 @@ const std::string& BrowserProcessImpl::GetSystemLocale return system_locale_; } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void BrowserProcessImpl::SetLinuxStorageBackend( os_crypt::SelectedLinuxBackend selected_backend) { switch (selected_backend) { -@@ -337,7 +337,7 @@ void BrowserProcessImpl::SetLinuxStorageBackend( - const std::string& BrowserProcessImpl::GetLinuxStorageBackend() const { - return selected_linux_storage_backend_; +@@ -333,7 +333,7 @@ void BrowserProcessImpl::SetLinuxStorageBackend( + break; + } } -#endif // BUILDFLAG(IS_LINUX) +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void BrowserProcessImpl::SetApplicationLocale(const std::string& locale) { locale_ = locale; diff --git a/devel/electron27/files/patch-electron_shell_browser_browser__process__impl.h b/devel/electron27/files/patch-electron_shell_browser_browser__process__impl.h index e67ed64c7b28..cfcc0abe8989 100644 --- a/devel/electron27/files/patch-electron_shell_browser_browser__process__impl.h +++ b/devel/electron27/files/patch-electron_shell_browser_browser__process__impl.h @@ -1,29 +1,29 @@ ---- electron/shell/browser/browser_process_impl.h.orig 2023-10-20 08:29:17 UTC +--- electron/shell/browser/browser_process_impl.h.orig 2024-02-28 05:54:17 UTC +++ electron/shell/browser/browser_process_impl.h @@ -23,7 +23,7 @@ #include "services/network/public/cpp/shared_url_loader_factory.h" #include "shell/browser/net/system_network_context_manager.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "components/os_crypt/sync/key_storage_util_linux.h" #endif @@ -57,7 +57,7 @@ class BrowserProcessImpl : public BrowserProcess { void SetSystemLocale(const std::string& locale); const std::string& GetSystemLocale() const; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void SetLinuxStorageBackend(os_crypt::SelectedLinuxBackend selected_backend); - const std::string& GetLinuxStorageBackend() const; - #endif -@@ -130,7 +130,7 @@ class BrowserProcessImpl : public BrowserProcess { + [[nodiscard]] const std::string& linux_storage_backend() const { + return selected_linux_storage_backend_; +@@ -132,7 +132,7 @@ class BrowserProcessImpl : public BrowserProcess { std::unique_ptr local_state_; std::string locale_; std::string system_locale_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::string selected_linux_storage_backend_; #endif embedder_support::OriginTrialsSettingsStorage origin_trials_settings_storage_; diff --git a/devel/electron27/files/patch-electron_shell_browser_ui_views_inspectable__web__contents__view__views.cc b/devel/electron27/files/patch-electron_shell_browser_ui_views_inspectable__web__contents__view__views.cc index deb56a27ac39..cf8368ab23c4 100644 --- a/devel/electron27/files/patch-electron_shell_browser_ui_views_inspectable__web__contents__view__views.cc +++ b/devel/electron27/files/patch-electron_shell_browser_ui_views_inspectable__web__contents__view__views.cc @@ -1,11 +1,11 @@ ---- electron/shell/browser/ui/views/inspectable_web_contents_view_views.cc.orig 2023-10-10 23:44:27 UTC +--- electron/shell/browser/ui/views/inspectable_web_contents_view_views.cc.orig 2024-02-28 05:54:17 UTC +++ electron/shell/browser/ui/views/inspectable_web_contents_view_views.cc -@@ -184,7 +184,7 @@ void InspectableWebContentsViewViews::SetIsDocked(bool +@@ -183,7 +183,7 @@ void InspectableWebContentsViewViews::SetIsDocked(bool params.delegate = devtools_window_delegate_; - params.bounds = inspectable_web_contents()->GetDevToolsBounds(); + params.bounds = inspectable_web_contents()->dev_tools_bounds(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) params.wm_role_name = "devtools"; if (GetDelegate()) GetDelegate()->GetDevToolsWindowWMClass(¶ms.wm_class_name,