diff options
Diffstat (limited to 'devel/electron37/files')
7 files changed, 46 insertions, 26 deletions
diff --git a/devel/electron37/files/patch-build_config_rust.gni b/devel/electron37/files/patch-build_config_rust.gni index 89d904a80fe9..9d4c1b2ff8ed 100644 --- a/devel/electron37/files/patch-build_config_rust.gni +++ b/devel/electron37/files/patch-build_config_rust.gni @@ -1,6 +1,16 @@ ---- build/config/rust.gni.orig 2025-06-30 07:04:30 UTC +--- build/config/rust.gni.orig 2025-08-25 14:15:51 UTC +++ build/config/rust.gni -@@ -373,7 +373,11 @@ if (is_linux || is_chromeos) { +@@ -62,7 +62,8 @@ declare_args() { + # set this to the output of `rustc -V`. Changing this string will cause all + # Rust targets to be rebuilt, which allows you to update your toolchain and + # not break incremental builds. +- rustc_version = "" ++ rustc_version = exec_script("//build/gn_run_binary.py", ++ [ "${LOCALBASE}/bin/rustc", "-V" ], "trim string") + + # If you're using a Rust toolchain as specified by rust_sysroot_absolute, + # you can specify whether it supports nacl here. +@@ -373,7 +374,11 @@ if (is_linux || is_chromeos) { } } diff --git a/devel/electron37/files/patch-build_dotfile__settings.gni b/devel/electron37/files/patch-build_dotfile__settings.gni new file mode 100644 index 000000000000..db6058d93cd8 --- /dev/null +++ b/devel/electron37/files/patch-build_dotfile__settings.gni @@ -0,0 +1,10 @@ +--- build/dotfile_settings.gni.orig 2025-08-25 14:15:51 UTC ++++ build/dotfile_settings.gni +@@ -24,6 +24,7 @@ build_dotfile_settings = { + "//build/config/mac/mac_sdk.gni", + "//build/config/mac/rules.gni", + "//build/config/posix/BUILD.gn", ++ "//build/config/rust.gni", + "//build/config/win/BUILD.gn", + "//build/config/win/visual_studio_version.gni", + "//build/rust/analyze.gni", diff --git a/devel/electron37/files/patch-electron_shell_browser_api_electron__api__app.cc b/devel/electron37/files/patch-electron_shell_browser_api_electron__api__app.cc index 00fd8098ed1c..a3d88bfb8611 100644 --- a/devel/electron37/files/patch-electron_shell_browser_api_electron__api__app.cc +++ b/devel/electron37/files/patch-electron_shell_browser_api_electron__api__app.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/api/electron_api_app.cc.orig 2025-10-28 08:06:59 UTC +--- electron/shell/browser/api/electron_api_app.cc.orig 2025-11-13 23:04:07 UTC +++ electron/shell/browser/api/electron_api_app.cc @@ -96,7 +96,7 @@ #include "shell/common/process_util.h" @@ -45,7 +45,7 @@ // Read the xdg-activation token and set it in the command line for the // duration of the notification in order to ensure this is propagated to an // already running electron app instance if it exists. -@@ -1434,7 +1434,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics +@@ -1445,7 +1445,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics pid_dict.Set("name", process_metric.second->name); } @@ -54,7 +54,7 @@ auto memory_info = process_metric.second->GetMemoryInfo(); auto memory_dict = gin_helper::Dictionary::CreateEmpty(isolate); -@@ -1818,7 +1818,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild +@@ -1829,7 +1829,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild .SetMethod( "removeAsDefaultProtocolClient", base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser)) @@ -63,7 +63,7 @@ .SetMethod( "getApplicationInfoForProtocol", base::BindRepeating(&Browser::GetApplicationInfoForProtocol, browser)) -@@ -1876,7 +1876,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild +@@ -1887,7 +1887,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild .SetMethod("getJumpListSettings", &App::GetJumpListSettings) .SetMethod("setJumpList", &App::SetJumpList) #endif diff --git a/devel/electron37/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc b/devel/electron37/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc index abd8c6af7036..44cde47dddc3 100644 --- a/devel/electron37/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc +++ b/devel/electron37/files/patch-electron_shell_browser_ui_inspectable__web__contents.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/ui/inspectable_web_contents.cc.orig 2025-07-02 15:59:39 UTC +--- electron/shell/browser/ui/inspectable_web_contents.cc.orig 2025-11-13 23:04:07 UTC +++ electron/shell/browser/ui/inspectable_web_contents.cc -@@ -548,7 +548,7 @@ void InspectableWebContents::LoadCompleted() { +@@ -554,7 +554,7 @@ void InspectableWebContents::LoadCompleted() { prefs.FindString("currentDockState"); base::RemoveChars(*current_dock_state, "\"", &dock_state_); } diff --git a/devel/electron37/files/patch-electron_shell_browser_ui_inspectable__web__contents__view.cc b/devel/electron37/files/patch-electron_shell_browser_ui_inspectable__web__contents__view.cc index baf9532d11ad..359c4558dee4 100644 --- a/devel/electron37/files/patch-electron_shell_browser_ui_inspectable__web__contents__view.cc +++ b/devel/electron37/files/patch-electron_shell_browser_ui_inspectable__web__contents__view.cc @@ -1,6 +1,6 @@ ---- electron/shell/browser/ui/inspectable_web_contents_view.cc.orig 2025-07-02 10:12:01 UTC +--- electron/shell/browser/ui/inspectable_web_contents_view.cc.orig 2025-11-13 23:04:07 UTC +++ electron/shell/browser/ui/inspectable_web_contents_view.cc -@@ -180,7 +180,7 @@ void InspectableWebContentsView::SetIsDocked(bool dock +@@ -197,7 +197,7 @@ void InspectableWebContentsView::SetIsDocked(bool dock params.delegate = devtools_window_delegate_; params.bounds = inspectable_web_contents()->dev_tools_bounds(); diff --git a/devel/electron37/files/patch-electron_spec_api-app-spec.ts b/devel/electron37/files/patch-electron_spec_api-app-spec.ts index e1ed07cb198d..a647e942305c 100644 --- a/devel/electron37/files/patch-electron_spec_api-app-spec.ts +++ b/devel/electron37/files/patch-electron_spec_api-app-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-app-spec.ts.orig 2025-10-28 08:06:59 UTC +--- electron/spec/api-app-spec.ts.orig 2025-11-13 23:04:07 UTC +++ electron/spec/api-app-spec.ts @@ -129,11 +129,11 @@ describe('app module', () => { }); @@ -14,7 +14,7 @@ const languages = app.getPreferredSystemLanguages(); if (languages.length) { expect(languages).to.not.include('C'); -@@ -196,7 +196,7 @@ describe('app module', () => { +@@ -202,7 +202,7 @@ describe('app module', () => { expect(code).to.equal(123, 'exit code should be 123, if you see this please tag @MarshallOfSound'); }); @@ -23,7 +23,7 @@ const electronPath = process.execPath; const appPath = path.join(fixturesPath, 'api', 'singleton'); appProcess = cp.spawn(electronPath, [appPath]); -@@ -360,7 +360,7 @@ describe('app module', () => { +@@ -366,7 +366,7 @@ describe('app module', () => { }); // GitHub Actions macOS-13 runners used for x64 seem to have a problem with this test. @@ -32,7 +32,7 @@ const tempFiles = [ path.join(fixturesPath, 'foo.txt'), path.join(fixturesPath, 'bar.txt'), -@@ -488,7 +488,7 @@ describe('app module', () => { +@@ -494,7 +494,7 @@ describe('app module', () => { // let w = null // before(function () { @@ -41,7 +41,7 @@ // this.skip() // } // }) -@@ -595,7 +595,7 @@ describe('app module', () => { +@@ -601,7 +601,7 @@ describe('app module', () => { describe('app.badgeCount', () => { const platformIsNotSupported = (process.platform === 'win32') || @@ -50,7 +50,7 @@ const expectedBadgeCount = 42; -@@ -639,7 +639,7 @@ describe('app module', () => { +@@ -645,7 +645,7 @@ describe('app module', () => { }); }); @@ -59,7 +59,7 @@ const isMac = process.platform === 'darwin'; const isWin = process.platform === 'win32'; -@@ -1019,7 +1019,7 @@ describe('app module', () => { +@@ -1025,7 +1025,7 @@ describe('app module', () => { }); }); @@ -68,7 +68,7 @@ it('is mutable', () => { const values = [false, true, false]; const setters: Array<(arg: boolean) => void> = [ -@@ -1288,7 +1288,7 @@ describe('app module', () => { +@@ -1294,7 +1294,7 @@ describe('app module', () => { }); }); @@ -77,7 +77,7 @@ let w: BrowserWindow; before(function () { -@@ -1423,7 +1423,7 @@ describe('app module', () => { +@@ -1429,7 +1429,7 @@ describe('app module', () => { describe('getApplicationNameForProtocol()', () => { // TODO: Linux CI doesn't have registered http & https handlers @@ -86,7 +86,7 @@ // We can't expect particular app names here, but these protocols should // at least have _something_ registered. Except on our Linux CI // environment apparently. -@@ -1441,7 +1441,7 @@ describe('app module', () => { +@@ -1447,7 +1447,7 @@ describe('app module', () => { }); }); @@ -95,7 +95,7 @@ it('returns promise rejection for a bogus protocol', async function () { await expect( app.getApplicationInfoForProtocol('bogus-protocol://') -@@ -1491,7 +1491,7 @@ describe('app module', () => { +@@ -1497,7 +1497,7 @@ describe('app module', () => { }); // FIXME Get these specs running on Linux CI @@ -104,7 +104,7 @@ const iconPath = path.join(__dirname, 'fixtures/assets/icon.ico'); const sizes = { small: 16, -@@ -1573,7 +1573,7 @@ describe('app module', () => { +@@ -1579,7 +1579,7 @@ describe('app module', () => { expect(entry.memory).to.have.property('privateBytes').that.is.greaterThan(0); } @@ -113,7 +113,7 @@ expect(entry.sandboxed).to.be.a('boolean'); } -@@ -1647,7 +1647,7 @@ describe('app module', () => { +@@ -1653,7 +1653,7 @@ describe('app module', () => { it('succeeds with complete GPUInfo', async () => { const completeInfo = await getGPUInfo('complete'); @@ -122,7 +122,7 @@ // For linux and macOS complete info is same as basic info await verifyBasicGPUInfo(completeInfo); const basicInfo = await getGPUInfo('basic'); -@@ -1671,7 +1671,7 @@ describe('app module', () => { +@@ -1677,7 +1677,7 @@ describe('app module', () => { }); }); diff --git a/devel/electron37/files/patch-electron_spec_api-web-contents-spec.ts b/devel/electron37/files/patch-electron_spec_api-web-contents-spec.ts index 001598b72527..fc85171296ae 100644 --- a/devel/electron37/files/patch-electron_spec_api-web-contents-spec.ts +++ b/devel/electron37/files/patch-electron_spec_api-web-contents-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/api-web-contents-spec.ts.orig 2025-08-13 14:21:20 UTC +--- electron/spec/api-web-contents-spec.ts.orig 2025-11-13 23:04:07 UTC +++ electron/spec/api-web-contents-spec.ts -@@ -2797,7 +2797,7 @@ describe('webContents module', () => { +@@ -2832,7 +2832,7 @@ describe('webContents module', () => { }); // TODO(codebytere): OOPIF printing is disabled on Linux at the moment due to crashes. |