aboutsummaryrefslogtreecommitdiff
path: root/devel/electron37/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/electron37/files')
-rw-r--r--devel/electron37/files/patch-build_config_rust.gni14
-rw-r--r--devel/electron37/files/patch-build_dotfile__settings.gni10
-rw-r--r--devel/electron37/files/patch-build_rust_std_BUILD.gn14
-rw-r--r--devel/electron37/files/patch-electron_shell_browser_api_electron__api__app.cc8
-rw-r--r--devel/electron37/files/patch-electron_shell_browser_native__window__views.cc24
-rw-r--r--devel/electron37/files/patch-electron_shell_browser_native__window__views.h6
-rw-r--r--devel/electron37/files/patch-electron_shell_common_node__bindings.cc10
-rw-r--r--devel/electron37/files/patch-electron_spec_api-app-spec.ts20
-rw-r--r--devel/electron37/files/patch-third__party_crabbyavif_BUILD.gn16
9 files changed, 83 insertions, 39 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-build_rust_std_BUILD.gn b/devel/electron37/files/patch-build_rust_std_BUILD.gn
index 13c2985f1be5..e4d989a8bdd3 100644
--- a/devel/electron37/files/patch-build_rust_std_BUILD.gn
+++ b/devel/electron37/files/patch-build_rust_std_BUILD.gn
@@ -1,6 +1,14 @@
---- build/rust/std/BUILD.gn.orig 2025-06-30 07:04:30 UTC
+--- build/rust/std/BUILD.gn.orig 2025-08-25 14:15:51 UTC
+++ build/rust/std/BUILD.gn
-@@ -50,13 +50,20 @@ if (toolchain_has_rust) {
+@@ -42,7 +42,6 @@ if (toolchain_has_rust) {
+ "rustc_demangle",
+ "std_detect",
+ "test",
+- "unicode_width",
+ "unwind",
+ ]
+
+@@ -50,13 +49,20 @@ if (toolchain_has_rust) {
# These are no longer present in the Windows toolchain.
stdlib_files += [
"addr2line",
@@ -22,7 +30,7 @@
}
if (toolchain_for_rust_host_build_tools) {
-@@ -76,7 +83,6 @@ if (toolchain_has_rust) {
+@@ -76,7 +82,6 @@ if (toolchain_has_rust) {
# don't need to pass to the C++ linker because they're used for specialized
# purposes.
skip_stdlib_files = [
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 4f6486828120..00fd8098ed1c 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-08-13 14:21:20 UTC
+--- electron/shell/browser/api/electron_api_app.cc.orig 2025-10-28 08:06:59 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.
-@@ -1354,7 +1354,7 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics
+@@ -1434,7 +1434,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);
-@@ -1738,7 +1738,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
+@@ -1818,7 +1818,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
.SetMethod(
"removeAsDefaultProtocolClient",
base::BindRepeating(&Browser::RemoveAsDefaultProtocolClient, browser))
@@ -63,7 +63,7 @@
.SetMethod(
"getApplicationInfoForProtocol",
base::BindRepeating(&Browser::GetApplicationInfoForProtocol, browser))
-@@ -1796,7 +1796,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
+@@ -1876,7 +1876,7 @@ gin::ObjectTemplateBuilder App::GetObjectTemplateBuild
.SetMethod("getJumpListSettings", &App::GetJumpListSettings)
.SetMethod("setJumpList", &App::SetJumpList)
#endif
diff --git a/devel/electron37/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron37/files/patch-electron_shell_browser_native__window__views.cc
index a692323fc532..c6693b11ed3e 100644
--- a/devel/electron37/files/patch-electron_shell_browser_native__window__views.cc
+++ b/devel/electron37/files/patch-electron_shell_browser_native__window__views.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/native_window_views.cc.orig 2025-08-13 14:21:20 UTC
+--- electron/shell/browser/native_window_views.cc.orig 2025-10-21 05:28:55 UTC
+++ electron/shell/browser/native_window_views.cc
@@ -52,7 +52,7 @@
#include "ui/wm/core/shadow_types.h"
@@ -89,8 +89,8 @@
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// On Linux and Windows the minimum and maximum size should be updated with
// window size when window is not resizable.
- if (!resizable_) {
-@@ -1071,7 +1071,7 @@ bool NativeWindowViews::IsClosable() const {
+ if (!CanResize()) {
+@@ -1074,7 +1074,7 @@ bool NativeWindowViews::IsClosable() const {
return false;
}
return !(info.fState & MFS_DISABLED);
@@ -99,7 +99,7 @@
return true;
#endif
}
-@@ -1111,7 +1111,7 @@ void NativeWindowViews::Center() {
+@@ -1114,7 +1114,7 @@ void NativeWindowViews::Center() {
// for now to avoid breaking API contract, but should consider the long
// term plan for this aligning with upstream.
void NativeWindowViews::Center() {
@@ -108,7 +108,7 @@
auto display =
display::Screen::GetScreen()->GetDisplayNearestWindow(GetNativeWindow());
gfx::Rect window_bounds_in_screen = display.work_area();
-@@ -1336,7 +1336,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men
+@@ -1339,7 +1339,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men
}
void NativeWindowViews::SetMenu(ElectronMenuModel* menu_model) {
@@ -117,7 +117,7 @@
// Remove global menu bar.
if (global_menu_bar_ && menu_model == nullptr) {
global_menu_bar_.reset();
-@@ -1392,7 +1392,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow*
+@@ -1395,7 +1395,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow*
void NativeWindowViews::SetParentWindow(NativeWindow* parent) {
NativeWindow::SetParentWindow(parent);
@@ -126,7 +126,7 @@
if (x11_util::IsX11()) {
auto* connection = x11::Connection::Get();
connection->SetProperty(
-@@ -1438,7 +1438,7 @@ void NativeWindowViews::SetProgressBar(double progress
+@@ -1441,7 +1441,7 @@ void NativeWindowViews::SetProgressBar(double progress
NativeWindow::ProgressState state) {
#if BUILDFLAG(IS_WIN)
taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state);
@@ -135,7 +135,7 @@
if (unity::IsRunning()) {
unity::SetProgressFraction(progress);
}
-@@ -1564,7 +1564,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
+@@ -1567,7 +1567,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
#if BUILDFLAG(IS_WIN)
window_handle =
reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);
@@ -144,7 +144,7 @@
window_handle = static_cast<uint32_t>(accelerated_widget);
#endif
aura::WindowTreeHost* const host =
-@@ -1662,7 +1662,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
+@@ -1665,7 +1665,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
SendMessage(hwnd, WM_SETICON, ICON_BIG,
reinterpret_cast<LPARAM>(app_icon_.get()));
}
@@ -153,7 +153,7 @@
void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(
GetAcceleratedWidget());
-@@ -1783,7 +1783,7 @@ bool NativeWindowViews::CanMinimize() const {
+@@ -1786,7 +1786,7 @@ bool NativeWindowViews::CanMinimize() const {
bool NativeWindowViews::CanMinimize() const {
#if BUILDFLAG(IS_WIN)
return minimizable_;
@@ -162,7 +162,7 @@
return true;
#endif
}
-@@ -1839,7 +1839,7 @@ void NativeWindowViews::HandleKeyboardEvent(
+@@ -1842,7 +1842,7 @@ void NativeWindowViews::HandleKeyboardEvent(
if (widget_destroyed_)
return;
@@ -171,7 +171,7 @@
if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
NotifyWindowExecuteAppCommand(kBrowserBackward);
else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
-@@ -1858,7 +1858,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
+@@ -1861,7 +1861,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
// Alt+Click should not toggle menu bar.
root_view_.ResetAltState();
diff --git a/devel/electron37/files/patch-electron_shell_browser_native__window__views.h b/devel/electron37/files/patch-electron_shell_browser_native__window__views.h
index 5f2e253fd5e4..729923f46ebb 100644
--- a/devel/electron37/files/patch-electron_shell_browser_native__window__views.h
+++ b/devel/electron37/files/patch-electron_shell_browser_native__window__views.h
@@ -1,4 +1,4 @@
---- electron/shell/browser/native_window_views.h.orig 2025-08-13 14:21:20 UTC
+--- electron/shell/browser/native_window_views.h.orig 2025-10-21 05:28:55 UTC
+++ electron/shell/browser/native_window_views.h
@@ -26,7 +26,7 @@ namespace electron {
@@ -9,7 +9,7 @@
class GlobalMenuBarX11;
#endif
-@@ -165,7 +165,7 @@ class NativeWindowViews : public NativeWindow,
+@@ -166,7 +166,7 @@ class NativeWindowViews : public NativeWindow,
LPARAM l_param,
LRESULT* result);
void SetIcon(HICON small_icon, HICON app_icon);
@@ -18,7 +18,7 @@
void SetIcon(const gfx::ImageSkia& icon);
#endif
-@@ -254,7 +254,7 @@ class NativeWindowViews : public NativeWindow,
+@@ -255,7 +255,7 @@ class NativeWindowViews : public NativeWindow,
// events from resizing the window.
extensions::SizeConstraints old_size_constraints_;
diff --git a/devel/electron37/files/patch-electron_shell_common_node__bindings.cc b/devel/electron37/files/patch-electron_shell_common_node__bindings.cc
index 753e0a45b250..965f35e644dc 100644
--- a/devel/electron37/files/patch-electron_shell_common_node__bindings.cc
+++ b/devel/electron37/files/patch-electron_shell_common_node__bindings.cc
@@ -1,6 +1,6 @@
---- electron/shell/common/node_bindings.cc.orig 2025-08-13 14:21:20 UTC
+--- electron/shell/common/node_bindings.cc.orig 2025-10-28 08:06:59 UTC
+++ electron/shell/common/node_bindings.cc
-@@ -47,7 +47,7 @@
+@@ -50,7 +50,7 @@
#include "third_party/electron_node/src/debug_utils.h"
#include "third_party/electron_node/src/module_wrap.h"
@@ -9,7 +9,7 @@
#include "shell/common/crash_keys.h"
#endif
-@@ -162,7 +162,7 @@ void V8FatalErrorCallback(const char* location, const
+@@ -165,7 +165,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
-@@ -184,7 +184,7 @@ void V8OOMErrorCallback(const char* location, const v8
+@@ -187,7 +187,7 @@ void V8OOMErrorCallback(const char* location, const v8
LOG(ERROR) << "OOM detail: " << details.detail;
}
@@ -27,7 +27,7 @@
electron::crash_keys::SetCrashKey("electron.v8-oom.is_heap_oom",
std::to_string(details.is_heap_oom));
if (location) {
-@@ -580,7 +580,7 @@ void NodeBindings::Initialize(v8::Local<v8::Context> c
+@@ -627,7 +627,7 @@ void NodeBindings::Initialize(v8::Local<v8::Context> c
TRACE_EVENT0("electron", "NodeBindings::Initialize");
// Open node's error reporting system for browser process.
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 ebcc2de849bd..e1ed07cb198d 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-08-13 14:21:20 UTC
+--- electron/spec/api-app-spec.ts.orig 2025-10-28 08:06:59 UTC
+++ electron/spec/api-app-spec.ts
@@ -129,11 +129,11 @@ describe('app module', () => {
});
@@ -63,12 +63,12 @@
});
});
-- ifdescribe(process.platform !== 'linux')('accessibilitySupportEnabled property', () => {
-+ ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('accessibilitySupportEnabled property', () => {
+- ifdescribe(process.platform !== 'linux')('accessibility support functionality', () => {
++ ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')('accessibility support functionality', () => {
it('is mutable', () => {
const values = [false, true, false];
const setters: Array<(arg: boolean) => void> = [
-@@ -1233,7 +1233,7 @@ describe('app module', () => {
+@@ -1288,7 +1288,7 @@ describe('app module', () => {
});
});
@@ -77,7 +77,7 @@
let w: BrowserWindow;
before(function () {
-@@ -1368,7 +1368,7 @@ describe('app module', () => {
+@@ -1423,7 +1423,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.
-@@ -1386,7 +1386,7 @@ describe('app module', () => {
+@@ -1441,7 +1441,7 @@ describe('app module', () => {
});
});
@@ -95,7 +95,7 @@
it('returns promise rejection for a bogus protocol', async function () {
await expect(
app.getApplicationInfoForProtocol('bogus-protocol://')
-@@ -1436,7 +1436,7 @@ describe('app module', () => {
+@@ -1491,7 +1491,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,
-@@ -1518,7 +1518,7 @@ describe('app module', () => {
+@@ -1573,7 +1573,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');
}
-@@ -1592,7 +1592,7 @@ describe('app module', () => {
+@@ -1647,7 +1647,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');
-@@ -1616,7 +1616,7 @@ describe('app module', () => {
+@@ -1671,7 +1671,7 @@ describe('app module', () => {
});
});
diff --git a/devel/electron37/files/patch-third__party_crabbyavif_BUILD.gn b/devel/electron37/files/patch-third__party_crabbyavif_BUILD.gn
new file mode 100644
index 000000000000..03f918243d1d
--- /dev/null
+++ b/devel/electron37/files/patch-third__party_crabbyavif_BUILD.gn
@@ -0,0 +1,16 @@
+--- third_party/crabbyavif/BUILD.gn.orig 2025-08-25 14:15:51 UTC
++++ third_party/crabbyavif/BUILD.gn
+@@ -190,7 +190,12 @@ rust_static_library("crabbyavif") {
+ "dav1d",
+ "libyuv",
+ "capi",
+- "disable_cfi",
++
++ # TODO: crbug.com/440481923 - Un-comment this once the new rust roll
++ # (http://crrev.com/c/6874449) lands and
++ # https://github.com/webmproject/CrabbyAvif/pull/654 is rolled into
++ # chromium.
++ #"disable_cfi",
+ ]
+
+ # Required for disable_cfi feature.
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-14 15:14:07 +0000