diff --git a/devel/electron26/Makefile b/devel/electron26/Makefile index 32baa073e50c4..f52e399e718cb 100644 --- a/devel/electron26/Makefile +++ b/devel/electron26/Makefile @@ -232,7 +232,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 # See ${WRKSRC}/electron/DEPS for MANTLE_VER MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948 -YARN_TIMESTAMP= 1700868402 +YARN_TIMESTAMP= 1701647833 .include "Makefile.version" .include diff --git a/devel/electron26/Makefile.version b/devel/electron26/Makefile.version index 55940be3ea668..eb8b80d74779e 100644 --- a/devel/electron26/Makefile.version +++ b/devel/electron26/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 26.6.1 +ELECTRON_VER= 26.6.2 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron26/distinfo b/devel/electron26/distinfo index 6efbca3cd6ed7..68bd4e82110de 100644 --- a/devel/electron26/distinfo +++ b/devel/electron26/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1700879207 +TIMESTAMP = 1701648280 SHA256 (electron/chromium-116.0.5845.228.tar.xz) = ccf3d7f2e17fd2fcda6ebaef576787b2aaba7a6b2b4e3103b92260ac26fbc6a1 SIZE (electron/chromium-116.0.5845.228.tar.xz) = 1447024772 SHA256 (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = f7f7f38661b107fc1d91b7918f36362d9180e87f34e3027562eb5db8735746fe SIZE (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = 8881070 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-26.6.1.tar.xz) = 539ad3aaadff9863913145c2efbffaae0503bd3522f6e4da709c4a3d599c134d -SIZE (electron/electron-yarn-cache-26.6.1.tar.xz) = 32344588 -SHA256 (electron/electron-electron-v26.6.1_GH0.tar.gz) = 54a834e21bba0788f6f25d0da4985f4c514411d4d67f7593de4a9d6bea311802 -SIZE (electron/electron-electron-v26.6.1_GH0.tar.gz) = 11356259 +SHA256 (electron/electron-yarn-cache-26.6.2.tar.xz) = b946fabd97781784de15856c0aa17244a1cafc3592548e42f703bebe7554a926 +SIZE (electron/electron-yarn-cache-26.6.2.tar.xz) = 32345748 +SHA256 (electron/electron-electron-v26.6.2_GH0.tar.gz) = cd59178a36a2d5b5f21fb7b80cee36138faf65691cb2824a3d9b5b60aa7e87e9 +SIZE (electron/electron-electron-v26.6.2_GH0.tar.gz) = 11362189 SHA256 (electron/nodejs-node-v18.16.1_GH0.tar.gz) = 750b09907a0b7054bda042bfc26879b9ccb84f9f436182a820ea188b654ce77b SIZE (electron/nodejs-node-v18.16.1_GH0.tar.gz) = 112039326 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 diff --git a/devel/electron26/files/patch-electron_shell_common_node__bindings.cc b/devel/electron26/files/patch-electron_shell_common_node__bindings.cc index 4b38d3e4bb23c..e81caeb84891b 100644 --- a/devel/electron26/files/patch-electron_shell_common_node__bindings.cc +++ b/devel/electron26/files/patch-electron_shell_common_node__bindings.cc @@ -1,4 +1,4 @@ ---- electron/shell/common/node_bindings.cc.orig 2023-08-23 13:54:54 UTC +--- electron/shell/common/node_bindings.cc.orig 2023-11-30 14:07:51 UTC +++ electron/shell/common/node_bindings.cc @@ -37,7 +37,7 @@ #include "third_party/blink/renderer/bindings/core/v8/v8_initializer.h" // nogncheck @@ -9,7 +9,7 @@ #include "shell/common/crash_keys.h" #endif -@@ -149,7 +149,7 @@ bool g_is_initialized = false; +@@ -149,7 +149,7 @@ void V8FatalErrorCallback(const char* location, const void V8FatalErrorCallback(const char* location, const char* message) { LOG(ERROR) << "Fatal error in V8: " << location << " " << message; @@ -18,7 +18,7 @@ electron::crash_keys::SetCrashKey("electron.v8-fatal.message", message); electron::crash_keys::SetCrashKey("electron.v8-fatal.location", location); #endif -@@ -427,7 +427,7 @@ void NodeBindings::Initialize(v8::Local c +@@ -430,7 +430,7 @@ void NodeBindings::Initialize(v8::Local c TRACE_EVENT0("electron", "NodeBindings::Initialize"); // Open node's error reporting system for browser process. diff --git a/devel/electron26/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron26/files/patch-electron_spec_api-browser-window-spec.ts index fa9cccf7c0f22..22d518bbba38d 100644 --- a/devel/electron26/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron26/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2023-11-22 15:26:59 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2023-11-30 14:07:51 UTC +++ electron/spec/api-browser-window-spec.ts @@ -65,7 +65,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); @@ -27,7 +27,7 @@ const maximize = once(w, 'maximize'); const shown = once(w, 'show'); w.maximize(); -@@ -1154,7 +1154,7 @@ describe('BrowserWindow module', () => { +@@ -1182,7 +1182,7 @@ describe('BrowserWindow module', () => { expect(w.isFocused()).to.equal(true); }); @@ -36,7 +36,7 @@ const w1 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false }); const w3 = new BrowserWindow({ show: false }); -@@ -1221,7 +1221,7 @@ describe('BrowserWindow module', () => { +@@ -1249,7 +1249,7 @@ describe('BrowserWindow module', () => { expect(w.isFocused()).to.equal(false); }); @@ -45,7 +45,7 @@ const w1 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false }); const w3 = new BrowserWindow({ show: false }); -@@ -1632,7 +1632,7 @@ describe('BrowserWindow module', () => { +@@ -1660,7 +1660,7 @@ describe('BrowserWindow module', () => { }); }); @@ -54,7 +54,7 @@ it('checks normal bounds when maximized', async () => { const bounds = w.getBounds(); const maximize = once(w, 'maximize'); -@@ -1812,7 +1812,7 @@ describe('BrowserWindow module', () => { +@@ -1840,7 +1840,7 @@ describe('BrowserWindow module', () => { }); }); @@ -63,7 +63,7 @@ it('checks normal bounds when minimized', async () => { const bounds = w.getBounds(); const minimize = once(w, 'minimize'); -@@ -2791,7 +2791,7 @@ describe('BrowserWindow module', () => { +@@ -2819,7 +2819,7 @@ describe('BrowserWindow module', () => { describe('BrowserWindow.setOpacity(opacity)', () => { afterEach(closeAllWindows); @@ -72,7 +72,7 @@ it('make window with initial opacity', () => { const w = new BrowserWindow({ show: false, opacity: 0.5 }); expect(w.getOpacity()).to.equal(0.5); -@@ -2817,7 +2817,7 @@ describe('BrowserWindow module', () => { +@@ -2845,7 +2845,7 @@ describe('BrowserWindow module', () => { }); }); @@ -81,7 +81,7 @@ it('sets 1 regardless of parameter', () => { const w = new BrowserWindow({ show: false }); w.setOpacity(0); -@@ -3746,7 +3746,7 @@ describe('BrowserWindow module', () => { +@@ -3774,7 +3774,7 @@ describe('BrowserWindow module', () => { expect(test.nodeTimers).to.equal(true); expect(test.nodeUrl).to.equal(true); @@ -90,7 +90,7 @@ expect(test.creationTime).to.be.null('creation time'); expect(test.systemMemoryInfo).to.be.null('system memory info'); } else { -@@ -4251,7 +4251,7 @@ describe('BrowserWindow module', () => { +@@ -4279,7 +4279,7 @@ describe('BrowserWindow module', () => { }); }); @@ -99,7 +99,7 @@ afterEach(closeAllWindows); it('emits an event when window is maximized', async () => { const w = new BrowserWindow({ show: false }); -@@ -4522,7 +4522,7 @@ describe('BrowserWindow module', () => { +@@ -4550,7 +4550,7 @@ describe('BrowserWindow module', () => { // TODO(zcbenz): // This test does not run on Linux CI. See: // https://github.com/electron/electron/issues/28699 @@ -108,7 +108,7 @@ const w = new BrowserWindow({}); const maximize = once(w, 'maximize'); w.maximize(); -@@ -4539,7 +4539,7 @@ describe('BrowserWindow module', () => { +@@ -4567,7 +4567,7 @@ describe('BrowserWindow module', () => { }); // TODO(dsanders11): Enable once maximize event works on Linux again on CI @@ -117,7 +117,7 @@ afterEach(closeAllWindows); it('should show the window if it is not currently shown', async () => { const w = new BrowserWindow({ show: false }); -@@ -4576,7 +4576,7 @@ describe('BrowserWindow module', () => { +@@ -4604,7 +4604,7 @@ describe('BrowserWindow module', () => { // TODO(dsanders11): Enable once minimize event works on Linux again. // See https://github.com/electron/electron/issues/28699 @@ -126,7 +126,7 @@ const w = new BrowserWindow(); const minimize = once(w, 'minimize'); w.minimize(); -@@ -5050,7 +5050,7 @@ describe('BrowserWindow module', () => { +@@ -5078,7 +5078,7 @@ describe('BrowserWindow module', () => { }); // On Linux there is no "resizable" property of a window. @@ -135,7 +135,7 @@ const w = new BrowserWindow({ show: false }); expect(w.resizable).to.be.true('resizable'); -@@ -5189,7 +5189,7 @@ describe('BrowserWindow module', () => { +@@ -5217,7 +5217,7 @@ describe('BrowserWindow module', () => { }); }); @@ -144,7 +144,7 @@ // Not implemented on Linux. afterEach(closeAllWindows); -@@ -6343,7 +6343,7 @@ describe('BrowserWindow module', () => { +@@ -6371,7 +6371,7 @@ describe('BrowserWindow module', () => { describe('"transparent" option', () => { afterEach(closeAllWindows);