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

1 files changed, 29 insertions, 0 deletions

diff --git a/devel/electron38/files/patch-electron_spec_api-clipboard-spec.ts b/devel/electron38/files/patch-electron_spec_api-clipboard-spec.ts
new file mode 100644
index 000000000000..bc01dbc688ca
--- /dev/null
+++ b/devel/electron38/files/patch-electron_spec_api-clipboard-spec.ts
@@ -0,0 +1,29 @@
+--- electron/spec/api-clipboard-spec.ts.orig	2024-10-09 13:53:06 UTC
++++ electron/spec/api-clipboard-spec.ts
+@@ -54,7 +54,7 @@ ifdescribe(process.platform !== 'win32' || process.arc
+     });
+   });
+ 
+-  ifdescribe(process.platform !== 'linux')('clipboard.readBookmark', () => {
++  ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('clipboard.readBookmark', () => {
+     it('returns title and url', () => {
+       clipboard.writeBookmark('a title', 'https://electronjs.org');
+ 
+@@ -73,7 +73,7 @@ ifdescribe(process.platform !== 'win32' || process.arc
+   });
+ 
+   describe('clipboard.read()', () => {
+-    ifit(process.platform !== 'linux')('does not crash when reading various custom clipboard types', () => {
++    ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('does not crash when reading various custom clipboard types', () => {
+       const type = process.platform === 'darwin' ? 'NSFilenamesPboardType' : 'FileNameW';
+ 
+       expect(() => {
+@@ -114,7 +114,7 @@ ifdescribe(process.platform !== 'win32' || process.arc
+       const readImage = clipboard.readImage();
+       expect(readImage.toDataURL()).to.equal(i.toDataURL());
+ 
+-      if (process.platform !== 'linux') {
++      if (process.platform !== 'linux' && process.platform !== 'freebsd') {
+         if (process.platform !== 'win32') {
+           expect(clipboard.readBookmark()).to.deep.equal(bookmark);
+         } else {