git: 62f8db7809d2 - main - devel/electron35: update to 35.2.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Hiroki Tagato <tagattie_at_FreeBSD.org>
Date: Fri, 25 Apr 2025 10:09:35 UTC
The branch main has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=62f8db7809d2fcd3f7b9582772b8a696623674d6

commit 62f8db7809d2fcd3f7b9582772b8a696623674d6
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2025-04-25 10:07:51 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2025-04-25 10:09:29 +0000

    devel/electron35: update to 35.2.0
    
    Changelog:
    - https://github.com/electron/electron/releases/tag/v35.1.5
    - https://github.com/electron/electron/releases/tag/v35.2.0
    
    Reported by:    GitHub (watch releases)
---
 devel/electron35/Makefile                          | 16 ++++++++++---
 devel/electron35/Makefile.version                  |  2 +-
 devel/electron35/distinfo                          | 18 +++++++++------
 .../electron35/files/patch-build_rust_std_BUILD.gn | 21 +++++++++++++----
 ...hell_browser_api_electron__api__base__window.cc |  8 +++----
 ...shell_browser_api_electron__api__base__window.h |  4 ++--
 ...ell_browser_api_electron__api__web__contents.cc | 14 ++++++------
 .../patch-electron_shell_browser_native__window.cc |  4 ++--
 ...electron_shell_browser_native__window__views.cc | 26 +++++++++++-----------
 ...n_shell_common_gin__converters_std__converter.h |  8 +++----
 .../patch-electron_spec_api-browser-window-spec.ts |  8 +++----
 .../files/patch-media_base_video__frame.cc         |  6 ++---
 .../files/patch-media_base_video__frame.h          |  8 +++----
 13 files changed, 85 insertions(+), 58 deletions(-)

diff --git a/devel/electron35/Makefile b/devel/electron35/Makefile
index 9ce4d3166448..9f74b17be003 100644
--- a/devel/electron35/Makefile
+++ b/devel/electron35/Makefile
@@ -4,13 +4,17 @@ DISTVERSION=	${ELECTRON_VER}
 PULSEMV=	16
 PULSEV=		${PULSEMV}.1
 CATEGORIES=	devel
-MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/:chromium \
+MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v35.2.0/:chromium \
 		https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
 PKGNAMESUFFIX=	${ELECTRON_VER_MAJOR}
-DISTFILES=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
+DISTFILES=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.0:chromium \
+		chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.1:chromium \
+		chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.2:chromium \
 		pulseaudio-${PULSEV}.tar.gz:pulseaudio \
 		electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
 DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX} \
+		${DISTFILES:C/:[^:]+$//:C/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}\.[0-9]//}
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Build cross-platform desktop apps with JavaScript, HTML, and CSS
@@ -217,7 +221,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=			134.0.6998.179
+CHROMIUM_VER=			134.0.6998.205
 # See ${WRKSRC}/electron/DEPS for NODE_VER
 NODE_VER=			22.14.0
 # See ${WRKSRC}/electron/DEPS for NAN_VER
@@ -317,6 +321,12 @@ pre-fetch:
 		${RM} -r ${WRKDIR}; \
 	fi
 
+post-fetch:
+	@if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX} ]; then \
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}.? > \
+			${DISTDIR}/${DIST_SUBDIR}/chromium-${CHROMIUM_VER}${EXTRACT_SUFX}; \
+	fi
+
 post-extract:
 # Move extracted sources to appropriate locations
 	${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC}
diff --git a/devel/electron35/Makefile.version b/devel/electron35/Makefile.version
index 4e659e74a378..172301d50fd5 100644
--- a/devel/electron35/Makefile.version
+++ b/devel/electron35/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	35.1.4
+ELECTRON_VER=	35.2.0
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron35/distinfo b/devel/electron35/distinfo
index 7db8fec53e94..b97aa4842192 100644
--- a/devel/electron35/distinfo
+++ b/devel/electron35/distinfo
@@ -1,12 +1,16 @@
-TIMESTAMP = 1743802172
-SHA256 (electron/chromium-134.0.6998.179.tar.xz) = 7272f665a6d47ac49a5b5a204bd416bbc457621f7927a00e528102b267ecfd87
-SIZE (electron/chromium-134.0.6998.179.tar.xz) = 7052771524
+TIMESTAMP = 1745354879
+SHA256 (electron/chromium-134.0.6998.205.tar.xz.0) = 2de727120892e92fa40fed6c76104ed66dace4fe66ae3be0e055c51b913009e8
+SIZE (electron/chromium-134.0.6998.205.tar.xz.0) = 2000000000
+SHA256 (electron/chromium-134.0.6998.205.tar.xz.1) = 58024b9e01977a769576b4c2b3056c9d894a2c13b4f0729f0b8060b3984243c9
+SIZE (electron/chromium-134.0.6998.205.tar.xz.1) = 2000000000
+SHA256 (electron/chromium-134.0.6998.205.tar.xz.2) = 9631efe75d07b1f36799506e59b8d49e478d71535188b95aca088f9d6fa49b84
+SIZE (electron/chromium-134.0.6998.205.tar.xz.2) = 171552128
 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (electron/electron-yarn-cache-35.1.4.tar.xz) = 74a26f89b93b0b1756c6ff7e961b278235f109dab500a252c60f4d4a82637e7f
-SIZE (electron/electron-yarn-cache-35.1.4.tar.xz) = 29892244
-SHA256 (electron/electron-electron-v35.1.4_GH0.tar.gz) = 01c30c8b18cc68bfe034a1035540fdf3aac51c03d838c5eb83f97f66082778f7
-SIZE (electron/electron-electron-v35.1.4_GH0.tar.gz) = 14729856
+SHA256 (electron/electron-yarn-cache-35.2.0.tar.xz) = 74a26f89b93b0b1756c6ff7e961b278235f109dab500a252c60f4d4a82637e7f
+SIZE (electron/electron-yarn-cache-35.2.0.tar.xz) = 29892244
+SHA256 (electron/electron-electron-v35.2.0_GH0.tar.gz) = ee0b10d90feb84df469cffb17cf3f21d904b35ebf03ee77e5e91d4fc61d1ab60
+SIZE (electron/electron-electron-v35.2.0_GH0.tar.gz) = 14741351
 SHA256 (electron/nodejs-node-v22.14.0_GH0.tar.gz) = ca1a2b5c0c7bc8343ccf1b4b6347a3cab093ed7ac642397189a15098105809c3
 SIZE (electron/nodejs-node-v22.14.0_GH0.tar.gz) = 121559746
 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb
diff --git a/devel/electron35/files/patch-build_rust_std_BUILD.gn b/devel/electron35/files/patch-build_rust_std_BUILD.gn
index 3901becdb4ce..0a5335d58d48 100644
--- a/devel/electron35/files/patch-build_rust_std_BUILD.gn
+++ b/devel/electron35/files/patch-build_rust_std_BUILD.gn
@@ -1,15 +1,28 @@
---- build/rust/std/BUILD.gn.orig	2025-03-24 20:50:14 UTC
+--- build/rust/std/BUILD.gn.orig	2025-04-05 13:54:50 UTC
 +++ build/rust/std/BUILD.gn
-@@ -89,7 +89,7 @@ if (toolchain_has_rust) {
+@@ -89,13 +89,20 @@ if (toolchain_has_rust) {
      # These are no longer present in the Windows toolchain.
      stdlib_files += [
        "addr2line",
 -      "adler2",
-+      "adler",
        "gimli",
        "libc",
        "memchr",
-@@ -115,7 +115,6 @@ if (toolchain_has_rust) {
+       "miniz_oxide",
+       "object",
+     ]
++
++    rust_revision_pieces = string_split(rustc_revision, " ")
++    rust_version_pieces = string_split(rust_revision_pieces[1], ".")
++    if (rust_version_pieces[1] == "85") {
++      stdlib_files += [ "adler" ]
++    } else {
++      stdlib_files += [ "adler2" ]
++    }
+   }
+ 
+   if (toolchain_for_rust_host_build_tools) {
+@@ -115,7 +122,6 @@ if (toolchain_has_rust) {
    # don't need to pass to the C++ linker because they're used for specialized
    # purposes.
    skip_stdlib_files = [
diff --git a/devel/electron35/files/patch-electron_shell_browser_api_electron__api__base__window.cc b/devel/electron35/files/patch-electron_shell_browser_api_electron__api__base__window.cc
index 7d4c58c815bc..ff576883918c 100644
--- a/devel/electron35/files/patch-electron_shell_browser_api_electron__api__base__window.cc
+++ b/devel/electron35/files/patch-electron_shell_browser_api_electron__api__base__window.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/api/electron_api_base_window.cc.orig	2025-04-04 05:26:44 UTC
+--- electron/shell/browser/api/electron_api_base_window.cc.orig	2025-04-17 14:56:35 UTC
 +++ electron/shell/browser/api/electron_api_base_window.cc
 @@ -41,7 +41,7 @@
  #include "shell/browser/ui/views/win_frame_view.h"
@@ -9,7 +9,7 @@
  #include "shell/browser/ui/views/opaque_frame_view.h"
  #endif
  
-@@ -1036,7 +1036,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate,
+@@ -1024,7 +1024,7 @@ void BaseWindow::SetIconImpl(v8::Isolate* isolate,
    static_cast<NativeWindowViews*>(window_.get())
        ->SetIcon(native_image->GetHICON(GetSystemMetrics(SM_CXSMICON)),
                  native_image->GetHICON(GetSystemMetrics(SM_CXICON)));
@@ -18,7 +18,7 @@
    static_cast<NativeWindowViews*>(window_.get())
        ->SetIcon(native_image->image().AsImageSkia());
  #endif
-@@ -1093,7 +1093,7 @@ void BaseWindow::SetAppDetails(const gin_helper::Dicti
+@@ -1081,7 +1081,7 @@ void BaseWindow::SetAppDetails(const gin_helper::Dicti
  }
  #endif
  
@@ -27,7 +27,7 @@
  void BaseWindow::SetTitleBarOverlay(const gin_helper::Dictionary& options,
                                      gin_helper::Arguments* args) {
    // Ensure WCO is already enabled on this window
-@@ -1344,7 +1344,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate,
+@@ -1332,7 +1332,7 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate,
        .SetMethod("setThumbnailToolTip", &BaseWindow::SetThumbnailToolTip)
        .SetMethod("setAppDetails", &BaseWindow::SetAppDetails)
  #endif
diff --git a/devel/electron35/files/patch-electron_shell_browser_api_electron__api__base__window.h b/devel/electron35/files/patch-electron_shell_browser_api_electron__api__base__window.h
index b883d0f5f6ce..fbe86a2c4d56 100644
--- a/devel/electron35/files/patch-electron_shell_browser_api_electron__api__base__window.h
+++ b/devel/electron35/files/patch-electron_shell_browser_api_electron__api__base__window.h
@@ -1,6 +1,6 @@
---- electron/shell/browser/api/electron_api_base_window.h.orig	2025-04-04 05:26:44 UTC
+--- electron/shell/browser/api/electron_api_base_window.h.orig	2025-04-17 14:56:35 UTC
 +++ electron/shell/browser/api/electron_api_base_window.h
-@@ -254,7 +254,7 @@ class BaseWindow : public gin_helper::TrackableObject<
+@@ -255,7 +255,7 @@ class BaseWindow : public gin_helper::TrackableObject<
    void SetAppDetails(const gin_helper::Dictionary& options);
  #endif
  
diff --git a/devel/electron35/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron35/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
index e44b33f44e74..b67763f0b52d 100644
--- a/devel/electron35/files/patch-electron_shell_browser_api_electron__api__web__contents.cc
+++ b/devel/electron35/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	2025-04-04 05:26:44 UTC
+--- electron/shell/browser/api/electron_api_web_contents.cc.orig	2025-04-17 14:56:35 UTC
 +++ electron/shell/browser/api/electron_api_web_contents.cc
-@@ -158,11 +158,11 @@
+@@ -159,11 +159,11 @@
  #include "ui/base/cocoa/defaults_utils.h"
  #endif
  
@@ -14,7 +14,7 @@
  #include "ui/aura/window.h"
  #include "ui/gfx/font_render_params.h"
  #endif
-@@ -194,7 +194,7 @@
+@@ -195,7 +195,7 @@
  #include "content/public/browser/plugin_service.h"
  #endif
  
@@ -23,7 +23,7 @@
  #include "chrome/browser/hang_monitor/hang_crash_dump.h"  // nogncheck
  #endif
  
-@@ -568,7 +568,7 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval(
+@@ -569,7 +569,7 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval(
        ui::TextInsertionCaretBlinkPeriodFromDefaults());
    if (system_value)
      return *system_value;
@@ -32,7 +32,7 @@
    if (auto* linux_ui = ui::LinuxUi::instance())
      return linux_ui->GetCursorBlinkInterval();
  #elif BUILDFLAG(IS_WIN)
-@@ -929,7 +929,7 @@ void WebContents::InitWithSessionAndOptions(
+@@ -930,7 +930,7 @@ void WebContents::InitWithSessionAndOptions(
    accept_languages.pop_back();
    prefs->accept_languages = accept_languages;
  
@@ -57,7 +57,7 @@
      CrashDumpHungChildProcess(rph->GetProcess().Handle());
  #endif
      rph->Shutdown(content::RESULT_CODE_HUNG);
-@@ -3438,7 +3438,7 @@ void WebContents::Focus() {
+@@ -3448,7 +3448,7 @@ void WebContents::Focus() {
  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.
@@ -66,7 +66,7 @@
    if (owner_window())
      owner_window()->Focus(true);
  #endif
-@@ -4301,7 +4301,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
+@@ -4311,7 +4311,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
  }
  #endif
  
diff --git a/devel/electron35/files/patch-electron_shell_browser_native__window.cc b/devel/electron35/files/patch-electron_shell_browser_native__window.cc
index 66a8ee60e246..d55f8462f6b1 100644
--- a/devel/electron35/files/patch-electron_shell_browser_native__window.cc
+++ b/devel/electron35/files/patch-electron_shell_browser_native__window.cc
@@ -1,6 +1,6 @@
---- electron/shell/browser/native_window.cc.orig	2025-04-04 05:26:44 UTC
+--- electron/shell/browser/native_window.cc.orig	2025-04-17 14:56:35 UTC
 +++ electron/shell/browser/native_window.cc
-@@ -200,7 +200,7 @@ void NativeWindow::InitFromOptions(const gin_helper::D
+@@ -198,7 +198,7 @@ void NativeWindow::InitFromOptions(const gin_helper::D
    } else {
      SetSizeConstraints(size_constraints);
    }
diff --git a/devel/electron35/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron35/files/patch-electron_shell_browser_native__window__views.cc
index 6f6ed503f3ae..2d17cb915ce4 100644
--- a/devel/electron35/files/patch-electron_shell_browser_native__window__views.cc
+++ b/devel/electron35/files/patch-electron_shell_browser_native__window__views.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/native_window_views.cc.orig	2025-04-04 05:26:44 UTC
+--- electron/shell/browser/native_window_views.cc.orig	2025-04-17 14:56:35 UTC
 +++ electron/shell/browser/native_window_views.cc
 @@ -50,7 +50,7 @@
  #include "ui/wm/core/shadow_types.h"
@@ -81,7 +81,7 @@
    if (IsX11())
      return !event_disabler_.get();
    NOTIMPLEMENTED();
-@@ -834,7 +834,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
+@@ -831,7 +831,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
    }
  #endif
  
@@ -90,7 +90,7 @@
    // On Linux and Windows the minimum and maximum size should be updated with
    // window size when window is not resizable.
    if (!resizable_) {
-@@ -1092,7 +1092,7 @@ bool NativeWindowViews::IsClosable() const {
+@@ -1089,7 +1089,7 @@ bool NativeWindowViews::IsClosable() const {
      return false;
    }
    return !(info.fState & MFS_DISABLED);
@@ -99,7 +99,7 @@
    return true;
  #endif
  }
-@@ -1132,7 +1132,7 @@ void NativeWindowViews::Center() {
+@@ -1129,7 +1129,7 @@ void NativeWindowViews::Center() {
  // for now to avoid breaking API contract, but should consider the long
  // term plan for this aligning with upstream.
  void NativeWindowViews::Center() {
@@ -108,7 +108,7 @@
    auto display =
        display::Screen::GetScreen()->GetDisplayNearestWindow(GetNativeWindow());
    gfx::Rect window_bounds_in_screen = display.work_area();
-@@ -1355,7 +1355,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men
+@@ -1352,7 +1352,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men
  }
  
  void NativeWindowViews::SetMenu(ElectronMenuModel* menu_model) {
@@ -117,7 +117,7 @@
    // Remove global menu bar.
    if (global_menu_bar_ && menu_model == nullptr) {
      global_menu_bar_.reset();
-@@ -1410,7 +1410,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* 
+@@ -1407,7 +1407,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* 
  void NativeWindowViews::SetParentWindow(NativeWindow* parent) {
    NativeWindow::SetParentWindow(parent);
  
@@ -126,7 +126,7 @@
    if (IsX11()) {
      auto* connection = x11::Connection::Get();
      connection->SetProperty(
-@@ -1456,7 +1456,7 @@ void NativeWindowViews::SetProgressBar(double progress
+@@ -1453,7 +1453,7 @@ void NativeWindowViews::SetProgressBar(double progress
                                         NativeWindow::ProgressState state) {
  #if BUILDFLAG(IS_WIN)
    taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state);
@@ -135,7 +135,7 @@
    if (unity::IsRunning()) {
      unity::SetProgressFraction(progress);
    }
-@@ -1527,7 +1527,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con
+@@ -1524,7 +1524,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con
  }
  
  bool NativeWindowViews::IsVisibleOnAllWorkspaces() const {
@@ -144,7 +144,7 @@
    if (IsX11()) {
      // Use the presence/absence of _NET_WM_STATE_STICKY in _NET_WM_STATE to
      // determine whether the current window is visible on all workspaces.
-@@ -1550,7 +1550,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
+@@ -1547,7 +1547,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
  #if BUILDFLAG(IS_WIN)
    window_handle =
        reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);
@@ -153,7 +153,7 @@
    window_handle = static_cast<uint32_t>(accelerated_widget);
  #endif
    aura::WindowTreeHost* const host =
-@@ -1648,7 +1648,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
+@@ -1645,7 +1645,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
    SendMessage(hwnd, WM_SETICON, ICON_BIG,
                reinterpret_cast<LPARAM>(app_icon_.get()));
  }
@@ -162,7 +162,7 @@
  void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
    auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(
        GetAcceleratedWidget());
-@@ -1744,7 +1744,7 @@ bool NativeWindowViews::CanMinimize() const {
+@@ -1741,7 +1741,7 @@ bool NativeWindowViews::CanMinimize() const {
  bool NativeWindowViews::CanMinimize() const {
  #if BUILDFLAG(IS_WIN)
    return minimizable_;
@@ -171,7 +171,7 @@
    return true;
  #endif
  }
-@@ -1800,7 +1800,7 @@ void NativeWindowViews::HandleKeyboardEvent(
+@@ -1797,7 +1797,7 @@ void NativeWindowViews::HandleKeyboardEvent(
    if (widget_destroyed_)
      return;
  
@@ -180,7 +180,7 @@
    if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
      NotifyWindowExecuteAppCommand(kBrowserBackward);
    else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
-@@ -1819,7 +1819,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
+@@ -1816,7 +1816,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
    // Alt+Click should not toggle menu bar.
    root_view_.ResetAltState();
  
diff --git a/devel/electron35/files/patch-electron_shell_common_gin__converters_std__converter.h b/devel/electron35/files/patch-electron_shell_common_gin__converters_std__converter.h
index 8fb16f713e95..fe32c3d95de3 100644
--- a/devel/electron35/files/patch-electron_shell_common_gin__converters_std__converter.h
+++ b/devel/electron35/files/patch-electron_shell_common_gin__converters_std__converter.h
@@ -1,8 +1,8 @@
---- electron/shell/common/gin_converters/std_converter.h.orig	2023-08-14 18:19:06 UTC
+--- electron/shell/common/gin_converters/std_converter.h.orig	2025-04-17 14:56:35 UTC
 +++ electron/shell/common/gin_converters/std_converter.h
-@@ -28,7 +28,7 @@ v8::Local<v8::Value> ConvertToV8(v8::Isolate* isolate,
-       isolate, std::forward<T>(input));
- }
+@@ -57,7 +57,7 @@ struct Converter<std::array<T, N>> {
+   }
+ };
  
 -#if !BUILDFLAG(IS_LINUX)
 +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
diff --git a/devel/electron35/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron35/files/patch-electron_spec_api-browser-window-spec.ts
index c8ded7ef72bb..7747ff6553cc 100644
--- a/devel/electron35/files/patch-electron_spec_api-browser-window-spec.ts
+++ b/devel/electron35/files/patch-electron_spec_api-browser-window-spec.ts
@@ -1,4 +1,4 @@
---- electron/spec/api-browser-window-spec.ts.orig	2025-03-10 00:01:50 UTC
+--- electron/spec/api-browser-window-spec.ts.orig	2025-04-17 14:56:35 UTC
 +++ electron/spec/api-browser-window-spec.ts
 @@ -69,7 +69,7 @@ describe('BrowserWindow module', () => {
        }).not.to.throw();
@@ -153,7 +153,7 @@
        const w = new BrowserWindow();
        const minimize = once(w, 'minimize');
        w.minimize();
-@@ -5257,7 +5257,7 @@ describe('BrowserWindow module', () => {
+@@ -5269,7 +5269,7 @@ describe('BrowserWindow module', () => {
        });
  
        // On Linux there is no "resizable" property of a window.
@@ -162,7 +162,7 @@
          const w = new BrowserWindow({ show: false });
          expect(w.resizable).to.be.true('resizable');
  
-@@ -5396,7 +5396,7 @@ describe('BrowserWindow module', () => {
+@@ -5408,7 +5408,7 @@ describe('BrowserWindow module', () => {
      });
    });
  
@@ -171,7 +171,7 @@
      // Not implemented on Linux.
      afterEach(closeAllWindows);
  
-@@ -6641,7 +6641,7 @@ describe('BrowserWindow module', () => {
+@@ -6678,7 +6678,7 @@ describe('BrowserWindow module', () => {
    describe('"transparent" option', () => {
      afterEach(closeAllWindows);
  
diff --git a/devel/electron35/files/patch-media_base_video__frame.cc b/devel/electron35/files/patch-media_base_video__frame.cc
index dff9e9e053c5..3a5623f8a36c 100644
--- a/devel/electron35/files/patch-media_base_video__frame.cc
+++ b/devel/electron35/files/patch-media_base_video__frame.cc
@@ -1,4 +1,4 @@
---- media/base/video_frame.cc.orig	2025-03-24 20:50:14 UTC
+--- media/base/video_frame.cc.orig	2025-04-14 21:12:04 UTC
 +++ media/base/video_frame.cc
 @@ -92,7 +92,7 @@ std::string VideoFrame::StorageTypeToString(
        return "OWNED_MEMORY";
@@ -27,7 +27,7 @@
    bool is_native_buffer =
        gpu_memory_buffer
            ? (gpu_memory_buffer->GetType() != gfx::SHARED_MEMORY_BUFFER)
-@@ -913,7 +913,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
+@@ -938,7 +938,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
    return frame;
  }
  
@@ -36,7 +36,7 @@
  // static
  scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
      const VideoFrameLayout& layout,
-@@ -1598,7 +1598,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar
+@@ -1623,7 +1623,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar
    return wrapped_frame_ ? wrapped_frame_->shared_image() : shared_image_;
  }
  
diff --git a/devel/electron35/files/patch-media_base_video__frame.h b/devel/electron35/files/patch-media_base_video__frame.h
index 7ff62c77abc5..7183ebb890a3 100644
--- a/devel/electron35/files/patch-media_base_video__frame.h
+++ b/devel/electron35/files/patch-media_base_video__frame.h
@@ -1,4 +1,4 @@
---- media/base/video_frame.h.orig	2025-03-24 20:50:14 UTC
+--- media/base/video_frame.h.orig	2025-04-14 21:12:04 UTC
 +++ media/base/video_frame.h
 @@ -42,7 +42,7 @@
  #include "ui/gfx/geometry/size.h"
@@ -18,7 +18,7 @@
      STORAGE_DMABUFS = 5,  // Each plane is stored into a DmaBuf.
  #endif
      STORAGE_GPU_MEMORY_BUFFER = 6,
-@@ -424,7 +424,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -435,7 +435,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
        ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb,
        base::TimeDelta timestamp);
  
@@ -27,7 +27,7 @@
    // Wraps provided dmabufs
    // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a
    // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will
-@@ -734,7 +734,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -745,7 +745,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
    // wait for the included sync point.
    scoped_refptr<gpu::ClientSharedImage> shared_image() const;
  
@@ -36,7 +36,7 @@
    // The number of DmaBufs will be equal or less than the number of planes of
    // the frame. If there are less, this means that the last FD contains the
    // remaining planes. Should be > 0 for STORAGE_DMABUFS.
-@@ -963,7 +963,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -974,7 +974,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
    // GpuMemoryBuffers. Clients will set this flag while creating a VideoFrame.
    bool is_mappable_si_enabled_ = false;