git: 3118f087c926 - main - devel/electron17: update to 17.4.9

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Hiroki Tagato <tagattie_at_FreeBSD.org>
Date: Mon, 04 Jul 2022 00:29:13 UTC
The branch main has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3118f087c926cd85c38af87c0552b2b46b22b60a

commit 3118f087c926cd85c38af87c0552b2b46b22b60a
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2022-07-04 00:27:37 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2022-07-04 00:29:02 +0000

    devel/electron17: update to 17.4.9
    
    Changelog: https://github.com/electron/electron/releases/tag/v17.4.9
---
 devel/electron17/Makefile                            |  2 +-
 devel/electron17/Makefile.version                    |  2 +-
 devel/electron17/distinfo                            | 10 +++++-----
 devel/electron17/files/package.json                  |  2 +-
 devel/electron17/files/patch-electron_BUILD.gn       | 16 ++++++++--------
 ...shell_browser_api_electron__api__web__contents.cc | 14 +++++++-------
 .../patch-electron_shell_browser_browser__linux.cc   |  4 ++--
 ...ectron_shell_browser_electron__browser__client.cc |  4 ++--
 ...n_shell_browser_electron__browser__main__parts.cc | 20 ++++++++++----------
 ...h-electron_shell_browser_native__window__views.cc | 16 ++++++++--------
 ...atch-electron_shell_browser_ui_views_menu__bar.cc |  4 ++--
 .../files/patch-electron_spec-main_chromium-spec.ts  |  6 +++---
 editors/vscode/Makefile                              |  2 +-
 13 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/devel/electron17/Makefile b/devel/electron17/Makefile
index 1da3ede8aa13..35b596ca05d0 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=	1655881420
+YARN_TIMESTAMP=	1656652910
 
 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 3773b26cff66..53a3365fcae4 100644
--- a/devel/electron17/Makefile.version
+++ b/devel/electron17/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	17.4.8
+ELECTRON_VER=	17.4.9
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron17/distinfo b/devel/electron17/distinfo
index a7928f19835d..156a4868632b 100644
--- a/devel/electron17/distinfo
+++ b/devel/electron17/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1655882515
+TIMESTAMP = 1656655092
 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.8.tar.xz) = 78c9e8cc3e0d90bfec7574c1a07013e01cb65ccf05edc2cf9f41563038791204
-SIZE (electron/electron-yarn-cache-17.4.8.tar.xz) = 36632472
-SHA256 (electron/electron-electron-v17.4.8_GH0.tar.gz) = 3b13c9bdefe804d12aa020fe05c546421c21d7ec8ec7cc747005df3fafcda27d
-SIZE (electron/electron-electron-v17.4.8_GH0.tar.gz) = 10265532
+SHA256 (electron/electron-yarn-cache-17.4.9.tar.xz) = 737578a38a140bf426c3e45d48f15ce99dbeafb85f9aecbc006bc6188a600fb8
+SIZE (electron/electron-yarn-cache-17.4.9.tar.xz) = 36628092
+SHA256 (electron/electron-electron-v17.4.9_GH0.tar.gz) = 0a6059cab94a8578d1d8de2815c4d672aaefa629cc25ff440e73698d94f73737
+SIZE (electron/electron-electron-v17.4.9_GH0.tar.gz) = 10273978
 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 e4cb8cde878b..85684152b85d 100644
--- a/devel/electron17/files/package.json
+++ b/devel/electron17/files/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "17.4.8",
+  "version": "17.4.9",
   "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_BUILD.gn b/devel/electron17/files/patch-electron_BUILD.gn
index e50105a1e303..912732fc1522 100644
--- a/devel/electron17/files/patch-electron_BUILD.gn
+++ b/devel/electron17/files/patch-electron_BUILD.gn
@@ -1,6 +1,6 @@
---- electron/BUILD.gn.orig	2022-05-11 15:32:29 UTC
+--- electron/BUILD.gn.orig	2022-06-30 19:37:49 UTC
 +++ electron/BUILD.gn
-@@ -435,7 +435,7 @@ source_set("electron_lib") {
+@@ -444,7 +444,7 @@ source_set("electron_lib") {
      defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ]
    }
  
@@ -9,7 +9,7 @@
      deps += [
        "//components/crash/core/app",
        "//components/crash/core/browser",
-@@ -477,6 +477,10 @@ source_set("electron_lib") {
+@@ -486,6 +486,10 @@ source_set("electron_lib") {
      ]
    }
  
@@ -20,7 +20,7 @@
    if (is_mac) {
      deps += [
        "//components/remote_cocoa/app_shim",
-@@ -531,6 +535,12 @@ source_set("electron_lib") {
+@@ -540,6 +544,12 @@ source_set("electron_lib") {
        cflags_objcc = [ "-fobjc-weak" ]
      }
    }
@@ -33,7 +33,7 @@
    if (is_linux) {
      libs = [ "xshmfence" ]
      deps += [
-@@ -1170,7 +1180,7 @@ if (is_mac) {
+@@ -1180,7 +1190,7 @@ if (is_mac) {
        ":electron_app_manifest",
        ":electron_lib",
        ":packed_resources",
@@ -42,7 +42,7 @@
        "//content:sandbox_helper_win",
        "//electron/buildflags",
        "//ui/strings",
-@@ -1196,7 +1206,7 @@ if (is_mac) {
+@@ -1206,7 +1216,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" ]
      }
  
-@@ -1264,7 +1274,7 @@ if (is_mac) {
+@@ -1274,7 +1284,7 @@ if (is_mac) {
          configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
        }
  
@@ -60,7 +60,7 @@
          deps += [ "//sandbox/linux:chrome_sandbox" ]
        }
      }
-@@ -1400,7 +1410,7 @@ dist_zip("electron_dist_zip") {
+@@ -1410,7 +1420,7 @@ dist_zip("electron_dist_zip") {
      ":electron_version",
      ":licenses",
    ]
diff --git a/devel/electron17/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron17/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
index cad8c443a102..b5f350246f93 100644
--- a/devel/electron17/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
+++ b/devel/electron17/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-05-11 15:32:29 UTC
+--- electron/shell/browser/api/electron_api_web_contents.cc.orig	2022-06-30 19:37:49 UTC
 +++ electron/shell/browser/api/electron_api_web_contents.cc
-@@ -150,11 +150,11 @@
+@@ -151,11 +151,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
    base::TimeDelta interval;
    if (ui::TextInsertionCaretBlinkPeriod(&interval))
      return interval;
@@ -23,7 +23,7 @@
    if (auto* linux_ui = views::LinuxUI::instance())
      return linux_ui->GetCursorBlinkInterval();
  #elif defined(OS_WIN)
-@@ -830,7 +830,7 @@ void WebContents::InitWithSessionAndOptions(
+@@ -832,7 +832,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));
-@@ -2317,7 +2317,7 @@ void WebContents::ForcefullyCrashRenderer() {
+@@ -2319,7 +2319,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();
-@@ -2893,7 +2893,7 @@ void WebContents::CopyImageAt(int x, int y) {
+@@ -2899,7 +2899,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
-@@ -3728,7 +3728,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
+@@ -3734,7 +3734,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
  }
  #endif
  
diff --git a/devel/electron17/files/patch-electron_shell_browser_browser__linux.cc b/devel/electron17/files/patch-electron_shell_browser_browser__linux.cc
index d1e277507c2f..cc9f06bc5ddf 100644
--- a/devel/electron17/files/patch-electron_shell_browser_browser__linux.cc
+++ b/devel/electron17/files/patch-electron_shell_browser_browser__linux.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/browser_linux.cc.orig	2021-04-22 08:22:30 UTC
+--- electron/shell/browser/browser_linux.cc.orig	2022-06-30 19:37:49 UTC
 +++ electron/shell/browser/browser_linux.cc
 @@ -15,7 +15,7 @@
  #include "shell/browser/window_list.h"
@@ -7,5 +7,5 @@
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
  #include "shell/browser/linux/unity_service.h"
- #include "ui/gtk/gtk_util.h"
+ #include "ui/gtk/gtk_util.h"  // nogncheck
  #endif
diff --git a/devel/electron17/files/patch-electron_shell_browser_electron__browser__client.cc b/devel/electron17/files/patch-electron_shell_browser_electron__browser__client.cc
index c1e0e5a34d7c..6ce1074ce0ca 100644
--- a/devel/electron17/files/patch-electron_shell_browser_electron__browser__client.cc
+++ b/devel/electron17/files/patch-electron_shell_browser_electron__browser__client.cc
@@ -1,6 +1,6 @@
---- electron/shell/browser/electron_browser_client.cc.orig	2022-05-11 15:32:29 UTC
+--- electron/shell/browser/electron_browser_client.cc.orig	2022-06-30 19:37:49 UTC
 +++ electron/shell/browser/electron_browser_client.cc
-@@ -179,7 +179,7 @@
+@@ -180,7 +180,7 @@
  #include "content/public/common/child_process_host.h"
  #endif
  
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 04857aef9e61..f93deb7db32f 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,4 +1,4 @@
---- electron/shell/browser/electron_browser_main_parts.cc.orig	2022-05-25 15:32:53 UTC
+--- electron/shell/browser/electron_browser_main_parts.cc.orig	2022-06-30 19:37:49 UTC
 +++ electron/shell/browser/electron_browser_main_parts.cc
 @@ -64,7 +64,7 @@
  #include "ui/wm/core/wm_state.h"
@@ -9,7 +9,7 @@
  #include "base/environment.h"
  #include "base/threading/thread_task_runner_handle.h"
  #include "device/bluetooth/bluetooth_adapter_factory.h"
-@@ -143,7 +143,7 @@ std::u16string MediaStringProvider(media::MessageId id
+@@ -145,7 +145,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.
-@@ -161,7 +161,7 @@ void UpdateDarkThemeSetting() {
+@@ -163,7 +163,7 @@ void UpdateDarkThemeSetting() {
  
  }  // namespace
  
@@ -27,7 +27,7 @@
  class DarkThemeObserver : public ui::NativeThemeObserver {
   public:
    DarkThemeObserver() = default;
-@@ -214,7 +214,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization()
+@@ -216,7 +216,7 @@ int ElectronBrowserMainParts::PreEarlyInitialization()
  #if defined(OS_POSIX)
    HandleSIGCHLD();
  #endif
@@ -36,7 +36,7 @@
    ui::OzonePlatform::PreEarlyInitialization();
  #endif
  
-@@ -275,7 +275,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
+@@ -277,7 +277,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
-@@ -292,7 +292,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
+@@ -294,7 +294,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
-@@ -315,7 +315,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
+@@ -317,7 +317,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)
-@@ -362,7 +362,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() {
+@@ -364,7 +364,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() {
  }
  
  void ElectronBrowserMainParts::ToolkitInitialized() {
@@ -72,7 +72,7 @@
    auto linux_ui = BuildGtkUi();
    linux_ui->Initialize();
    DCHECK(ui::LinuxInputMethodContextFactory::instance());
-@@ -469,7 +469,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
+@@ -477,7 +477,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
    ui::OzonePlatform::GetInstance()->PostCreateMainMessageLoop(
        std::move(shutdown_cb));
    bluez::DBusBluezManagerWrapperLinux::Initialize();
@@ -82,7 +82,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.
-@@ -528,7 +530,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
+@@ -536,7 +538,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
    fake_browser_process_->PostMainMessageLoopRun();
    content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler();
  
diff --git a/devel/electron17/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron17/files/patch-electron_shell_browser_native__window__views.cc
index 9d92749b6b2a..3db9f439ab3f 100644
--- a/devel/electron17/files/patch-electron_shell_browser_native__window__views.cc
+++ b/devel/electron17/files/patch-electron_shell_browser_native__window__views.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/native_window_views.cc.orig	2022-05-11 15:32:29 UTC
+--- electron/shell/browser/native_window_views.cc.orig	2022-06-30 19:37:49 UTC
 +++ electron/shell/browser/native_window_views.cc
 @@ -43,7 +43,7 @@
  #include "ui/wm/core/shadow_types.h"
@@ -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() {
+@@ -954,7 +954,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
+@@ -1346,7 +1346,7 @@ void NativeWindowViews::SetProgressBar(double progress
                                         NativeWindow::ProgressState state) {
  #if defined(OS_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
+@@ -1408,7 +1408,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
  #if defined(OS_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
+@@ -1511,7 +1511,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 {
+@@ -1581,7 +1581,7 @@ bool NativeWindowViews::CanMaximize() const {
  bool NativeWindowViews::CanMinimize() const {
  #if defined(OS_WIN)
    return minimizable_;
@@ -108,7 +108,7 @@
    return true;
  #endif
  }
-@@ -1640,7 +1640,7 @@ void NativeWindowViews::HandleKeyboardEvent(
+@@ -1655,7 +1655,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
+@@ -1674,7 +1674,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
    // Alt+Click should not toggle menu bar.
    root_view_->ResetAltState();
  
diff --git a/devel/electron17/files/patch-electron_shell_browser_ui_views_menu__bar.cc b/devel/electron17/files/patch-electron_shell_browser_ui_views_menu__bar.cc
index 2cc3c78a4af7..313ee690ee4f 100644
--- a/devel/electron17/files/patch-electron_shell_browser_ui_views_menu__bar.cc
+++ b/devel/electron17/files/patch-electron_shell_browser_ui_views_menu__bar.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/ui/views/menu_bar.cc.orig	2021-12-03 01:46:05 UTC
+--- electron/shell/browser/ui/views/menu_bar.cc.orig	2022-06-30 19:37:49 UTC
 +++ electron/shell/browser/ui/views/menu_bar.cc
 @@ -12,7 +12,7 @@
  #include "ui/views/background.h"
@@ -6,7 +6,7 @@
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
- #include "ui/gtk/gtk_util.h"
+ #include "ui/gtk/gtk_util.h"  // nogncheck
  #endif
  
 @@ -209,7 +209,7 @@ void MenuBar::ButtonPressed(int id, const ui::Event& e
diff --git a/devel/electron17/files/patch-electron_spec-main_chromium-spec.ts b/devel/electron17/files/patch-electron_spec-main_chromium-spec.ts
index 95dfd27ff2bf..713b42878b03 100644
--- a/devel/electron17/files/patch-electron_spec-main_chromium-spec.ts
+++ b/devel/electron17/files/patch-electron_spec-main_chromium-spec.ts
@@ -1,4 +1,4 @@
---- electron/spec-main/chromium-spec.ts.orig	2022-05-25 15:32:53 UTC
+--- electron/spec-main/chromium-spec.ts.orig	2022-06-30 19:37:49 UTC
 +++ electron/spec-main/chromium-spec.ts
 @@ -404,13 +404,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', () => {
-@@ -1581,12 +1581,12 @@ describe('font fallback', () => {
+@@ -1643,12 +1643,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>
-@@ -1811,7 +1811,7 @@ describe('navigator.clipboard', () => {
+@@ -1873,7 +1873,7 @@ describe('navigator.clipboard', () => {
    });
  });
  
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index ec112a7b8caf..a154f05f87d3 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vscode
 DISTVERSION=	1.68.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	https://registry.npmjs.org/esbuild-freebsd-64/-/:esbuild_binary \
 		https://nodejs.org/dist/v${NODE_VER}/:node_headers \