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

1 files changed, 23 insertions, 0 deletions

diff --git a/devel/electron39/files/patch-electron_spec_api-shell-spec.ts b/devel/electron39/files/patch-electron_spec_api-shell-spec.ts
new file mode 100644
index 000000000000..24ea3fed330e
--- /dev/null
+++ b/devel/electron39/files/patch-electron_spec_api-shell-spec.ts
@@ -0,0 +1,23 @@
+--- electron/spec/api-shell-spec.ts.orig	2025-01-22 18:19:12 UTC
++++ electron/spec/api-shell-spec.ts
+@@ -37,7 +37,7 @@ describe('shell module', () => {
+ 
+     afterEach(async () => {
+       // reset env vars to prevent side effects
+-      if (process.platform === 'linux') {
++      if (process.platform === 'linux' || process.platform === 'freebsd') {
+         process.env.DE = envVars.de;
+         process.env.BROWSER = envVars.browser;
+         process.env.DISPLAY = envVars.display;
+@@ -54,6 +54,11 @@ describe('shell module', () => {
+       let requestReceived: Promise<any>;
+       if (process.platform === 'linux') {
+         process.env.BROWSER = '/bin/true';
++        process.env.DE = 'generic';
++        process.env.DISPLAY = '';
++        requestReceived = Promise.resolve();
++      } else if (process.platform === 'freebsd') {
++        process.env.BROWSER = '/usr/bin/true';
+         process.env.DE = 'generic';
+         process.env.DISPLAY = '';
+         requestReceived = Promise.resolve();