Date: Mon, 2 Oct 2023 23:37:54 GMT From: Hiroki Tagato <tagattie@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5abcc5779b38 - main - devel/electron25: update to 25.8.4 Message-ID: <202310022337.392NbshU002537@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=5abcc5779b38825d7716dd23b195444e6c66f0c4 commit 5abcc5779b38825d7716dd23b195444e6c66f0c4 Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2023-10-02 23:34:31 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2023-10-02 23:37:47 +0000 devel/electron25: update to 25.8.4 Changelog: - https://github.com/electron/electron/releases/tag/v25.8.3 - https://github.com/electron/electron/releases/tag/v25.8.4 Reported by: GitHub (watch releases) MFH: 2023Q4 Security: 2bcd6ba4-d8e2-42e5-9033-b50b722821fb --- devel/electron25/Makefile | 2 +- devel/electron25/Makefile.version | 2 +- devel/electron25/distinfo | 10 +++--- ...lectron_shell_browser_api_electron__api__app.cc | 12 ++++---- ...browser_api_electron__api__desktop__capturer.cc | 4 +-- ...shell_browser_electron__browser__main__parts.cc | 36 ++++++---------------- ..._shell_browser_electron__browser__main__parts.h | 21 ++++--------- 7 files changed, 30 insertions(+), 57 deletions(-) diff --git a/devel/electron25/Makefile b/devel/electron25/Makefile index 73d08466dfac..f5cdac171beb 100644 --- a/devel/electron25/Makefile +++ b/devel/electron25/Makefile @@ -223,7 +223,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 # See ${WRKSRC}/electron/DEPS for MANTLE_VER MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948 -YARN_TIMESTAMP= 1695285278 +YARN_TIMESTAMP= 1696149955 .include "Makefile.version" .include <bsd.port.pre.mk> diff --git a/devel/electron25/Makefile.version b/devel/electron25/Makefile.version index c561a8345ede..a52ae1517289 100644 --- a/devel/electron25/Makefile.version +++ b/devel/electron25/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 25.8.2 +ELECTRON_VER= 25.8.4 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron25/distinfo b/devel/electron25/distinfo index 1249230cc801..020e0497e6b5 100644 --- a/devel/electron25/distinfo +++ b/devel/electron25/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1695285635 +TIMESTAMP = 1696150896 SHA256 (electron/chromium-114.0.5735.289.tar.xz) = 12dee4e585dab6e7dc2117f4ee40484a947ac7a6b5a33c87dfae7cbf8b8799b0 SIZE (electron/chromium-114.0.5735.289.tar.xz) = 1413670648 SHA256 (electron/de0af8ec3401004cd1a420ab25892880330464c8) = 401097f07b4feb3e03ce7c2412e978b32aea5334f4fbaf26f873e60e8bb92647 SIZE (electron/de0af8ec3401004cd1a420ab25892880330464c8) = 8880520 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-25.8.2.tar.xz) = 0cc01c55952d4de37de8dd7afa204a7225790ae245624bb489eb20b59884bda3 -SIZE (electron/electron-yarn-cache-25.8.2.tar.xz) = 41288740 -SHA256 (electron/electron-electron-v25.8.2_GH0.tar.gz) = 024be15fb400b6227927d9dea44a26f4c8f64a89ffa1a1a53e08e00bed0e1779 -SIZE (electron/electron-electron-v25.8.2_GH0.tar.gz) = 11325552 +SHA256 (electron/electron-yarn-cache-25.8.4.tar.xz) = ebbd774d85a4a5bf37bb7d4175e19c0ffa5b13adf821f5981b09fc2d8eb53200 +SIZE (electron/electron-yarn-cache-25.8.4.tar.xz) = 41289488 +SHA256 (electron/electron-electron-v25.8.4_GH0.tar.gz) = c71f766a683c8526b59600866aea16277009be45143c9dda62b95c0b5c182d0b +SIZE (electron/electron-electron-v25.8.4_GH0.tar.gz) = 11332285 SHA256 (electron/nodejs-node-v18.15.0_GH0.tar.gz) = 33c4b5b77c98398a3c0d99a146f602d164e014ff3a5713697beef1a971faf573 SIZE (electron/nodejs-node-v18.15.0_GH0.tar.gz) = 111925667 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 diff --git a/devel/electron25/files/patch-electron_shell_browser_api_electron__api__app.cc b/devel/electron25/files/patch-electron_shell_browser_api_electron__api__app.cc index de4cbbe12bad..84164e8add03 100644 --- a/devel/electron25/files/patch-electron_shell_browser_api_electron__api__app.cc +++ b/devel/electron25/files/patch-electron_shell_browser_api_electron__api__app.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/api/electron_api_app.cc.orig 2023-06-20 12:38:26 UTC +--- electron/shell/browser/api/electron_api_app.cc.orig 2023-09-28 10:31:06 UTC +++ electron/shell/browser/api/electron_api_app.cc -@@ -697,7 +697,7 @@ void App::OnWillFinishLaunching() { +@@ -698,7 +698,7 @@ void App::OnWillFinishLaunching() { } void App::OnFinishLaunching(base::Value::Dict launch_info) { @@ -9,7 +9,7 @@ // Set the application name for audio streams shown in external // applications. Only affects pulseaudio currently. media::AudioManager::SetGlobalAppName(Browser::Get()->GetName()); -@@ -1031,7 +1031,7 @@ void App::SetPath(gin_helper::ErrorThrower thrower, +@@ -1032,7 +1032,7 @@ void App::SetPath(gin_helper::ErrorThrower thrower, } void App::SetDesktopName(const std::string& desktop_name) { @@ -18,7 +18,7 @@ auto env = base::Environment::Create(); env->SetVar("CHROME_DESKTOP", desktop_name); #endif -@@ -1420,7 +1420,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics +@@ -1421,7 +1421,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics pid_dict.Set("name", process_metric.second->name); } @@ -27,7 +27,7 @@ auto memory_info = process_metric.second->GetMemoryInfo(); gin_helper::Dictionary memory_dict = gin::Dictionary::CreateEmpty(isolate); -@@ -1727,7 +1727,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild +@@ -1713,7 +1713,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild .SetMethod( "removeAsDefaultProtocolClient", base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser)) @@ -36,7 +36,7 @@ .SetMethod( "getApplicationInfoForProtocol", base::BindRepeating(&Browser::GetApplicationInfoForProtocol, browser)) -@@ -1785,7 +1785,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild +@@ -1771,7 +1771,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild .SetMethod("getJumpListSettings", &App::GetJumpListSettings) .SetMethod("setJumpList", &App::SetJumpList) #endif diff --git a/devel/electron25/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc b/devel/electron25/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc index b0afcfba590e..37576ad7ae71 100644 --- a/devel/electron25/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc +++ b/devel/electron25/files/patch-electron_shell_browser_api_electron__api__desktop__capturer.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/api/electron_api_desktop_capturer.cc.orig 2023-07-19 13:20:24 UTC +--- electron/shell/browser/api/electron_api_desktop_capturer.cc.orig 2023-09-28 10:31:06 UTC +++ electron/shell/browser/api/electron_api_desktop_capturer.cc @@ -36,7 +36,7 @@ #include "third_party/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h" @@ -18,7 +18,7 @@ // Private function in ui/base/x/x11_display_util.cc std::map<x11::RandR::Output, int> GetMonitors(int version, x11::RandR* randr, -@@ -348,7 +348,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaLi +@@ -375,7 +375,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaLi for (auto& source : screen_sources) { source.display_id = base::NumberToString(source.media_list_source.id.id); } diff --git a/devel/electron25/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron25/files/patch-electron_shell_browser_electron__browser__main__parts.cc index 26132af2723c..479298455cac 100644 --- a/devel/electron25/files/patch-electron_shell_browser_electron__browser__main__parts.cc +++ b/devel/electron25/files/patch-electron_shell_browser_electron__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/electron_browser_main_parts.cc.orig 2023-08-09 14:05:20 UTC +--- electron/shell/browser/electron_browser_main_parts.cc.orig 2023-09-28 10:31:06 UTC +++ electron/shell/browser/electron_browser_main_parts.cc @@ -76,7 +76,7 @@ #include "ui/wm/core/wm_state.h" @@ -7,8 +7,8 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/environment.h" + #include "chrome/browser/ui/views/dark_mode_manager_linux.h" #include "device/bluetooth/bluetooth_adapter_factory.h" - #include "device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.h" @@ -128,7 +128,7 @@ namespace electron { namespace { @@ -18,25 +18,7 @@ class LinuxUiGetterImpl : public ui::LinuxUiGetter { public: LinuxUiGetterImpl() = default; -@@ -176,7 +176,7 @@ std::u16string MediaStringProvider(media::MessageId id - } - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // GTK does not provide a way to check if current theme is dark, so we compare - // the text and background luminosity to get a result. - // This trick comes from FireFox. -@@ -194,7 +194,7 @@ void UpdateDarkThemeSetting() { - - } // namespace - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - class DarkThemeObserver : public ui::NativeThemeObserver { - public: - DarkThemeObserver() = default; -@@ -246,7 +246,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization() +@@ -218,7 +218,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization() #if BUILDFLAG(IS_POSIX) HandleSIGCHLD(); #endif @@ -45,7 +27,7 @@ DetectOzonePlatform(); ui::OzonePlatform::PreEarlyInitialization(); #endif -@@ -334,7 +334,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { +@@ -306,7 +306,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { // happen before the ResourceBundle is loaded if (locale.empty()) l10n_util::OverrideLocaleWithCocoaLocale(); @@ -54,7 +36,7 @@ // l10n_util::GetApplicationLocaleInternal uses g_get_language_names(), // which keys off of getenv("LC_ALL"). // We must set this env first to make ui::ResourceBundle accept the custom -@@ -365,7 +365,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { +@@ -337,7 +337,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { ElectronBrowserClient::SetApplicationLocale(app_locale); fake_browser_process_->SetApplicationLocale(app_locale); @@ -63,7 +45,7 @@ // Reset to the original LC_ALL since we should not be changing it. if (!locale.empty()) { if (lc_all) -@@ -425,7 +425,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() { +@@ -397,7 +397,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() { } void ElectronBrowserMainParts::ToolkitInitialized() { @@ -72,7 +54,7 @@ auto* linux_ui = ui::GetDefaultLinuxUi(); CHECK(linux_ui); linux_ui_getter_ = std::make_unique<LinuxUiGetterImpl>(); -@@ -539,7 +539,7 @@ void ElectronBrowserMainParts::WillRunMainMessageLoop( +@@ -504,7 +504,7 @@ void ElectronBrowserMainParts::WillRunMainMessageLoop( } void ElectronBrowserMainParts::PostCreateMainMessageLoop() { @@ -81,7 +63,7 @@ std::string app_name = electron::Browser::Get()->GetName(); #endif #if BUILDFLAG(IS_LINUX) -@@ -549,7 +549,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo +@@ -514,7 +514,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo std::move(shutdown_cb), content::GetUIThreadTaskRunner({content::BrowserTaskType::kUserInput})); bluez::DBusBluezManagerWrapperLinux::Initialize(); @@ -91,7 +73,7 @@ // Set up crypt config. This needs to be done before anything starts the // network service, as the raw encryption key needs to be shared with the // network service for encrypted cookie storage. -@@ -650,7 +652,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( +@@ -615,7 +617,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( fake_browser_process_->PostMainMessageLoopRun(); content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler(); diff --git a/devel/electron25/files/patch-electron_shell_browser_electron__browser__main__parts.h b/devel/electron25/files/patch-electron_shell_browser_electron__browser__main__parts.h index 53b85a957e0a..2383121cd19e 100644 --- a/devel/electron25/files/patch-electron_shell_browser_electron__browser__main__parts.h +++ b/devel/electron25/files/patch-electron_shell_browser_electron__browser__main__parts.h @@ -1,15 +1,6 @@ ---- electron/shell/browser/electron_browser_main_parts.h.orig 2023-05-31 14:28:29 UTC +--- electron/shell/browser/electron_browser_main_parts.h.orig 2023-09-28 10:31:06 UTC +++ electron/shell/browser/electron_browser_main_parts.h -@@ -62,7 +62,7 @@ class ViewsDelegate; - class ViewsDelegateMac; - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - class DarkThemeObserver; - #endif - -@@ -119,7 +119,7 @@ class ElectronBrowserMainParts : public content::Brows +@@ -116,7 +116,7 @@ class ElectronBrowserMainParts : public content::Brows const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); #endif @@ -18,12 +9,12 @@ void DetectOzonePlatform(); #endif -@@ -141,7 +141,7 @@ class ElectronBrowserMainParts : public content::Brows +@@ -138,7 +138,7 @@ class ElectronBrowserMainParts : public content::Brows std::unique_ptr<display::Screen> screen_; #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Used to notify the native theme of changes to dark mode. - std::unique_ptr<DarkThemeObserver> dark_theme_observer_; - + std::unique_ptr<ui::DarkModeManagerLinux> dark_mode_manager_; + std::unique_ptr<ui::LinuxUiGetter> linux_ui_getter_; + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310022337.392NbshU002537>