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-subframe-spec.ts b/devel/electron39/files/patch-electron_spec_api-subframe-spec.ts
new file mode 100644
index 000000000000..2515084ec01b
--- /dev/null
+++ b/devel/electron39/files/patch-electron_spec_api-subframe-spec.ts
@@ -0,0 +1,11 @@
+--- electron/spec/api-subframe-spec.ts.orig	2025-09-02 20:56:04 UTC
++++ electron/spec/api-subframe-spec.ts
+@@ -247,7 +247,7 @@ describe('subframe with non-standard schemes', () => {
+ });
+ 
+ // app.getAppMetrics() does not return sandbox information on Linux.
+-ifdescribe(process.platform !== 'linux')('cross-site frame sandboxing', () => {
++ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('cross-site frame sandboxing', () => {
+   let server: http.Server;
+   let crossSiteUrl: string;
+   let serverUrl: string;