git: 6726ae2f96c5 - main - devel/electron18: update to 18.3.6
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 04 Aug 2022 06:58:41 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6726ae2f96c5483ed0add5ee838d308adf1db72c
commit 6726ae2f96c5483ed0add5ee838d308adf1db72c
Author: Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2022-08-04 06:57:11 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2022-08-04 06:58:32 +0000
devel/electron18: update to 18.3.6
Changelog: https://github.com/electron/electron/releases/tag/v18.3.6
---
devel/electron18/Makefile | 2 +-
devel/electron18/Makefile.version | 2 +-
devel/electron18/distinfo | 10 ++++----
devel/electron18/files/package.json | 2 +-
devel/electron18/files/patch-electron_BUILD.gn | 16 ++++++-------
...ell_browser_api_electron__api__web__contents.cc | 14 +++++------
...tron_shell_browser_electron__browser__client.cc | 4 ++--
...electron_shell_browser_native__window__views.cc | 28 +++++++++++-----------
...tch-electron_spec-main_api-browser-view-spec.ts | 20 ++++++++++++++++
...h-electron_spec-main_api-browser-window-spec.ts | 22 ++++++++---------
.../patch-electron_spec-main_chromium-spec.ts | 6 ++---
...h-ui_ozone_platform_x11_ozone__platform__x11.cc | 4 ++--
editors/vscode/Makefile | 1 +
13 files changed, 76 insertions(+), 55 deletions(-)
diff --git a/devel/electron18/Makefile b/devel/electron18/Makefile
index 728b6467b0e5..356ecf8d5d58 100644
--- a/devel/electron18/Makefile
+++ b/devel/electron18/Makefile
@@ -152,7 +152,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
# See ${WRKSRC}/electron/DEPS for MANTLE_VER
MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948
-YARN_TIMESTAMP= 1655950711
+YARN_TIMESTAMP= 1659493244
GN_ARGS+= clang_use_chrome_plugins=false \
enable_hangout_services_extension=true \
diff --git a/devel/electron18/Makefile.version b/devel/electron18/Makefile.version
index 18283dc75917..ff09034e3c41 100644
--- a/devel/electron18/Makefile.version
+++ b/devel/electron18/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER= 18.3.5
+ELECTRON_VER= 18.3.6
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron18/distinfo b/devel/electron18/distinfo
index c51bfd2c23f1..4d7de46f635f 100644
--- a/devel/electron18/distinfo
+++ b/devel/electron18/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1655951956
+TIMESTAMP = 1659493840
SHA256 (electron/chromium-100.0.4896.160.tar.xz) = a3f755dff069c6fae3eb7f07b33c0dd3f0762fa82959f41c7bd347da8efbacff
SIZE (electron/chromium-100.0.4896.160.tar.xz) = 1228994280
SHA256 (electron/aad6877c8cd3cff0ef1ba628d71acc981c520c29) = 9793d0cfb94bf2ff099682dcd31ef46d1d7f42346c8a2f6355a5f8fda3dcd506
SIZE (electron/aad6877c8cd3cff0ef1ba628d71acc981c520c29) = 12028653
SHA256 (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492
SIZE (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = 26759650
-SHA256 (electron/electron-yarn-cache-18.3.5.tar.xz) = 1988270c5c46db027718bd917f5fe4d0bcd7e5079aa57b72af22eadb964ff886
-SIZE (electron/electron-yarn-cache-18.3.5.tar.xz) = 38392736
-SHA256 (electron/electron-electron-v18.3.5_GH0.tar.gz) = ed9144b6e10c6f1c77adc4735606042cc4ea13c34a99abcafc965a0a5013c825
-SIZE (electron/electron-electron-v18.3.5_GH0.tar.gz) = 10236502
+SHA256 (electron/electron-yarn-cache-18.3.6.tar.xz) = 024ce2590f2b69f51167b19a9d759298c785eefbbc60623bdc5a68f505681560
+SIZE (electron/electron-yarn-cache-18.3.6.tar.xz) = 38390636
+SHA256 (electron/electron-electron-v18.3.6_GH0.tar.gz) = d055c96172849b65ddd672e5d26ec052ce4061217eed47a5a1a100c661c38016
+SIZE (electron/electron-electron-v18.3.6_GH0.tar.gz) = 10555061
SHA256 (electron/nodejs-node-v16.13.2_GH0.tar.gz) = 93c65be15bfe8151b4a99d529538b23ffc6b5e0202dc7df0e32aa780ab49ad97
SIZE (electron/nodejs-node-v16.13.2_GH0.tar.gz) = 87972240
SHA256 (electron/nodejs-nan-65b32af46e9d7fab2e4ff657751205b3865f4920_GH0.tar.gz) = a649b75bfa9c1a0254c73d022c6e98924b9471f593bcc83832daaf68da4cae8d
diff --git a/devel/electron18/files/package.json b/devel/electron18/files/package.json
index 51d1d6957d4d..7061669e91db 100644
--- a/devel/electron18/files/package.json
+++ b/devel/electron18/files/package.json
@@ -1,6 +1,6 @@
{
"name": "electron",
- "version": "18.3.5",
+ "version": "18.3.6",
"repository": "https://github.com/electron/electron",
"description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
"devDependencies": {
diff --git a/devel/electron18/files/patch-electron_BUILD.gn b/devel/electron18/files/patch-electron_BUILD.gn
index aefbc014250c..91656e8fe562 100644
--- a/devel/electron18/files/patch-electron_BUILD.gn
+++ b/devel/electron18/files/patch-electron_BUILD.gn
@@ -1,6 +1,6 @@
---- electron/BUILD.gn.orig 2022-06-22 15:31:20 UTC
+--- electron/BUILD.gn.orig 2022-07-28 16:21:57 UTC
+++ electron/BUILD.gn
-@@ -447,7 +447,7 @@ source_set("electron_lib") {
+@@ -448,7 +448,7 @@ source_set("electron_lib") {
defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ]
}
@@ -9,7 +9,7 @@
deps += [
"//components/crash/core/app",
"//components/crash/core/browser",
-@@ -489,6 +489,10 @@ source_set("electron_lib") {
+@@ -490,6 +490,10 @@ source_set("electron_lib") {
]
}
@@ -20,7 +20,7 @@
if (is_mac) {
deps += [
"//components/remote_cocoa/app_shim",
-@@ -543,6 +547,12 @@ source_set("electron_lib") {
+@@ -544,6 +548,12 @@ source_set("electron_lib") {
cflags_objcc = [ "-fobjc-weak" ]
}
}
@@ -33,7 +33,7 @@
if (is_linux) {
libs = [ "xshmfence" ]
deps += [
-@@ -1185,7 +1195,7 @@ if (is_mac) {
+@@ -1186,7 +1196,7 @@ if (is_mac) {
":electron_app_manifest",
":electron_lib",
":packed_resources",
@@ -42,7 +42,7 @@
"//content:sandbox_helper_win",
"//electron/buildflags",
"//ui/strings",
-@@ -1211,7 +1221,7 @@ if (is_mac) {
+@@ -1212,7 +1222,7 @@ if (is_mac) {
public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ]
}
@@ -51,7 +51,7 @@
data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ]
}
-@@ -1279,7 +1289,7 @@ if (is_mac) {
+@@ -1280,7 +1290,7 @@ if (is_mac) {
configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
}
@@ -60,7 +60,7 @@
deps += [ "//sandbox/linux:chrome_sandbox" ]
}
}
-@@ -1415,7 +1425,7 @@ dist_zip("electron_dist_zip") {
+@@ -1416,7 +1426,7 @@ dist_zip("electron_dist_zip") {
":electron_version",
":licenses",
]
diff --git a/devel/electron18/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron18/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
index e9ba61a6fb04..f22e974692bd 100644
--- a/devel/electron18/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
+++ b/devel/electron18/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
@@ -1,6 +1,6 @@
---- electron/shell/browser/api/electron_api_web_contents.cc.orig 2022-06-01 15:32:20 UTC
+--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2022-07-28 16:21:57 UTC
+++ electron/shell/browser/api/electron_api_web_contents.cc
-@@ -149,11 +149,11 @@
+@@ -150,11 +150,11 @@
#include "ui/base/cocoa/defaults_utils.h"
#endif
@@ -14,7 +14,7 @@
#include "ui/gfx/font_render_params.h"
#endif
-@@ -394,7 +394,7 @@ absl::optional<base::TimeDelta> GetCursorBlinkInterval
+@@ -395,7 +395,7 @@ absl::optional<base::TimeDelta> GetCursorBlinkInterval
ui::TextInsertionCaretBlinkPeriodFromDefaults());
if (system_value)
return *system_value;
@@ -23,7 +23,7 @@
if (auto* linux_ui = views::LinuxUI::instance())
return linux_ui->GetCursorBlinkInterval();
#elif BUILDFLAG(IS_WIN)
-@@ -832,7 +832,7 @@ void WebContents::InitWithSessionAndOptions(
+@@ -834,7 +834,7 @@ void WebContents::InitWithSessionAndOptions(
accept_languages.pop_back();
prefs->accept_languages = accept_languages;
@@ -32,7 +32,7 @@
// Update font settings.
static const gfx::FontRenderParams params(
gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
-@@ -2356,7 +2356,7 @@ void WebContents::ForcefullyCrashRenderer() {
+@@ -2360,7 +2360,7 @@ void WebContents::ForcefullyCrashRenderer() {
content::RenderProcessHost* rph = rwh->GetProcess();
if (rph) {
@@ -41,7 +41,7 @@
// A generic |CrashDumpHungChildProcess()| is not implemented for Linux.
// Instead we send an explicit IPC to crash on the renderer's IO thread.
rph->ForceCrash();
-@@ -2932,7 +2932,7 @@ void WebContents::CopyImageAt(int x, int y) {
+@@ -2940,7 +2940,7 @@ void WebContents::CopyImageAt(int x, int y) {
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.
@@ -50,7 +50,7 @@
if (owner_window())
owner_window()->Focus(true);
#endif
-@@ -3765,7 +3765,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
+@@ -3773,7 +3773,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
}
#endif
diff --git a/devel/electron18/files/patch-electron_shell_browser_electron__browser__client.cc b/devel/electron18/files/patch-electron_shell_browser_electron__browser__client.cc
index a4b62329be10..d94e16a5ae98 100644
--- a/devel/electron18/files/patch-electron_shell_browser_electron__browser__client.cc
+++ b/devel/electron18/files/patch-electron_shell_browser_electron__browser__client.cc
@@ -1,6 +1,6 @@
---- electron/shell/browser/electron_browser_client.cc.orig 2022-05-18 15:31:32 UTC
+--- electron/shell/browser/electron_browser_client.cc.orig 2022-07-28 16:21:57 UTC
+++ electron/shell/browser/electron_browser_client.cc
-@@ -182,7 +182,7 @@
+@@ -183,7 +183,7 @@
#include "content/public/common/child_process_host.h"
#endif
diff --git a/devel/electron18/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron18/files/patch-electron_shell_browser_native__window__views.cc
index 0c164f7150c6..e880528ed9df 100644
--- a/devel/electron18/files/patch-electron_shell_browser_native__window__views.cc
+++ b/devel/electron18/files/patch-electron_shell_browser_native__window__views.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/native_window_views.cc.orig 2022-05-18 15:31:32 UTC
+--- electron/shell/browser/native_window_views.cc.orig 2022-07-28 16:21:57 UTC
+++ electron/shell/browser/native_window_views.cc
@@ -43,7 +43,7 @@
#include "ui/wm/core/shadow_types.h"
@@ -9,7 +9,7 @@
#include "base/strings/string_util.h"
#include "shell/browser/browser.h"
#include "shell/browser/linux/unity_service.h"
-@@ -264,7 +264,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -265,7 +265,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
params.parent = parent->GetNativeWindow();
params.native_widget = new ElectronDesktopNativeWidgetAura(this);
@@ -18,7 +18,7 @@
std::string name = Browser::Get()->GetName();
// Set WM_WINDOW_ROLE.
params.wm_role_name = "browser-window";
-@@ -287,7 +287,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -290,7 +290,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
std::string window_type;
options.Get(options::kType, &window_type);
@@ -27,7 +27,7 @@
// Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set.
bool use_dark_theme = false;
if (options.Get(options::kDarkTheme, &use_dark_theme) && use_dark_theme) {
-@@ -393,7 +393,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -396,7 +396,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
if (window)
window->AddPreTargetHandler(this);
@@ -36,7 +36,7 @@
// On linux after the widget is initialized we might have to force set the
// bounds if the bounds are smaller than the current display
SetBounds(gfx::Rect(GetPosition(), bounds.size()), false);
-@@ -536,7 +536,7 @@ bool NativeWindowViews::IsVisible() {
+@@ -546,7 +546,7 @@ bool NativeWindowViews::IsVisible() {
bool NativeWindowViews::IsEnabled() {
#if BUILDFLAG(IS_WIN)
return ::IsWindowEnabled(GetAcceleratedWidget());
@@ -45,7 +45,7 @@
#if defined(USE_OZONE_PLATFORM_X11)
if (IsX11())
return !event_disabler_.get();
-@@ -594,7 +594,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable
+@@ -604,7 +604,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable
#endif
}
@@ -54,7 +54,7 @@
void NativeWindowViews::Maximize() {
if (IsVisible()) {
widget()->Maximize();
-@@ -722,7 +722,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
+@@ -732,7 +732,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
}
#endif
@@ -63,7 +63,7 @@
// On Linux and Windows the minimum and maximum size should be updated with
// window size when window is not resizable.
if (!resizable_) {
-@@ -939,7 +939,7 @@ bool NativeWindowViews::IsClosable() {
+@@ -964,7 +964,7 @@ bool NativeWindowViews::IsClosable() {
return false;
}
return !(info.fState & MFS_DISABLED);
@@ -72,7 +72,7 @@
return true;
#endif
}
-@@ -1331,7 +1331,7 @@ void NativeWindowViews::SetProgressBar(double progress
+@@ -1356,7 +1356,7 @@ void NativeWindowViews::SetProgressBar(double progress
NativeWindow::ProgressState state) {
#if BUILDFLAG(IS_WIN)
taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state);
@@ -81,7 +81,7 @@
if (unity::IsRunning()) {
unity::SetProgressFraction(progress);
}
-@@ -1393,7 +1393,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
+@@ -1418,7 +1418,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
#if BUILDFLAG(IS_WIN)
window_handle =
reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);
@@ -90,7 +90,7 @@
window_handle = static_cast<uint32_t>(accelerated_widget);
#endif
aura::WindowTreeHost* const host =
-@@ -1496,7 +1496,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
+@@ -1521,7 +1521,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
SendMessage(hwnd, WM_SETICON, ICON_BIG,
reinterpret_cast<LPARAM>(app_icon_.get()));
}
@@ -99,7 +99,7 @@
void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(
GetAcceleratedWidget());
-@@ -1566,7 +1566,7 @@ bool NativeWindowViews::CanMaximize() const {
+@@ -1591,7 +1591,7 @@ bool NativeWindowViews::CanMaximize() const {
bool NativeWindowViews::CanMinimize() const {
#if BUILDFLAG(IS_WIN)
return minimizable_;
@@ -108,7 +108,7 @@
return true;
#endif
}
-@@ -1640,7 +1640,7 @@ void NativeWindowViews::HandleKeyboardEvent(
+@@ -1665,7 +1665,7 @@ void NativeWindowViews::HandleKeyboardEvent(
if (widget_destroyed_)
return;
@@ -117,7 +117,7 @@
if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
NotifyWindowExecuteAppCommand(kBrowserBackward);
else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
-@@ -1659,7 +1659,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
+@@ -1684,7 +1684,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
// Alt+Click should not toggle menu bar.
root_view_->ResetAltState();
diff --git a/devel/electron18/files/patch-electron_spec-main_api-browser-view-spec.ts b/devel/electron18/files/patch-electron_spec-main_api-browser-view-spec.ts
new file mode 100644
index 000000000000..8e3743c9d7a9
--- /dev/null
+++ b/devel/electron18/files/patch-electron_spec-main_api-browser-view-spec.ts
@@ -0,0 +1,20 @@
+--- electron/spec-main/api-browser-view-spec.ts.orig 2022-08-03 02:37:19 UTC
++++ electron/spec-main/api-browser-view-spec.ts
+@@ -63,7 +63,7 @@ describe('BrowserView module', () => {
+ });
+
+ // Linux and arm64 platforms (WOA and macOS) do not return any capture sources
+- ifit(process.platform !== 'linux' && process.arch !== 'arm64')('sets the background color to transparent if none is set', async () => {
++ ifit((process.platform !== 'linux' && process.platform !== 'freebsd') && process.arch !== 'arm64')('sets the background color to transparent if none is set', async () => {
+ const display = screen.getPrimaryDisplay();
+ const WINDOW_BACKGROUND_COLOR = '#55ccbb';
+
+@@ -87,7 +87,7 @@ describe('BrowserView module', () => {
+ });
+
+ // Linux and arm64 platforms (WOA and macOS) do not return any capture sources
+- ifit(process.platform !== 'linux' && process.arch !== 'arm64')('successfully applies the background color', async () => {
++ ifit((process.platform !== 'linux' && process.platform !== 'freebsd') && process.arch !== 'arm64')('successfully applies the background color', async () => {
+ const WINDOW_BACKGROUND_COLOR = '#55ccbb';
+ const VIEW_BACKGROUND_COLOR = '#ff00ff';
+ const display = screen.getPrimaryDisplay();
diff --git a/devel/electron18/files/patch-electron_spec-main_api-browser-window-spec.ts b/devel/electron18/files/patch-electron_spec-main_api-browser-window-spec.ts
index b42518664f7a..a5720f41219a 100644
--- a/devel/electron18/files/patch-electron_spec-main_api-browser-window-spec.ts
+++ b/devel/electron18/files/patch-electron_spec-main_api-browser-window-spec.ts
@@ -1,4 +1,4 @@
---- electron/spec-main/api-browser-window-spec.ts.orig 2022-06-22 15:31:20 UTC
+--- electron/spec-main/api-browser-window-spec.ts.orig 2022-07-28 16:21:57 UTC
+++ electron/spec-main/api-browser-window-spec.ts
@@ -60,7 +60,7 @@ describe('BrowserWindow module', () => {
}).not.to.throw();
@@ -54,7 +54,7 @@
it('checks normal bounds when minimized', async () => {
const bounds = w.getBounds();
const minimize = emittedOnce(w, 'minimize');
-@@ -2251,7 +2251,7 @@ describe('BrowserWindow module', () => {
+@@ -2271,7 +2271,7 @@ describe('BrowserWindow module', () => {
describe('BrowserWindow.setOpacity(opacity)', () => {
afterEach(closeAllWindows);
@@ -63,7 +63,7 @@
it('make window with initial opacity', () => {
const w = new BrowserWindow({ show: false, opacity: 0.5 });
expect(w.getOpacity()).to.equal(0.5);
-@@ -2277,7 +2277,7 @@ describe('BrowserWindow module', () => {
+@@ -2297,7 +2297,7 @@ describe('BrowserWindow module', () => {
});
});
@@ -72,7 +72,7 @@
it('sets 1 regardless of parameter', () => {
const w = new BrowserWindow({ show: false });
w.setOpacity(0);
-@@ -3083,7 +3083,7 @@ describe('BrowserWindow module', () => {
+@@ -3138,7 +3138,7 @@ describe('BrowserWindow module', () => {
expect(test.versions).to.deep.equal(process.versions);
expect(test.contextId).to.be.a('string');
@@ -81,7 +81,7 @@
expect(test.creationTime).to.be.null('creation time');
expect(test.systemMemoryInfo).to.be.null('system memory info');
} else {
-@@ -3656,7 +3656,7 @@ describe('BrowserWindow module', () => {
+@@ -3711,7 +3711,7 @@ describe('BrowserWindow module', () => {
});
});
@@ -90,7 +90,7 @@
afterEach(closeAllWindows);
it('emits an event when window is maximized', async () => {
const w = new BrowserWindow({ show: false });
-@@ -3915,7 +3915,7 @@ describe('BrowserWindow module', () => {
+@@ -3970,7 +3970,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 });
-@@ -3952,7 +3952,7 @@ describe('BrowserWindow module', () => {
+@@ -4007,7 +4007,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();
-@@ -4307,7 +4307,7 @@ describe('BrowserWindow module', () => {
+@@ -4370,7 +4370,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');
-@@ -4399,7 +4399,7 @@ describe('BrowserWindow module', () => {
+@@ -4462,7 +4462,7 @@ describe('BrowserWindow module', () => {
});
});
@@ -126,7 +126,7 @@
// Not implemented on Linux.
afterEach(closeAllWindows);
-@@ -5323,7 +5323,7 @@ describe('BrowserWindow module', () => {
+@@ -5402,7 +5402,7 @@ describe('BrowserWindow module', () => {
});
// Linux and arm64 platforms (WOA and macOS) do not return any capture sources
@@ -135,7 +135,7 @@
const display = screen.getPrimaryDisplay();
const backgroundWindow = new BrowserWindow({
-@@ -5365,7 +5365,7 @@ describe('BrowserWindow module', () => {
+@@ -5444,7 +5444,7 @@ describe('BrowserWindow module', () => {
afterEach(closeAllWindows);
// Linux and arm64 platforms (WOA and macOS) do not return any capture sources
diff --git a/devel/electron18/files/patch-electron_spec-main_chromium-spec.ts b/devel/electron18/files/patch-electron_spec-main_chromium-spec.ts
index 5e59c7d878f1..55933d0a1903 100644
--- a/devel/electron18/files/patch-electron_spec-main_chromium-spec.ts
+++ b/devel/electron18/files/patch-electron_spec-main_chromium-spec.ts
@@ -1,4 +1,4 @@
---- electron/spec-main/chromium-spec.ts.orig 2022-05-25 15:32:14 UTC
+--- electron/spec-main/chromium-spec.ts.orig 2022-07-28 16:21:57 UTC
+++ electron/spec-main/chromium-spec.ts
@@ -400,13 +400,13 @@ describe('command line switches', () => {
it('should not set an invalid locale', async () => testLocale('asdfkl', currentLocale));
@@ -18,7 +18,7 @@
});
describe('--remote-debugging-pipe switch', () => {
-@@ -1536,12 +1536,12 @@ describe('font fallback', () => {
+@@ -1598,12 +1598,12 @@ describe('font fallback', () => {
expect(fonts[0].familyName).to.equal('Arial');
} else if (process.platform === 'darwin') {
expect(fonts[0].familyName).to.equal('Helvetica');
@@ -33,7 +33,7 @@
const html = `
<html lang="ja-JP">
<head>
-@@ -1767,7 +1767,7 @@ describe('navigator.clipboard', () => {
+@@ -1829,7 +1829,7 @@ describe('navigator.clipboard', () => {
});
});
diff --git a/devel/electron18/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc b/devel/electron18/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc
index 14d51d0d28ff..aeb84d8f6f02 100644
--- a/devel/electron18/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc
+++ b/devel/electron18/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-05-20 04:30:53 UTC
+--- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-08-03 02:36:11 UTC
+++ ui/ozone/platform/x11/ozone_platform_x11.cc
-@@ -205,7 +205,7 @@ class OzonePlatformX11 : public OzonePlatform,
+@@ -204,7 +204,7 @@ class OzonePlatformX11 : public OzonePlatform,
properties->supports_global_application_menus = true;
properties->app_modal_dialogs_use_event_blocker = true;
properties->fetch_buffer_formats_for_gmb_on_gpu = true;
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index 68e6ffee7b23..ae6527320b9f 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,5 +1,6 @@
PORTNAME= vscode
DISTVERSION= 1.69.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 \