Date: Fri, 12 Jan 2024 23:42:22 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: d64b87cf61e3 - main - devel/electron26: update to 26.6.5 Message-ID: <202401122342.40CNgMTb091909@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=d64b87cf61e3038ad0e6600bc5d5ec0274520fde commit d64b87cf61e3038ad0e6600bc5d5ec0274520fde Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2024-01-12 23:39:32 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2024-01-12 23:42:12 +0000 devel/electron26: update to 26.6.5 Changelog: https://github.com/electron/electron/releases/tag/v26.6.5 Reported by: GitHub (watch releases) MFH: 2024Q1 Security: 28b42ef5-80cd-440c-904b-b7fbca74c73d --- devel/electron26/Makefile.version | 2 +- devel/electron26/distinfo | 10 +++++----- .../files/patch-electron_shell_app_node__main.cc | 10 +++++----- ...shell_browser_electron__browser__main__parts.cc | 22 +++++++++++----------- ...-third__party_sqlite_src_amalgamation_sqlite3.c | 6 +++--- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/devel/electron26/Makefile.version b/devel/electron26/Makefile.version index 47305fe12440..54c6dcae78cf 100644 --- a/devel/electron26/Makefile.version +++ b/devel/electron26/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 26.6.4 +ELECTRON_VER= 26.6.5 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron26/distinfo b/devel/electron26/distinfo index 916442d9e8fa..d649532c7286 100644 --- a/devel/electron26/distinfo +++ b/devel/electron26/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1704348782 +TIMESTAMP = 1705057802 SHA256 (electron/chromium-116.0.5845.228.tar.xz) = ccf3d7f2e17fd2fcda6ebaef576787b2aaba7a6b2b4e3103b92260ac26fbc6a1 SIZE (electron/chromium-116.0.5845.228.tar.xz) = 1447024772 SHA256 (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = f7f7f38661b107fc1d91b7918f36362d9180e87f34e3027562eb5db8735746fe SIZE (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = 8881070 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-26.6.4.tar.xz) = 0fbc5dfd81619c971c29a865cfe496c8a54fefcbbb34429896a3ae6901960719 -SIZE (electron/electron-yarn-cache-26.6.4.tar.xz) = 32345420 -SHA256 (electron/electron-electron-v26.6.4_GH0.tar.gz) = 5cbed1fdce7b711e0e8caa6f1154cc3aed331f069f8015fd15309867584878ee -SIZE (electron/electron-electron-v26.6.4_GH0.tar.gz) = 11372216 +SHA256 (electron/electron-yarn-cache-26.6.5.tar.xz) = 0fbc5dfd81619c971c29a865cfe496c8a54fefcbbb34429896a3ae6901960719 +SIZE (electron/electron-yarn-cache-26.6.5.tar.xz) = 32345420 +SHA256 (electron/electron-electron-v26.6.5_GH0.tar.gz) = 78a0d4227d134a497dcd30a14798a9b5806a359b8f41bffc8705b65fa9c297fc +SIZE (electron/electron-electron-v26.6.5_GH0.tar.gz) = 11386798 SHA256 (electron/nodejs-node-v18.16.1_GH0.tar.gz) = 750b09907a0b7054bda042bfc26879b9ccb84f9f436182a820ea188b654ce77b SIZE (electron/nodejs-node-v18.16.1_GH0.tar.gz) = 112039326 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 diff --git a/devel/electron26/files/patch-electron_shell_app_node__main.cc b/devel/electron26/files/patch-electron_shell_app_node__main.cc index da5bb1b46315..b6cfdaf0f223 100644 --- a/devel/electron26/files/patch-electron_shell_app_node__main.cc +++ b/devel/electron26/files/patch-electron_shell_app_node__main.cc @@ -1,6 +1,6 @@ ---- electron/shell/app/node_main.cc.orig 2023-12-21 17:26:32 UTC +--- electron/shell/app/node_main.cc.orig 2024-01-10 12:22:10 UTC +++ electron/shell/app/node_main.cc -@@ -47,7 +47,7 @@ +@@ -48,7 +48,7 @@ #include "shell/common/mac/codesign_util.h" #endif @@ -9,7 +9,7 @@ #include "components/crash/core/app/crashpad.h" // nogncheck #include "shell/app/electron_crash_reporter_client.h" #include "shell/common/crash_keys.h" -@@ -81,7 +81,7 @@ void ExitIfContainsDisallowedFlags(const std::vector<s +@@ -82,7 +82,7 @@ void ExitIfContainsDisallowedFlags(const std::vector<s } } @@ -18,7 +18,7 @@ void SetCrashKeyStub(const std::string& key, const std::string& value) {} void ClearCrashKeyStub(const std::string& key) {} #endif -@@ -92,7 +92,7 @@ v8::Local<v8::Value> GetParameters(v8::Isolate* isolat +@@ -93,7 +93,7 @@ v8::Local<v8::Value> GetParameters(v8::Isolate* isolat v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) { std::map<std::string, std::string> keys; @@ -27,7 +27,7 @@ electron::crash_keys::GetCrashKeys(&keys); #endif return gin::ConvertToV8(isolate, keys); -@@ -252,7 +252,7 @@ int NodeMain(int argc, char* argv[]) { +@@ -253,7 +253,7 @@ int NodeMain(int argc, char* argv[]) { // Setup process.crashReporter in child node processes gin_helper::Dictionary reporter = gin::Dictionary::CreateEmpty(isolate); reporter.SetMethod("getParameters", &GetParameters); diff --git a/devel/electron26/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron26/files/patch-electron_shell_browser_electron__browser__main__parts.cc index 2d7a6dca5659..ceb35a822833 100644 --- a/devel/electron26/files/patch-electron_shell_browser_electron__browser__main__parts.cc +++ b/devel/electron26/files/patch-electron_shell_browser_electron__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/electron_browser_main_parts.cc.orig 2023-09-28 10:31:32 UTC +--- electron/shell/browser/electron_browser_main_parts.cc.orig 2024-01-10 12:22:10 UTC +++ electron/shell/browser/electron_browser_main_parts.cc @@ -76,7 +76,7 @@ #include "ui/wm/core/wm_state.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "chrome/browser/ui/views/dark_mode_manager_linux.h" #include "device/bluetooth/bluetooth_adapter_factory.h" -@@ -128,7 +128,7 @@ namespace electron { +@@ -129,7 +129,7 @@ namespace { namespace { @@ -18,7 +18,7 @@ class LinuxUiGetterImpl : public ui::LinuxUiGetter { public: LinuxUiGetterImpl() = default; -@@ -218,7 +218,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization() +@@ -219,7 +219,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization() #if BUILDFLAG(IS_POSIX) HandleSIGCHLD(); #endif @@ -27,7 +27,7 @@ DetectOzonePlatform(); ui::OzonePlatform::PreEarlyInitialization(); #endif -@@ -306,7 +306,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { +@@ -307,7 +307,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { // happen before the ResourceBundle is loaded if (locale.empty()) l10n_util::OverrideLocaleWithCocoaLocale(); @@ -36,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 -@@ -337,7 +337,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { +@@ -338,7 +338,7 @@ int ElectronBrowserMainParts::PreCreateThreads() { ElectronBrowserClient::SetApplicationLocale(app_locale); fake_browser_process_->SetApplicationLocale(app_locale); @@ -45,7 +45,7 @@ // Reset to the original LC_ALL since we should not be changing it. if (!locale.empty()) { if (lc_all) -@@ -397,7 +397,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() { +@@ -398,7 +398,7 @@ void ElectronBrowserMainParts::ToolkitInitialized() { } void ElectronBrowserMainParts::ToolkitInitialized() { @@ -54,7 +54,7 @@ auto* linux_ui = ui::GetDefaultLinuxUi(); CHECK(linux_ui); linux_ui_getter_ = std::make_unique<LinuxUiGetterImpl>(); -@@ -504,7 +504,7 @@ void ElectronBrowserMainParts::WillRunMainMessageLoop( +@@ -505,7 +505,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo } void ElectronBrowserMainParts::PostCreateMainMessageLoop() { @@ -63,17 +63,17 @@ std::string app_name = electron::Browser::Get()->GetName(); #endif #if BUILDFLAG(IS_LINUX) -@@ -514,7 +514,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo - std::move(shutdown_cb), +@@ -516,7 +516,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo content::GetUIThreadTaskRunner({content::BrowserTaskType::kUserInput})); - bluez::DBusBluezManagerWrapperLinux::Initialize(); + if (!bluez::BluezDBusManager::IsInitialized()) + bluez::DBusBluezManagerWrapperLinux::Initialize(); +#endif +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // 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. -@@ -613,7 +615,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( +@@ -615,7 +617,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun( fake_browser_process_->PostMainMessageLoopRun(); content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler(); diff --git a/devel/electron26/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/devel/electron26/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c index 4d0c94683090..5d515efbbe63 100644 --- a/devel/electron26/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c +++ b/devel/electron26/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c @@ -1,6 +1,6 @@ ---- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2023-08-10 01:51:18 UTC +--- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2024-01-12 11:36:29 UTC +++ third_party/sqlite/src/amalgamation/sqlite3.c -@@ -43843,7 +43843,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -43844,7 +43844,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB memset(zBuf, 0, nBuf); randomnessPid = osGetpid(0); #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS) @@ -13,7 +13,7 @@ int fd, got; fd = robust_open("/dev/urandom", O_RDONLY, 0); if( fd<0 ){ -@@ -43858,6 +43863,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -43859,6 +43864,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB robust_close(0, fd, __LINE__); } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401122342.40CNgMTb091909>