devel/electron33: update to 33.2.0

tagattie · tagattie · commit ba80878f63db · 2024-11-12T20:35:12.000+09:00
Changelog: - https://github.com/electron/electron/releases/tag/v33.1.0 - https://github.com/electron/electron/releases/tag/v33.2.0
diff --git a/devel/electron33/Makefile b/devel/electron33/Makefile
@@ -216,7 +216,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=			130.0.6723.59
+CHROMIUM_VER=			130.0.6723.118
 # See ${WRKSRC}/electron/DEPS for NODE_VER
 NODE_VER=			20.18.0
 # See ${WRKSRC}/electron/DEPS for NAN_VER
diff --git a/devel/electron33/Makefile.version b/devel/electron33/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	33.0.2
+ELECTRON_VER=	33.2.0
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron33/distinfo b/devel/electron33/distinfo
@@ -1,12 +1,12 @@
-TIMESTAMP = 1730016477
-SHA256 (electron/chromium-130.0.6723.59.tar.xz) = 90401be8adcd6f580db5c71ea865c97db0e719ba41f406f5869fc7f44bd20e4f
-SIZE (electron/chromium-130.0.6723.59.tar.xz) = 6612784668
+TIMESTAMP = 1731316814
+SHA256 (electron/chromium-130.0.6723.118.tar.xz) = a0a9a740ebb864e89febf4d5480ffbf31b45ac5a506ae70184fa842e27b2d177
+SIZE (electron/chromium-130.0.6723.118.tar.xz) = 6627498992
 SHA256 (electron/pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
 SIZE (electron/pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (electron/electron-yarn-cache-33.0.2.tar.xz) = cff464312e04611a70e541fd0a94568547b818832250640913967b51bbb8b6da
-SIZE (electron/electron-yarn-cache-33.0.2.tar.xz) = 32242880
-SHA256 (electron/electron-electron-v33.0.2_GH0.tar.gz) = c6d3be16998ee1f92020078e39dd5c7ea98a1222d2f68919b533ef7f507521fa
-SIZE (electron/electron-electron-v33.0.2_GH0.tar.gz) = 13896685
+SHA256 (electron/electron-yarn-cache-33.2.0.tar.xz) = fbfce89a9781eba6a8dc2582fcc979f2cb4adbd95c42a09f595c7dfa45a47fdf
+SIZE (electron/electron-yarn-cache-33.2.0.tar.xz) = 32181868
+SHA256 (electron/electron-electron-v33.2.0_GH0.tar.gz) = 6a0589bbdbf1d5ccc8508b536c1beeb5f49cedb1806dc0de9b04f568946be056
+SIZE (electron/electron-electron-v33.2.0_GH0.tar.gz) = 14663878
 SHA256 (electron/nodejs-node-v20.18.0_GH0.tar.gz) = 651bb82f6af18084070893559643759165ce050b5839f830d4cc098130d3ad89
 SIZE (electron/nodejs-node-v20.18.0_GH0.tar.gz) = 115526827
 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb
diff --git a/devel/electron33/files/package.json b/devel/electron33/files/package.json
@@ -40,7 +40,6 @@
     "folder-hash": "^2.1.1",
     "got": "^11.8.5",
     "husky": "^8.0.1",
-    "lint": "^1.1.2",
     "lint-staged": "^10.2.11",
     "markdownlint-cli2": "^0.13.0",
     "minimist": "^1.2.8",
diff --git a/devel/electron33/files/patch-.gn b/devel/electron33/files/patch-.gn
@@ -0,0 +1,11 @@
+--- .gn.orig	2024-11-11 11:08:19 UTC
++++ .gn
+@@ -173,6 +173,8 @@ exec_script_whitelist =
+       "//tools/grit/grit_rule.gni",
+       "//tools/gritsettings/BUILD.gn",
+ 
++      "//third_party/icu/BUILD.gn",
++
+       "//electron/BUILD.gn",
+       "//third_party/electron_node/deps/base64/BUILD.gn",
+       "//third_party/electron_node/deps/base64/unofficial.gni",
diff --git a/devel/electron33/files/patch-build_linux_unbundle_icu.gn b/devel/electron33/files/patch-build_linux_unbundle_icu.gn
@@ -1,4 +1,4 @@
---- build/linux/unbundle/icu.gn.orig	2023-04-04 21:42:43 UTC
+--- build/linux/unbundle/icu.gn.orig	2024-11-09 21:36:20 UTC
 +++ build/linux/unbundle/icu.gn
 @@ -17,6 +17,15 @@ config("icu_config") {
      "USING_SYSTEM_ICU=1",
@@ -16,3 +16,22 @@
      # U_EXPORT (defined in unicode/platform.h) is used to set public visibility
      # on classes through the U_COMMON_API and U_I18N_API macros (among others).
      # When linking against the system ICU library, we want its symbols to have
+@@ -35,6 +44,18 @@ config("icu_config") {
+     # please see: https://crbug.com/822820
+     "U_IMPORT=U_EXPORT",
+   ]
++
++  _icu_version = exec_script(pkg_config_script,
++                              common_pkg_config_args + pkg_config_args + [
++                                    "icu-i18n",
++                                    "--version-as-components",
++                                  ],
++                              "value")
++
++  # Unbreak with icu 76 where private symbols are picked up
++  if (_icu_version[0] >= 76) {
++    defines += [ "U_HIDE_DRAFT_API" ]
++  }
+ }
+ 
+ pkg_config("system_icui18n") {
diff --git a/devel/electron33/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc b/devel/electron33/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig	2024-10-16 21:30:58 UTC
+--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig	2024-11-09 21:36:35 UTC
 +++ chrome/browser/extensions/api/tabs/tabs_api.cc
-@@ -871,7 +871,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
+@@ -886,7 +886,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
  // minimized.
  // TODO(crbug.com/40254339): Remove this workaround when linux is fixed.
  // TODO(crbug.com/40254339): Find a fix for wayland as well.
diff --git a/devel/electron33/files/patch-chrome_browser_sessions_session__restore.cc b/devel/electron33/files/patch-chrome_browser_sessions_session__restore.cc
@@ -1,4 +1,4 @@
---- chrome/browser/sessions/session_restore.cc.orig	2024-10-16 21:31:00 UTC
+--- chrome/browser/sessions/session_restore.cc.orig	2024-11-09 21:36:37 UTC
 +++ chrome/browser/sessions/session_restore.cc
 @@ -103,7 +103,7 @@
  #include "chrome/browser/web_applications/web_app_registrar.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
-@@ -1076,7 +1076,7 @@ class SessionRestoreImpl : public BrowserListObserver 
+@@ -1081,7 +1081,7 @@ class SessionRestoreImpl : public BrowserListObserver 
      bool is_first_tab = true;
      for (const auto& startup_tab : startup_tabs) {
        const GURL& url = startup_tab.url;
diff --git a/devel/electron33/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc b/devel/electron33/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc
@@ -1,15 +1,15 @@
---- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig	2024-10-16 21:31:01 UTC
+--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig	2024-11-09 21:36:37 UTC
 +++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc
-@@ -29,7 +29,7 @@
- 
- #if BUILDFLAG(IS_ANDROID)
+@@ -31,7 +31,7 @@
  #include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+ #include "ui/android/view_android.h"
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h"
  #include "chrome/browser/supervised_user/supervised_user_verification_page.h"
  #endif
-@@ -145,7 +145,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc
+@@ -147,7 +147,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc
      return content::NavigationThrottle::DEFER;
    }
  
diff --git a/devel/electron33/files/patch-chrome_browser_ui_ui__features.cc b/devel/electron33/files/patch-chrome_browser_ui_ui__features.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/ui_features.cc.orig	2024-10-16 21:31:02 UTC
+--- chrome/browser/ui/ui_features.cc.orig	2024-11-09 21:36:38 UTC
 +++ chrome/browser/ui/ui_features.cc
 @@ -103,7 +103,7 @@ BASE_FEATURE(kAccessCodeCastUI,
               base::FEATURE_ENABLED_BY_DEFAULT);
@@ -9,7 +9,7 @@
  // Enables the feature to remove the last confirmation dialog when relaunching
  // to update Chrome.
  BASE_FEATURE(kFewerUpdateConfirmations,
-@@ -395,7 +395,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
+@@ -402,7 +402,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
               "TopChromeWebUIUsesSpareRenderer",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -18,7 +18,7 @@
  // Enables alternate update-related text to be displayed in browser app menu
  // button, menu item and confirmation dialog.
  BASE_FEATURE(kUpdateTextOptions,
-@@ -467,7 +467,7 @@ BASE_FEATURE(kStopLoadingAnimationForHiddenWindow,
+@@ -474,7 +474,7 @@ BASE_FEATURE(kStopLoadingAnimationForHiddenWindow,
               "StopLoadingAnimationForHiddenWindow",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
diff --git a/devel/electron33/files/patch-chrome_browser_ui_ui__features.h b/devel/electron33/files/patch-chrome_browser_ui_ui__features.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/ui_features.h.orig	2024-10-16 21:31:02 UTC
+--- chrome/browser/ui/ui_features.h.orig	2024-11-09 21:36:38 UTC
 +++ chrome/browser/ui/ui_features.h
 @@ -78,7 +78,7 @@ BASE_DECLARE_FEATURE(kAccessCodeCastUI);
  BASE_DECLARE_FEATURE(kAccessCodeCastUI);
@@ -9,7 +9,7 @@
  BASE_DECLARE_FEATURE(kFewerUpdateConfirmations);
  #endif
  
-@@ -258,7 +258,7 @@ BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer)
+@@ -266,7 +266,7 @@ BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer)
  
  BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer);
  
@@ -18,7 +18,7 @@
  BASE_DECLARE_FEATURE(kUpdateTextOptions);
  extern const base::FeatureParam<int> kUpdateTextOptionNumber;
  #endif
-@@ -283,7 +283,7 @@ BASE_DECLARE_FEATURE(kStopLoadingAnimationForHiddenWin
+@@ -291,7 +291,7 @@ BASE_DECLARE_FEATURE(kStopLoadingAnimationForHiddenWin
  
  BASE_DECLARE_FEATURE(kStopLoadingAnimationForHiddenWindow);
  
diff --git a/devel/electron33/files/patch-components_media__router_common_providers_cast_channel_enum__table.h b/devel/electron33/files/patch-components_media__router_common_providers_cast_channel_enum__table.h
@@ -1,16 +1,15 @@
---- components/media_router/common/providers/cast/channel/enum_table.h.orig	2024-10-16 21:31:11 UTC
+--- components/media_router/common/providers/cast/channel/enum_table.h.orig	2024-11-09 21:36:44 UTC
 +++ components/media_router/common/providers/cast/channel/enum_table.h
 @@ -368,7 +368,12 @@ class EnumTable {
  
   private:
  #ifdef ARCH_CPU_64_BITS
--  alignas(std::hardware_destructive_interference_size)
 +#ifdef __cpp_lib_hardware_interference_size
-+  using std::hardware_destructive_interference_size;
+   alignas(std::hardware_destructive_interference_size)
 +#else
 +  static constexpr std::size_t hardware_destructive_interference_size = 64;
-+#endif
 +  alignas(hardware_destructive_interference_size)
++#endif
  #endif
        std::initializer_list<Entry> data_;
    bool is_sorted_;
diff --git a/devel/electron33/files/patch-electron_filenames.gni b/devel/electron33/files/patch-electron_filenames.gni
@@ -1,6 +1,6 @@
---- electron/filenames.gni.orig	2024-08-12 10:09:34 UTC
+--- electron/filenames.gni.orig	2024-11-07 16:14:43 UTC
 +++ electron/filenames.gni
-@@ -243,8 +243,8 @@ filenames = {
+@@ -245,8 +245,8 @@ filenames = {
      "shell/app/command_line_args.h",
      "shell/app/electron_content_client.cc",
      "shell/app/electron_content_client.h",
diff --git a/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.cc b/devel/electron33/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	2024-10-22 02:29:46 UTC
+--- electron/shell/browser/api/electron_api_web_contents.cc.orig	2024-11-07 16:14:43 UTC
 +++ electron/shell/browser/api/electron_api_web_contents.cc
-@@ -152,11 +152,11 @@
+@@ -153,11 +153,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
-@@ -187,7 +187,7 @@
+@@ -188,7 +188,7 @@
  #include "content/public/browser/plugin_service.h"
  #endif
  
@@ -23,7 +23,7 @@
  #include "chrome/browser/hang_monitor/hang_crash_dump.h"  // nogncheck
  #endif
  
-@@ -512,7 +512,7 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval(
+@@ -513,7 +513,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)
-@@ -878,7 +878,7 @@ void WebContents::InitWithSessionAndOptions(
+@@ -893,7 +893,7 @@ void WebContents::InitWithSessionAndOptions(
    accept_languages.pop_back();
    prefs->accept_languages = accept_languages;
  
@@ -41,7 +41,7 @@
    // Update font settings.
    static const gfx::FontRenderParams params(
        gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
-@@ -2637,13 +2637,13 @@ void WebContents::ForcefullyCrashRenderer() {
+@@ -2657,13 +2657,13 @@ void WebContents::ForcefullyCrashRenderer() {
  
    content::RenderProcessHost* rph = rwh->GetProcess();
    if (rph) {
@@ -57,7 +57,7 @@
      CrashDumpHungChildProcess(rph->GetProcess().Handle());
  #endif
      rph->Shutdown(content::RESULT_CODE_HUNG);
-@@ -3316,7 +3316,7 @@ void WebContents::Focus() {
+@@ -3336,7 +3336,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
-@@ -4177,7 +4177,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
+@@ -4212,7 +4212,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
  }
  #endif
  
diff --git a/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.h b/devel/electron33/files/patch-electron_shell_browser_api_electron__api__web__contents.h
@@ -1,6 +1,6 @@
---- electron/shell/browser/api/electron_api_web_contents.h.orig	2024-10-22 02:29:46 UTC
+--- electron/shell/browser/api/electron_api_web_contents.h.orig	2024-11-07 16:14:43 UTC
 +++ electron/shell/browser/api/electron_api_web_contents.h
-@@ -765,7 +765,7 @@ class WebContents final : public ExclusiveAccessContex
+@@ -768,7 +768,7 @@ class WebContents final : public ExclusiveAccessContex
  #if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC)
    ui::ImageModel GetDevToolsWindowIcon() override;
  #endif
diff --git a/devel/electron33/files/patch-electron_shell_browser_osr_osr__host__display__client.h b/devel/electron33/files/patch-electron_shell_browser_osr_osr__host__display__client.h
@@ -1,6 +1,6 @@
---- electron/shell/browser/osr/osr_host_display_client.h.orig	2024-10-22 02:29:46 UTC
+--- electron/shell/browser/osr/osr_host_display_client.h.orig	2024-11-07 16:14:43 UTC
 +++ electron/shell/browser/osr/osr_host_display_client.h
-@@ -73,7 +73,7 @@ class OffScreenHostDisplayClient : public viz::HostDis
+@@ -74,7 +74,7 @@ class OffScreenHostDisplayClient : public viz::HostDis
        mojo::PendingReceiver<viz::mojom::LayeredWindowUpdater> receiver)
        override;
  
diff --git a/devel/electron33/files/patch-electron_shell_browser_osr_osr__paint__event.h b/devel/electron33/files/patch-electron_shell_browser_osr_osr__paint__event.h
@@ -0,0 +1,11 @@
+--- electron/shell/browser/osr/osr_paint_event.h.orig	2024-11-11 11:23:02 UTC
++++ electron/shell/browser/osr/osr_paint_event.h
+@@ -96,7 +96,7 @@ struct OffscreenSharedTextureValue {
+   // On Windows it is a HANDLE to the shared D3D11 texture.
+   // On macOS it is a IOSurface* to the shared IOSurface.
+   uintptr_t shared_texture_handle;
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   std::vector<OffscreenNativePixmapPlaneInfo> planes;
+   uint64_t modifier;
+ #endif
diff --git a/devel/electron33/files/patch-electron_shell_browser_osr_osr__video__consumer.cc b/devel/electron33/files/patch-electron_shell_browser_osr_osr__video__consumer.cc
@@ -0,0 +1,11 @@
+--- electron/shell/browser/osr/osr_video_consumer.cc.orig	2024-11-11 11:24:27 UTC
++++ electron/shell/browser/osr/osr_video_consumer.cc
+@@ -103,7 +103,7 @@ void OffScreenVideoConsumer::OnFrameCaptured(
+ #elif BUILDFLAG(IS_APPLE)
+     texture.shared_texture_handle =
+         reinterpret_cast<uintptr_t>(gmb_handle.io_surface.get());
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     const auto& native_pixmap = gmb_handle.native_pixmap_handle;
+     texture.modifier = native_pixmap.modifier;
+     for (const auto& plane : native_pixmap.planes) {
diff --git a/devel/electron33/files/patch-electron_shell_common_gin__converters_osr__converter.cc b/devel/electron33/files/patch-electron_shell_common_gin__converters_osr__converter.cc
@@ -0,0 +1,11 @@
+--- electron/shell/common/gin_converters/osr_converter.cc.orig	2024-11-11 11:25:17 UTC
++++ electron/shell/common/gin_converters/osr_converter.cc
+@@ -118,7 +118,7 @@ v8::Local<v8::Value> Converter<electron::OffscreenShar
+           const_cast<uintptr_t*>(&val.shared_texture_handle)),
+       sizeof(val.shared_texture_handle));
+   dict.Set("sharedTextureHandle", handle_buf.ToLocalChecked());
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   auto v8_planes = base::ToVector(val.planes, [isolate](const auto& plane) {
+     gin::Dictionary v8_plane(isolate, v8::Object::New(isolate));
+     v8_plane.Set("stride", plane.stride);
diff --git a/devel/electron33/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron33/files/patch-electron_spec_api-browser-window-spec.ts
@@ -1,6 +1,6 @@
---- electron/spec/api-browser-window-spec.ts.orig	2024-10-22 02:29:46 UTC
+--- electron/spec/api-browser-window-spec.ts.orig	2024-11-07 16:14:43 UTC
 +++ electron/spec/api-browser-window-spec.ts
-@@ -68,7 +68,7 @@ describe('BrowserWindow module', () => {
+@@ -69,7 +69,7 @@ describe('BrowserWindow module', () => {
        }).not.to.throw();
      });
  
@@ -162,7 +162,7 @@
      // Not implemented on Linux.
      afterEach(closeAllWindows);
  
-@@ -6498,7 +6498,7 @@ describe('BrowserWindow module', () => {
+@@ -6546,7 +6546,7 @@ describe('BrowserWindow module', () => {
    describe('"transparent" option', () => {
      afterEach(closeAllWindows);
  
diff --git a/devel/electron33/files/patch-electron_spec_api-protocol-spec.ts b/devel/electron33/files/patch-electron_spec_api-protocol-spec.ts
@@ -1,11 +1,11 @@
---- electron/spec/api-protocol-spec.ts.orig	2024-10-09 13:53:06 UTC
+--- electron/spec/api-protocol-spec.ts.orig	2024-11-07 16:14:43 UTC
 +++ electron/spec/api-protocol-spec.ts
-@@ -1737,7 +1737,7 @@ describe('protocol module', () => {
-     });
+@@ -1738,7 +1738,7 @@ describe('protocol module', () => {
  
      // TODO(nornagon): this test doesn't pass on Linux currently, investigate.
--    ifit(process.platform !== 'linux')('is fast', async () => {
-+    ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('is fast', async () => {
+     // test is also flaky on CI on macOS so it is currently disabled there as well.
+-    ifit(process.platform !== 'linux' && (!process.env.CI || process.platform !== 'darwin'))('is fast', async () => {
++    ifit((process.platform !== 'linux' && process.platform !== 'freebsd') && (!process.env.CI || process.platform !== 'darwin'))('is fast', async () => {
        // 128 MB of spaces.
        const chunk = new Uint8Array(128 * 1024 * 1024);
        chunk.fill(' '.charCodeAt(0));
diff --git a/devel/electron33/files/patch-electron_spec_api-web-frame-main-spec.ts b/devel/electron33/files/patch-electron_spec_api-web-frame-main-spec.ts
@@ -1,6 +1,6 @@
---- electron/spec/api-web-frame-main-spec.ts.orig	2024-10-09 13:53:06 UTC
+--- electron/spec/api-web-frame-main-spec.ts.orig	2024-11-07 16:14:43 UTC
 +++ electron/spec/api-web-frame-main-spec.ts
-@@ -292,7 +292,7 @@ describe('webFrameMain module', () => {
+@@ -307,7 +307,7 @@ describe('webFrameMain module', () => {
      });
  
      // TODO(jkleinsc) fix this flaky test on linux
diff --git a/devel/electron33/files/patch-electron_spec_chromium-spec.ts b/devel/electron33/files/patch-electron_spec_chromium-spec.ts
@@ -1,4 +1,4 @@
---- electron/spec/chromium-spec.ts.orig	2024-10-22 17:22:08 UTC
+--- electron/spec/chromium-spec.ts.orig	2024-11-07 16:14:43 UTC
 +++ electron/spec/chromium-spec.ts
 @@ -474,13 +474,13 @@ describe('command line switches', () => {
      it('should not set an invalid locale', async () => testLocale('asdfkl', `${currentLocale}|${currentSystemLocale}|${currentPreferredLanguages}`));
@@ -27,7 +27,7 @@
        const rc = await startRemoteControlApp(['--trace-startup=*', `--trace-startup-file=${outputFilePath}`, '--trace-startup-duration=1', '--enable-logging']);
        const stderrComplete = new Promise<string>(resolve => {
          let stderr = '';
-@@ -2848,12 +2848,12 @@ describe('font fallback', () => {
+@@ -2885,12 +2885,12 @@ describe('font fallback', () => {
        expect(fonts[0].familyName).to.equal('Arial');
      } else if (process.platform === 'darwin') {
        expect(fonts[0].familyName).to.equal('Helvetica');
@@ -42,7 +42,7 @@
      const html = `
      <html lang="ja-JP">
        <head>
-@@ -3247,7 +3247,7 @@ describe('navigator.clipboard.write', () => {
+@@ -3286,7 +3286,7 @@ describe('navigator.clipboard.write', () => {
    });
  });
  
diff --git a/devel/electron33/files/patch-ui_base_accelerators_accelerator.cc b/devel/electron33/files/patch-ui_base_accelerators_accelerator.cc
diff --git a/devel/electron33/files/patch-ui_base_accelerators_accelerator__unittest.cc b/devel/electron33/files/patch-ui_base_accelerators_accelerator__unittest.cc
diff --git a/devel/electron33/files/patch-ui_strings_ui__strings.grd b/devel/electron33/files/patch-ui_strings_ui__strings.grd
diff --git a/devel/electron33/files/yarn.lock b/devel/electron33/files/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-ELECTRON_VER= 33.0.2`
	`1`	`+ELECTRON_VER= 33.2.0`
`2`	`2`	`ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}`