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

1 files changed, 17 insertions, 1 deletions

diff --git a/devel/electron37/files/patch-electron_spec_api-tray-spec.ts b/devel/electron37/files/patch-electron_spec_api-tray-spec.ts
index cb822fdca402..a2cc8bcf183b 100644
--- a/devel/electron37/files/patch-electron_spec_api-tray-spec.ts
+++ b/devel/electron37/files/patch-electron_spec_api-tray-spec.ts
@@ -1,5 +1,21 @@
---- electron/spec/api-tray-spec.ts.orig	2024-10-09 13:53:06 UTC
+--- electron/spec/api-tray-spec.ts.orig	2025-08-25 07:57:03 UTC
 +++ electron/spec/api-tray-spec.ts
+@@ -30,13 +30,13 @@ describe('tray module', () => {
+       }).to.throw(/Failed to load image from path (.+)/);
+     });
+ 
+-    ifit(process.platform !== 'linux')('throws a descriptive error if an invalid guid is given', () => {
++    ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('throws a descriptive error if an invalid guid is given', () => {
+       expect(() => {
+         tray = new Tray(nativeImage.createEmpty(), 'I am not a guid');
+       }).to.throw('Invalid GUID format');
+     });
+ 
+-    ifit(process.platform !== 'linux')('accepts a valid guid', () => {
++    ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('accepts a valid guid', () => {
+       expect(() => {
+         tray = new Tray(nativeImage.createEmpty(), '0019A433-3526-48BA-A66C-676742C0FEFB');
+       }).to.not.throw();
 @@ -131,7 +131,7 @@ describe('tray module', () => {
    describe('tray.getBounds()', () => {
      afterEach(() => { tray.destroy(); });