devel/electron25: update to 25.1.0

Changelog: https://github.com/electron/electron/releases/tag/v25.1.0
tagattie · Jun 13, 2023 · 4e711f1 · 4e711f1
1 parent c396bbd
commit 4e711f1
Show file tree

Hide file tree

Showing 10 changed files with 102 additions and 52 deletions.
diff --git a/devel/electron25/Makefile b/devel/electron25/Makefile
@@ -205,7 +205,7 @@ SNDIO_VARS=		GN_ARGS+=use_sndio=true
 SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false
 
 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
-CHROMIUM_VER=			114.0.5735.45
+CHROMIUM_VER=			114.0.5735.106
 # See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
 CHROMIUM_TEST_FONTS_HASH=	336e775eec536b2d785cc80eff6ac39051931286
 # See ${WRKSRC}/electron/DEPS for NODE_VER
@@ -219,7 +219,7 @@ REACTIVEOBJC_VER=		74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
 # See ${WRKSRC}/electron/DEPS for MANTLE_VER
 MANTLE_VER=			78d3966b3c331292ea29ec38661b25df0a245948
 
-YARN_TIMESTAMP=	1686015089
+YARN_TIMESTAMP=	1686621795
 
 .include "Makefile.version"
 .include <bsd.port.pre.mk>

diff --git a/devel/electron25/Makefile.version b/devel/electron25/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	25.0.1
+ELECTRON_VER=	25.1.0
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron25/distinfo b/devel/electron25/distinfo
@@ -1,12 +1,12 @@
-TIMESTAMP = 1686015524
-SHA256 (electron/chromium-114.0.5735.45.tar.xz) = 1b8cdf5f06bcf976d5631dbda1cfbc1f89cec7d843fd7cfb0931713f7025fffc
-SIZE (electron/chromium-114.0.5735.45.tar.xz) = 1570536156
+TIMESTAMP = 1686622362
+SHA256 (electron/chromium-114.0.5735.106.tar.xz) = df18b0b28bf52b1c099acde54e568fbfa2c9225150108bce9d53d8b31f71304a
+SIZE (electron/chromium-114.0.5735.106.tar.xz) = 1570627752
 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
-SHA256 (electron/electron-yarn-cache-25.0.1.tar.xz) = 0e14e69b96a3c589293400dba0606f5b099ff6e57bdf781c45e8c37ff67f1b23
-SIZE (electron/electron-yarn-cache-25.0.1.tar.xz) = 40949016
-SHA256 (electron/electron-electron-v25.0.1_GH0.tar.gz) = 3405b804d096ed2f464eb5afddc3c1cf7965eedcff9d158705bcf0b98c1b46d3
-SIZE (electron/electron-electron-v25.0.1_GH0.tar.gz) = 11225571
+SHA256 (electron/electron-yarn-cache-25.1.0.tar.xz) = 0047679e0ff09b77312df9c518cd46ec30942ea8806d18218369ee010822845a
+SIZE (electron/electron-yarn-cache-25.1.0.tar.xz) = 41289456
+SHA256 (electron/electron-electron-v25.1.0_GH0.tar.gz) = 8bd1347c73ee6c368a12c3cc851348e29481cdbe8bb830c387c93c0a7f0873eb
+SIZE (electron/electron-electron-v25.1.0_GH0.tar.gz) = 11224485
 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/package.json b/devel/electron25/files/package.json
@@ -9,7 +9,7 @@
     "@electron/docs-parser": "^1.1.0",
     "@electron/fiddle-core": "^1.0.4",
     "@electron/github-app-auth": "^2.0.0",
-    "@electron/lint-roller": "^1.2.1",
+    "@electron/lint-roller": "^1.5.0",
     "@electron/typescript-definitions": "^8.14.0",
     "@octokit/rest": "^19.0.7",
     "@primer/octicons": "^10.0.0",
@@ -30,6 +30,7 @@
     "@types/stream-json": "^1.5.1",
     "@types/temp": "^0.8.34",
     "@types/uuid": "^3.4.6",
+    "@types/w3c-web-serial": "^1.0.3",
     "@types/webpack": "^5.28.0",
     "@types/webpack-env": "^1.17.0",
     "@typescript-eslint/eslint-plugin": "^4.4.1",
@@ -88,10 +89,11 @@
     "lint:objc": "node ./script/lint.js --objc",
     "lint:py": "node ./script/lint.js --py",
     "lint:gn": "node ./script/lint.js --gn",
-    "lint:docs": "remark docs -qf && npm run lint:js-in-markdown && npm run create-typescript-definitions && npm run lint:docs-fiddles && npm run lint:docs-relative-links && npm run lint:markdownlint",
+    "lint:docs": "remark docs -qf && npm run lint:js-in-markdown && npm run create-typescript-definitions && npm run lint:ts-check-js-in-markdown && npm run lint:docs-fiddles && npm run lint:docs-relative-links && npm run lint:markdownlint",
     "lint:docs-fiddles": "standard \"docs/fiddles/**/*.js\"",
     "lint:docs-relative-links": "electron-lint-markdown-links --root docs \"**/*.md\"",
     "lint:markdownlint": "electron-markdownlint \"*.md\" \"docs/**/*.md\"",
+    "lint:ts-check-js-in-markdown": "electron-lint-markdown-ts-check --root docs \"**/*.md\" --ignore \"breaking-changes.md\"",
     "lint:js-in-markdown": "electron-lint-markdown-standard --root docs \"**/*.md\"",
     "create-api-json": "node script/create-api-json.js",
     "create-typescript-definitions": "npm run create-api-json && electron-typescript-definitions --api=electron-api.json && node spec/ts-smoke/runner.js",

diff --git a/devel/electron25/files/patch-electron_shell_app_electron__main__delegate.cc b/devel/electron25/files/patch-electron_shell_app_electron__main__delegate.cc
@@ -1,4 +1,4 @@
---- electron/shell/app/electron_main_delegate.cc.orig	2023-04-25 11:16:51 UTC
+--- electron/shell/app/electron_main_delegate.cc.orig	2023-06-07 10:09:25 UTC
 +++ electron/shell/app/electron_main_delegate.cc
 @@ -58,13 +58,16 @@
  #include "chrome/child/v8_crashpad_support_win.h"
@@ -37,16 +37,16 @@
    // Check for --no-sandbox parameter when running as root.
    if (getuid() == 0 && IsSandboxEnabled(command_line))
      LOG(FATAL) << "Running as root without --"
-@@ -340,7 +343,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
-                                    process_type == ::switches::kZygoteProcess);
+@@ -338,7 +341,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
+       /* is_preinit = */ IsBrowserProcess() || IsZygoteProcess());
  #endif
 
 -#if !IS_MAS_BUILD()
 +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD)
    crash_reporter::InitializeCrashKeys();
  #endif
 
-@@ -375,7 +378,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
+@@ -373,7 +376,7 @@ void ElectronMainDelegate::PreSandboxStartup() {
    }
  #endif
 

diff --git a/devel/electron25/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc b/devel/electron25/files/patch-electron_shell_browser_api_electron__api__crash__reporter.cc
@@ -1,15 +1,15 @@
---- electron/shell/browser/api/electron_api_crash_reporter.cc.orig	2023-05-31 14:28:29 UTC
+--- electron/shell/browser/api/electron_api_crash_reporter.cc.orig	2023-06-07 10:09:25 UTC
 +++ electron/shell/browser/api/electron_api_crash_reporter.cc
-@@ -30,7 +30,7 @@
- #include "shell/common/node_includes.h"
+@@ -31,7 +31,7 @@
+ #include "shell/common/process_util.h"
  #include "shell/common/thread_restrictions.h"
 
 -#if !IS_MAS_BUILD()
 +#if !IS_MAS_BUILD() && !BUILDFLAG(IS_BSD)
  #include "components/crash/core/app/crashpad.h"  // nogncheck
  #include "components/crash/core/browser/crash_upload_list_crashpad.h"  // nogncheck
  #include "components/crash/core/common/crash_key.h"
-@@ -65,7 +65,7 @@ bool g_crash_reporter_initialized = false;
+@@ -66,7 +66,7 @@ bool g_crash_reporter_initialized = false;
 
  namespace electron::api::crash_reporter {
 
@@ -18,7 +18,7 @@
  namespace {
 
  void NoOp() {}
-@@ -132,7 +132,7 @@ void Start(const std::string& submit_url,
+@@ -133,7 +133,7 @@ void Start(const std::string& submit_url,
             const std::map<std::string, std::string>& extra,
             bool is_node_process) {
    TRACE_EVENT0("electron", "crash_reporter::Start");
@@ -27,7 +27,7 @@
    if (g_crash_reporter_initialized)
      return;
    g_crash_reporter_initialized = true;
-@@ -182,7 +182,7 @@ void Start(const std::string& submit_url,
+@@ -179,7 +179,7 @@ void Start(const std::string& submit_url,
 
  namespace {
 
@@ -36,7 +36,7 @@
  void GetUploadedReports(
      v8::Isolate* isolate,
      base::OnceCallback<void(v8::Local<v8::Value>)> callback) {
-@@ -238,13 +238,13 @@ v8::Local<v8::Value> GetUploadedReports(v8::Isolate* i
+@@ -235,13 +235,13 @@ v8::Local<v8::Value> GetUploadedReports(v8::Isolate* i
  #endif
 
  void SetUploadToServer(bool upload) {
@@ -52,7 +52,7 @@
    return false;
  #else
    return ElectronCrashReporterClient::Get()->GetCollectStatsConsent();
-@@ -253,7 +253,7 @@ bool GetUploadToServer() {
+@@ -250,7 +250,7 @@ bool GetUploadToServer() {
 
  v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) {
    std::map<std::string, std::string> keys;
@@ -61,7 +61,7 @@
    electron::crash_keys::GetCrashKeys(&keys);
  #endif
    return gin::ConvertToV8(isolate, keys);
-@@ -265,7 +265,7 @@ void Initialize(v8::Local<v8::Object> exports,
+@@ -262,7 +262,7 @@ void Initialize(v8::Local<v8::Object> exports,
                  void* priv) {
    gin_helper::Dictionary dict(context->GetIsolate(), exports);
    dict.SetMethod("start", &electron::api::crash_reporter::Start);

diff --git a/devel/electron25/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron25/files/patch-electron_shell_browser_native__window__views.cc
@@ -1,6 +1,6 @@
---- electron/shell/browser/native_window_views.cc.orig	2023-05-22 19:19:22 UTC
+--- electron/shell/browser/native_window_views.cc.orig	2023-06-07 10:09:25 UTC
 +++ electron/shell/browser/native_window_views.cc
-@@ -43,7 +43,7 @@
+@@ -42,7 +42,7 @@
  #include "ui/wm/core/shadow_types.h"
  #include "ui/wm/core/window_util.h"
 
@@ -9,7 +9,7 @@
  #include "base/strings/string_util.h"
  #include "shell/browser/browser.h"
  #include "shell/browser/linux/unity_service.h"
-@@ -279,7 +279,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -276,7 +276,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";
-@@ -304,7 +304,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -301,7 +301,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) {
-@@ -406,7 +406,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -403,7 +403,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);
-@@ -566,7 +566,7 @@ bool NativeWindowViews::IsVisible() {
+@@ -563,7 +563,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();
-@@ -624,7 +624,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable
+@@ -621,7 +621,7 @@ void NativeWindowViews::SetEnabledInternal(bool enable
  #endif
  }
 
@@ -54,7 +54,7 @@
  void NativeWindowViews::Maximize() {
    if (IsVisible()) {
      widget()->Maximize();
-@@ -751,7 +751,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
+@@ -748,7 +748,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_) {
-@@ -987,7 +987,7 @@ bool NativeWindowViews::IsClosable() {
+@@ -984,7 +984,7 @@ bool NativeWindowViews::IsClosable() {
      return false;
    }
    return !(info.fState & MFS_DISABLED);
@@ -72,7 +72,7 @@
    return true;
  #endif
  }
-@@ -1375,7 +1375,7 @@ void NativeWindowViews::SetProgressBar(double progress
+@@ -1372,7 +1372,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);
    }
-@@ -1452,7 +1452,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
+@@ -1449,7 +1449,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 =
-@@ -1550,7 +1550,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
+@@ -1547,7 +1547,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());
-@@ -1620,7 +1620,7 @@ bool NativeWindowViews::CanMaximize() const {
+@@ -1617,7 +1617,7 @@ bool NativeWindowViews::CanMaximize() const {
  bool NativeWindowViews::CanMinimize() const {
  #if BUILDFLAG(IS_WIN)
    return minimizable_;
@@ -108,7 +108,7 @@
    return true;
  #endif
  }
-@@ -1672,7 +1672,7 @@ void NativeWindowViews::HandleKeyboardEvent(
+@@ -1669,7 +1669,7 @@ void NativeWindowViews::HandleKeyboardEvent(
    if (widget_destroyed_)
      return;
 
@@ -117,9 +117,9 @@
    if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
      NotifyWindowExecuteAppCommand(kBrowserBackward);
    else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
-@@ -1691,7 +1691,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
+@@ -1688,7 +1688,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
    // Alt+Click should not toggle menu bar.
-   root_view_->ResetAltState();
+   root_view_.ResetAltState();
 
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)

diff --git a/devel/electron25/files/patch-electron_shell_browser_native__window__views.h b/devel/electron25/files/patch-electron_shell_browser_native__window__views.h
@@ -1,6 +1,6 @@
---- electron/shell/browser/native_window_views.h.orig	2023-05-22 19:19:22 UTC
+--- electron/shell/browser/native_window_views.h.orig	2023-06-07 10:09:25 UTC
 +++ electron/shell/browser/native_window_views.h
-@@ -169,7 +169,7 @@ class NativeWindowViews : public NativeWindow,
+@@ -166,7 +166,7 @@ class NativeWindowViews : public NativeWindow,
                      LPARAM l_param,
                      LRESULT* result);
    void SetIcon(HICON small_icon, HICON app_icon);

diff --git a/devel/electron25/files/patch-electron_shell_common_node__bindings.cc b/devel/electron25/files/patch-electron_shell_common_node__bindings.cc
@@ -1,6 +1,6 @@
---- electron/shell/common/node_bindings.cc.orig	2023-05-31 14:28:29 UTC
+--- electron/shell/common/node_bindings.cc.orig	2023-06-07 10:09:25 UTC
 +++ electron/shell/common/node_bindings.cc
-@@ -40,7 +40,7 @@
+@@ -39,7 +39,7 @@
  #include "third_party/blink/renderer/bindings/core/v8/v8_initializer.h"  // nogncheck
  #include "third_party/electron_node/src/debug_utils.h"
 
@@ -9,7 +9,7 @@
  #include "shell/common/crash_keys.h"
  #endif
 
-@@ -157,7 +157,7 @@ bool g_is_initialized = false;
+@@ -156,7 +156,7 @@ bool g_is_initialized = false;
  void V8FatalErrorCallback(const char* location, const char* message) {
    LOG(ERROR) << "Fatal error in V8: " << location << " " << message;
 
@@ -18,7 +18,7 @@
    electron::crash_keys::SetCrashKey("electron.v8-fatal.message", message);
    electron::crash_keys::SetCrashKey("electron.v8-fatal.location", location);
  #endif
-@@ -435,7 +435,7 @@ void NodeBindings::Initialize(v8::Local<v8::Context> c
+@@ -431,7 +431,7 @@ void NodeBindings::Initialize(v8::Local<v8::Context> c
    TRACE_EVENT0("electron", "NodeBindings::Initialize");
    // Open node's error reporting system for browser process.