Skip to content

Commit

Permalink
devel/electron25: update to 25.6.0
Browse files Browse the repository at this point in the history
Changelog: https://github.com/electron/electron/releases/tag/v25.6.0

Reported by:	GitHub (watch releases)
  • Loading branch information
tagattie committed Aug 19, 2023
1 parent 479f93d commit c0621e2
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion devel/electron25/Makefile
Expand Up @@ -223,7 +223,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
# See ${WRKSRC}/electron/DEPS for MANTLE_VER
MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948

YARN_TIMESTAMP= 1691826400
YARN_TIMESTAMP= 1692355328

.include "Makefile.version"
.include <bsd.port.pre.mk>
Expand Down
2 changes: 1 addition & 1 deletion devel/electron25/Makefile.version
@@ -1,2 +1,2 @@
ELECTRON_VER= 25.5.0
ELECTRON_VER= 25.6.0
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
10 changes: 5 additions & 5 deletions devel/electron25/distinfo
@@ -1,14 +1,14 @@
TIMESTAMP = 1691826692
TIMESTAMP = 1692355964
SHA256 (electron/chromium-114.0.5735.289.tar.xz) = 12dee4e585dab6e7dc2117f4ee40484a947ac7a6b5a33c87dfae7cbf8b8799b0
SIZE (electron/chromium-114.0.5735.289.tar.xz) = 1413670648
SHA256 (electron/de0af8ec3401004cd1a420ab25892880330464c8) = 401097f07b4feb3e03ce7c2412e978b32aea5334f4fbaf26f873e60e8bb92647
SIZE (electron/de0af8ec3401004cd1a420ab25892880330464c8) = 8880520
SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
SHA256 (electron/electron-yarn-cache-25.5.0.tar.xz) = 43881af099a4ca816a3a631de053d83562ba486b5eefebbfc24ce1272b5d99c4
SIZE (electron/electron-yarn-cache-25.5.0.tar.xz) = 41288764
SHA256 (electron/electron-electron-v25.5.0_GH0.tar.gz) = db5c9fa62c9bf817e8cd5324580f3b6fa3ef492712979ef168ab4b4485650d3f
SIZE (electron/electron-electron-v25.5.0_GH0.tar.gz) = 11282712
SHA256 (electron/electron-yarn-cache-25.6.0.tar.xz) = a6b161415d95605b3511b6fcc6906eb1cfb9efe7f115c6ddfda7702763f72e82
SIZE (electron/electron-yarn-cache-25.6.0.tar.xz) = 41288764
SHA256 (electron/electron-electron-v25.6.0_GH0.tar.gz) = cc1a9bacef4b397ef408333ef51632327e6a092c1887df45e3a5dcb6843a072e
SIZE (electron/electron-electron-v25.6.0_GH0.tar.gz) = 11283151
SHA256 (electron/nodejs-node-v18.15.0_GH0.tar.gz) = 33c4b5b77c98398a3c0d99a146f602d164e014ff3a5713697beef1a971faf573
SIZE (electron/nodejs-node-v18.15.0_GH0.tar.gz) = 111925667
SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39
Expand Down
10 changes: 5 additions & 5 deletions devel/electron25/files/patch-electron_shell_app_node__main.cc
@@ -1,4 +1,4 @@
--- electron/shell/app/node_main.cc.orig 2023-06-14 06:17:49 UTC
--- electron/shell/app/node_main.cc.orig 2023-08-16 14:00:49 UTC
+++ electron/shell/app/node_main.cc
@@ -42,7 +42,7 @@
#include "content/public/common/content_descriptors.h"
Expand All @@ -9,16 +9,16 @@
#include "components/crash/core/app/crashpad.h" // nogncheck
#include "shell/app/electron_crash_reporter_client.h"
#include "shell/common/crash_keys.h"
@@ -98,7 +98,7 @@ int SetNodeCliFlags() {
node::kDisallowedInEnvironment);
@@ -76,7 +76,7 @@ void ExitIfContainsDisallowedFlags(const std::vector<s
}
}

-#if IS_MAS_BUILD()
+#if IS_MAS_BUILD() || BUILDFLAG(IS_BSD)
void SetCrashKeyStub(const std::string& key, const std::string& value) {}
void ClearCrashKeyStub(const std::string& key) {}
#endif
@@ -109,7 +109,7 @@ namespace electron {
@@ -87,7 +87,7 @@ namespace electron {

v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) {
std::map<std::string, std::string> keys;
Expand All @@ -27,7 +27,7 @@
electron::crash_keys::GetCrashKeys(&keys);
#endif
return gin::ConvertToV8(isolate, keys);
@@ -243,7 +243,7 @@ int NodeMain(int argc, char* argv[]) {
@@ -223,7 +223,7 @@ int NodeMain(int argc, char* argv[]) {
// Setup process.crashReporter in child node processes
gin_helper::Dictionary reporter = gin::Dictionary::CreateEmpty(isolate);
reporter.SetMethod("getParameters", &GetParameters);
Expand Down
@@ -1,6 +1,6 @@
--- electron/shell/browser/api/electron_api_web_contents.h.orig 2023-08-02 12:53:47 UTC
--- electron/shell/browser/api/electron_api_web_contents.h.orig 2023-08-16 14:00:49 UTC
+++ electron/shell/browser/api/electron_api_web_contents.h
@@ -732,7 +732,7 @@ class WebContents : public ExclusiveAccessContext,
@@ -733,7 +733,7 @@ class WebContents : public ExclusiveAccessContext,
#if defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_MAC)
ui::ImageModel GetDevToolsWindowIcon() override;
#endif
Expand Down
@@ -1,4 +1,4 @@
--- electron/shell/common/node_bindings.cc.orig 2023-06-14 06:17:49 UTC
--- electron/shell/common/node_bindings.cc.orig 2023-08-16 14:00:49 UTC
+++ electron/shell/common/node_bindings.cc
@@ -38,7 +38,7 @@
#include "third_party/blink/renderer/bindings/core/v8/v8_initializer.h" // nogncheck
Expand All @@ -18,7 +18,7 @@
electron::crash_keys::SetCrashKey("electron.v8-fatal.message", message);
electron::crash_keys::SetCrashKey("electron.v8-fatal.location", location);
#endif
@@ -433,7 +433,7 @@ void NodeBindings::Initialize(v8::Local<v8::Context> c
@@ -432,7 +432,7 @@ void NodeBindings::Initialize(v8::Local<v8::Context> c
TRACE_EVENT0("electron", "NodeBindings::Initialize");
// Open node's error reporting system for browser process.

Expand Down
@@ -1,4 +1,4 @@
--- electron/spec/api-browser-window-spec.ts.orig 2023-08-02 12:53:47 UTC
--- electron/spec/api-browser-window-spec.ts.orig 2023-08-16 14:00:49 UTC
+++ electron/spec/api-browser-window-spec.ts
@@ -65,7 +65,7 @@ describe('BrowserWindow module', () => {
}).not.to.throw();
Expand Down Expand Up @@ -45,7 +45,7 @@
const w1 = new BrowserWindow({ show: false });
const w2 = new BrowserWindow({ show: false });
const w3 = new BrowserWindow({ show: false });
@@ -1622,7 +1622,7 @@ describe('BrowserWindow module', () => {
@@ -1633,7 +1633,7 @@ describe('BrowserWindow module', () => {
});
});

Expand All @@ -54,7 +54,7 @@
it('checks normal bounds when maximized', async () => {
const bounds = w.getBounds();
const maximize = once(w, 'maximize');
@@ -1802,7 +1802,7 @@ describe('BrowserWindow module', () => {
@@ -1813,7 +1813,7 @@ describe('BrowserWindow module', () => {
});
});

Expand All @@ -63,7 +63,7 @@
it('checks normal bounds when minimized', async () => {
const bounds = w.getBounds();
const minimize = once(w, 'minimize');
@@ -2768,7 +2768,7 @@ describe('BrowserWindow module', () => {
@@ -2779,7 +2779,7 @@ describe('BrowserWindow module', () => {
describe('BrowserWindow.setOpacity(opacity)', () => {
afterEach(closeAllWindows);

Expand All @@ -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);
@@ -2794,7 +2794,7 @@ describe('BrowserWindow module', () => {
@@ -2805,7 +2805,7 @@ describe('BrowserWindow module', () => {
});
});

Expand All @@ -81,7 +81,7 @@
it('sets 1 regardless of parameter', () => {
const w = new BrowserWindow({ show: false });
w.setOpacity(0);
@@ -3723,7 +3723,7 @@ describe('BrowserWindow module', () => {
@@ -3734,7 +3734,7 @@ describe('BrowserWindow module', () => {
expect(test.nodeTimers).to.equal(true);
expect(test.nodeUrl).to.equal(true);

Expand All @@ -90,7 +90,7 @@
expect(test.creationTime).to.be.null('creation time');
expect(test.systemMemoryInfo).to.be.null('system memory info');
} else {
@@ -4228,7 +4228,7 @@ describe('BrowserWindow module', () => {
@@ -4239,7 +4239,7 @@ describe('BrowserWindow module', () => {
});
});

Expand All @@ -99,7 +99,7 @@
afterEach(closeAllWindows);
it('emits an event when window is maximized', async () => {
const w = new BrowserWindow({ show: false });
@@ -4499,7 +4499,7 @@ describe('BrowserWindow module', () => {
@@ -4510,7 +4510,7 @@ describe('BrowserWindow module', () => {
// TODO(zcbenz):
// This test does not run on Linux CI. See:
// https://github.com/electron/electron/issues/28699
Expand All @@ -108,7 +108,7 @@
const w = new BrowserWindow({});
const maximize = once(w, 'maximize');
w.maximize();
@@ -4516,7 +4516,7 @@ describe('BrowserWindow module', () => {
@@ -4527,7 +4527,7 @@ describe('BrowserWindow module', () => {
});

// TODO(dsanders11): Enable once maximize event works on Linux again on CI
Expand All @@ -117,7 +117,7 @@
afterEach(closeAllWindows);
it('should show the window if it is not currently shown', async () => {
const w = new BrowserWindow({ show: false });
@@ -4553,7 +4553,7 @@ describe('BrowserWindow module', () => {
@@ -4564,7 +4564,7 @@ describe('BrowserWindow module', () => {

// TODO(dsanders11): Enable once minimize event works on Linux again.
// See https://github.com/electron/electron/issues/28699
Expand All @@ -126,7 +126,7 @@
const w = new BrowserWindow();
const minimize = once(w, 'minimize');
w.minimize();
@@ -5007,7 +5007,7 @@ describe('BrowserWindow module', () => {
@@ -5018,7 +5018,7 @@ describe('BrowserWindow module', () => {
});

// On Linux there is no "resizable" property of a window.
Expand All @@ -135,7 +135,7 @@
const w = new BrowserWindow({ show: false });
expect(w.resizable).to.be.true('resizable');

@@ -5097,7 +5097,7 @@ describe('BrowserWindow module', () => {
@@ -5108,7 +5108,7 @@ describe('BrowserWindow module', () => {
});
});

Expand All @@ -144,7 +144,7 @@
// Not implemented on Linux.
afterEach(closeAllWindows);

@@ -6203,7 +6203,7 @@ describe('BrowserWindow module', () => {
@@ -6214,7 +6214,7 @@ describe('BrowserWindow module', () => {
describe('"transparent" option', () => {
afterEach(closeAllWindows);

Expand Down

0 comments on commit c0621e2

Please sign in to comment.