git: e11348118508 - main - devel/electron17: update to 17.4.5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 24 May 2022 07:55:50 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e113481185083c4fc57d854644459c4b8574b37d
commit e113481185083c4fc57d854644459c4b8574b37d
Author: Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2022-05-24 07:54:20 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2022-05-24 07:55:43 +0000
devel/electron17: update to 17.4.5
Changelog: https://github.com/electron/electron/releases/tag/v17.4.5
---
devel/electron17/Makefile | 2 +-
devel/electron17/Makefile.version | 2 +-
devel/electron17/distinfo | 10 ++++----
devel/electron17/files/package.json | 2 +-
...ell_browser_api_electron__api__safe__storage.cc | 11 ++++++++
...shell_browser_electron__browser__main__parts.cc | 20 +++++++--------
...rowser_net_system__network__context__manager.cc | 29 +---------------------
...h-electron_spec-main_api-browser-window-spec.ts | 10 ++++----
...tch-electron_spec-main_api-safe-storage-spec.ts | 8 +++---
...main_fixtures_crash-cases_safe-storage_index.js | 11 ++++++++
editors/vscode/Makefile | 1 +
11 files changed, 51 insertions(+), 55 deletions(-)
diff --git a/devel/electron17/Makefile b/devel/electron17/Makefile
index 69f6496eaa16..9e938c610428 100644
--- a/devel/electron17/Makefile
+++ b/devel/electron17/Makefile
@@ -153,7 +153,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
# See ${WRKSRC}/electron/DEPS for MANTLE_VER
MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948
-YARN_TIMESTAMP= 1652331828
+YARN_TIMESTAMP= 1653284700
GN_ARGS+= clang_use_chrome_plugins=false \
enable_hangout_services_extension=true \
diff --git a/devel/electron17/Makefile.version b/devel/electron17/Makefile.version
index 65955e632d55..5b6d579ec30f 100644
--- a/devel/electron17/Makefile.version
+++ b/devel/electron17/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER= 17.4.4
+ELECTRON_VER= 17.4.5
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron17/distinfo b/devel/electron17/distinfo
index 8fba0c897a57..e428e22a3f93 100644
--- a/devel/electron17/distinfo
+++ b/devel/electron17/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1652335688
+TIMESTAMP = 1653285870
SHA256 (electron/chromium-98.0.4758.141.tar.xz) = 0b712acb66c69b78b011c19ba07b2696ee36335e9712066ff5d74aedeb8fbb16
SIZE (electron/chromium-98.0.4758.141.tar.xz) = 1115175012
SHA256 (electron/31d731fb82ea62a6dae24d2bdfe6f0aa6164b949) = fc35bf178fb99ae9fca39191d7eb054a985824b8bf16f588ed6c03edfa96d4f9
SIZE (electron/31d731fb82ea62a6dae24d2bdfe6f0aa6164b949) = 11461198
SHA256 (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492
SIZE (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = 26759650
-SHA256 (electron/electron-yarn-cache-17.4.4.tar.xz) = 5b0e706093113582548130b1597ee9d895582fe7ab94e42a1d8a5a867dcc68b1
-SIZE (electron/electron-yarn-cache-17.4.4.tar.xz) = 36633704
-SHA256 (electron/electron-electron-v17.4.4_GH0.tar.gz) = 9ad8891cc131f3016f37c793ea2fe3158f52ba34642b1fce615547601113d114
-SIZE (electron/electron-electron-v17.4.4_GH0.tar.gz) = 10221111
+SHA256 (electron/electron-yarn-cache-17.4.5.tar.xz) = 1b8347eaec672b0e1486a18458d6907321c38755013ca8aaa4a84346a5972f98
+SIZE (electron/electron-yarn-cache-17.4.5.tar.xz) = 36632532
+SHA256 (electron/electron-electron-v17.4.5_GH0.tar.gz) = b37e49c4006a224b557bd6accaa3bad567b34088755deb46bb24db8c362fc73e
+SIZE (electron/electron-electron-v17.4.5_GH0.tar.gz) = 10237334
SHA256 (electron/nodejs-node-v16.13.0_GH0.tar.gz) = f0327e99f730bf2506a1f13dbd452ec80b33667a7ce1c77a2dacd6babc8643c7
SIZE (electron/nodejs-node-v16.13.0_GH0.tar.gz) = 87424981
SHA256 (electron/nodejs-nan-65b32af46e9d7fab2e4ff657751205b3865f4920_GH0.tar.gz) = a649b75bfa9c1a0254c73d022c6e98924b9471f593bcc83832daaf68da4cae8d
diff --git a/devel/electron17/files/package.json b/devel/electron17/files/package.json
index 4ae7b6e9676c..61975e52bbef 100644
--- a/devel/electron17/files/package.json
+++ b/devel/electron17/files/package.json
@@ -1,6 +1,6 @@
{
"name": "electron",
- "version": "17.4.4",
+ "version": "17.4.5",
"repository": "https://github.com/electron/electron",
"description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
"devDependencies": {
diff --git a/devel/electron17/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc b/devel/electron17/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc
new file mode 100644
index 000000000000..1eea2be1e6d8
--- /dev/null
+++ b/devel/electron17/files/patch-electron_shell_browser_api_electron__api__safe__storage.cc
@@ -0,0 +1,11 @@
+--- electron/shell/browser/api/electron_api_safe_storage.cc.orig 2022-05-18 15:35:00 UTC
++++ electron/shell/browser/api/electron_api_safe_storage.cc
+@@ -31,7 +31,7 @@ void SetElectronCryptoReady(bool ready) {
+ #endif
+
+ bool IsEncryptionAvailable() {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Calling IsEncryptionAvailable() before the app is ready results in a crash
+ // on Linux.
+ // Refs: https://github.com/electron/electron/issues/32206.
diff --git a/devel/electron17/files/patch-electron_shell_browser_electron__browser__main__parts.cc b/devel/electron17/files/patch-electron_shell_browser_electron__browser__main__parts.cc
index 9a48e375dc03..829a139172c4 100644
--- a/devel/electron17/files/patch-electron_shell_browser_electron__browser__main__parts.cc
+++ b/devel/electron17/files/patch-electron_shell_browser_electron__browser__main__parts.cc
@@ -1,6 +1,6 @@
---- electron/shell/browser/electron_browser_main_parts.cc.orig 2022-05-11 15:32:29 UTC
+--- electron/shell/browser/electron_browser_main_parts.cc.orig 2022-05-18 15:35:00 UTC
+++ electron/shell/browser/electron_browser_main_parts.cc
-@@ -61,7 +61,7 @@
+@@ -64,7 +64,7 @@
#include "ui/wm/core/wm_state.h"
#endif
@@ -9,7 +9,7 @@
#include "base/environment.h"
#include "base/threading/thread_task_runner_handle.h"
#include "device/bluetooth/bluetooth_adapter_factory.h"
-@@ -140,7 +140,7 @@ std::u16string MediaStringProvider(media::MessageId id
+@@ -143,7 +143,7 @@ std::u16string MediaStringProvider(media::MessageId id
}
}
@@ -18,7 +18,7 @@
// 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.
-@@ -158,7 +158,7 @@ void UpdateDarkThemeSetting() {
+@@ -161,7 +161,7 @@ void UpdateDarkThemeSetting() {
} // namespace
@@ -27,7 +27,7 @@
class DarkThemeObserver : public ui::NativeThemeObserver {
public:
DarkThemeObserver() = default;
-@@ -211,7 +211,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization()
+@@ -214,7 +214,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization()
#if defined(OS_POSIX)
HandleSIGCHLD();
#endif
@@ -36,7 +36,7 @@
ui::OzonePlatform::PreEarlyInitialization();
#endif
-@@ -272,7 +272,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
+@@ -275,7 +275,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
#if defined(USE_AURA)
screen_ = views::CreateDesktopScreen();
display::Screen::SetScreenInstance(screen_.get());
@@ -45,7 +45,7 @@
views::LinuxUI::instance()->UpdateDeviceScaleFactor();
#endif
#endif
-@@ -289,7 +289,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
+@@ -292,7 +292,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
// happen before the ResourceBundle is loaded
if (locale.empty())
l10n_util::OverrideLocaleWithCocoaLocale();
@@ -54,7 +54,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
-@@ -312,7 +312,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
+@@ -315,7 +315,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
ElectronBrowserClient::SetApplicationLocale(app_locale);
fake_browser_process_->SetApplicationLocale(app_locale);
@@ -63,7 +63,7 @@
// Reset to the original LC_ALL since we should not be changing it.
if (!locale.empty()) {
if (lc_all)
-@@ -359,7 +359,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() {
+@@ -362,7 +362,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() {
}
void ElectronBrowserMainParts::ToolkitInitialized() {
@@ -72,7 +72,7 @@
auto linux_ui = BuildGtkUi();
linux_ui->Initialize();
DCHECK(ui::LinuxInputMethodContextFactory::instance());
-@@ -505,7 +505,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
+@@ -528,7 +528,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
fake_browser_process_->PostMainMessageLoopRun();
content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler();
diff --git a/devel/electron17/files/patch-electron_shell_browser_net_system__network__context__manager.cc b/devel/electron17/files/patch-electron_shell_browser_net_system__network__context__manager.cc
index 118a3094a976..6cfe779f072c 100644
--- a/devel/electron17/files/patch-electron_shell_browser_net_system__network__context__manager.cc
+++ b/devel/electron17/files/patch-electron_shell_browser_net_system__network__context__manager.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/net/system_network_context_manager.cc.orig 2022-05-11 15:32:29 UTC
+--- electron/shell/browser/net/system_network_context_manager.cc.orig 2022-05-18 15:35:00 UTC
+++ electron/shell/browser/net/system_network_context_manager.cc
@@ -45,7 +45,7 @@
#include "components/os_crypt/keychain_password_mac.h"
@@ -9,30 +9,3 @@
#include "components/os_crypt/key_storage_config_linux.h"
#endif
-@@ -314,7 +314,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
- KeychainPassword::GetServiceName() = app_name + " Safe Storage";
- KeychainPassword::GetAccountName() = app_name;
- #endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // c.f.
- // https://source.chromium.org/chromium/chromium/src/+/master:chrome/browser/net/system_network_context_manager.cc;l=515;drc=9d82515060b9b75fa941986f5db7390299669ef1;bpv=1;bpt=1
- const base::CommandLine& command_line =
-@@ -336,7 +336,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
- // process, send it the required key.
- if (content::IsOutOfProcessNetworkService() &&
- electron::fuses::IsCookieEncryptionEnabled()) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- network::mojom::CryptConfigPtr network_crypt_config =
- network::mojom::CryptConfig::New();
- network_crypt_config->application_name = config->application_name;
-@@ -352,7 +352,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
- #endif
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- OSCrypt::SetConfig(std::move(config));
- #endif
-
diff --git a/devel/electron17/files/patch-electron_spec-main_api-browser-window-spec.ts b/devel/electron17/files/patch-electron_spec-main_api-browser-window-spec.ts
index 8bf37caa4e07..132b63be1de4 100644
--- a/devel/electron17/files/patch-electron_spec-main_api-browser-window-spec.ts
+++ b/devel/electron17/files/patch-electron_spec-main_api-browser-window-spec.ts
@@ -1,4 +1,4 @@
---- electron/spec-main/api-browser-window-spec.ts.orig 2022-05-11 15:32:29 UTC
+--- electron/spec-main/api-browser-window-spec.ts.orig 2022-05-18 15:35:00 UTC
+++ electron/spec-main/api-browser-window-spec.ts
@@ -58,7 +58,7 @@ describe('BrowserWindow module', () => {
}).not.to.throw();
@@ -90,7 +90,7 @@
afterEach(closeAllWindows);
it('emits an event when window is maximized', async () => {
const w = new BrowserWindow({ show: false });
-@@ -3694,7 +3694,7 @@ describe('BrowserWindow module', () => {
+@@ -3699,7 +3699,7 @@ describe('BrowserWindow module', () => {
});
// TODO(dsanders11): Enable once maximize event works on Linux again on CI
@@ -99,7 +99,7 @@
afterEach(closeAllWindows);
it('should show the window if it is not currently shown', async () => {
const w = new BrowserWindow({ show: false });
-@@ -3731,7 +3731,7 @@ describe('BrowserWindow module', () => {
+@@ -3736,7 +3736,7 @@ describe('BrowserWindow module', () => {
// TODO(dsanders11): Enable once minimize event works on Linux again.
// See https://github.com/electron/electron/issues/28699
@@ -108,7 +108,7 @@
const w = new BrowserWindow();
const minimize = emittedOnce(w, 'minimize');
w.minimize();
-@@ -4086,7 +4086,7 @@ describe('BrowserWindow module', () => {
+@@ -4091,7 +4091,7 @@ describe('BrowserWindow module', () => {
});
// On Linux there is no "resizable" property of a window.
@@ -117,7 +117,7 @@
const w = new BrowserWindow({ show: false });
expect(w.resizable).to.be.true('resizable');
-@@ -4178,7 +4178,7 @@ describe('BrowserWindow module', () => {
+@@ -4183,7 +4183,7 @@ describe('BrowserWindow module', () => {
});
});
diff --git a/devel/electron17/files/patch-electron_spec-main_api-safe-storage-spec.ts b/devel/electron17/files/patch-electron_spec-main_api-safe-storage-spec.ts
index 3b352d2eed48..1819d71f653b 100644
--- a/devel/electron17/files/patch-electron_spec-main_api-safe-storage-spec.ts
+++ b/devel/electron17/files/patch-electron_spec-main_api-safe-storage-spec.ts
@@ -1,8 +1,8 @@
---- electron/spec-main/api-safe-storage-spec.ts.orig 2021-11-15 23:45:07 UTC
+--- electron/spec-main/api-safe-storage-spec.ts.orig 2022-05-18 15:35:00 UTC
+++ electron/spec-main/api-safe-storage-spec.ts
-@@ -14,7 +14,7 @@ import * as fs from 'fs';
- * when run on CI and linux.
- */
+@@ -33,7 +33,7 @@ describe('safeStorage module', () => {
+ });
+ });
-ifdescribe(process.platform !== 'linux')('safeStorage module', () => {
+ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('safeStorage module', () => {
diff --git a/devel/electron17/files/patch-electron_spec-main_fixtures_crash-cases_safe-storage_index.js b/devel/electron17/files/patch-electron_spec-main_fixtures_crash-cases_safe-storage_index.js
new file mode 100644
index 000000000000..1ce0d103e3b4
--- /dev/null
+++ b/devel/electron17/files/patch-electron_spec-main_fixtures_crash-cases_safe-storage_index.js
@@ -0,0 +1,11 @@
+--- electron/spec-main/fixtures/crash-cases/safe-storage/index.js.orig 2022-05-18 15:35:00 UTC
++++ electron/spec-main/fixtures/crash-cases/safe-storage/index.js
+@@ -21,7 +21,7 @@ const { expect } = require('chai');
+ await app.whenReady();
+ // isEncryptionAvailable() will always return false on CI due to a mocked
+ // dbus as mentioned above.
+- expect(safeStorage.isEncryptionAvailable()).to.equal(process.platform !== 'linux');
++ expect(safeStorage.isEncryptionAvailable()).to.equal(process.platform !== 'linux' && process.platform !== 'freebsd');
+ if (safeStorage.isEncryptionAvailable()) {
+ const plaintext = 'plaintext';
+ const ciphertext = safeStorage.encryptString(plaintext);
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index 234006286a4d..0b99a5151177 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,5 +1,6 @@
PORTNAME= vscode
DISTVERSION= 1.67.2
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= https://registry.npmjs.org/esbuild-freebsd-64/-/:esbuild_binary \
https://nodejs.org/dist/v${NODE_VER}/:node_headers \