Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 11 insertions, 0 deletions

diff --git a/devel/electron39/files/patch-electron_spec_api-web-frame-main-spec.ts b/devel/electron39/files/patch-electron_spec_api-web-frame-main-spec.ts
new file mode 100644
index 000000000000..c84d05a2515e
--- /dev/null
+++ b/devel/electron39/files/patch-electron_spec_api-web-frame-main-spec.ts
@@ -0,0 +1,11 @@
+--- electron/spec/api-web-frame-main-spec.ts.orig	2025-09-02 20:56:04 UTC
++++ electron/spec/api-web-frame-main-spec.ts
+@@ -317,7 +317,7 @@ describe('webFrameMain module', () => {
+     afterEach(closeAllWindows);
+ 
+     // TODO(jkleinsc) fix this flaky test on linux
+-    ifit(process.platform !== 'linux')('throws upon accessing properties when disposed', async () => {
++    ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('throws upon accessing properties when disposed', async () => {
+       await w.loadFile(path.join(subframesPath, 'frame-with-frame-container.html'));
+       const { mainFrame } = w.webContents;
+       w.destroy();