diff options
Diffstat (limited to 'devel/electron36/files')
11 files changed, 121 insertions, 47 deletions
diff --git a/devel/electron36/files/package.json b/devel/electron36/files/package.json index bb15faa1f136..9f65235eaa4b 100644 --- a/devel/electron36/files/package.json +++ b/devel/electron36/files/package.json @@ -20,6 +20,7 @@ "@types/temp": "^0.9.4", "@typescript-eslint/eslint-plugin": "^8.7.0", "@typescript-eslint/parser": "^8.7.0", + "@xmldom/xmldom": "^0.8.11", "buffer": "^6.0.3", "chalk": "^4.1.0", "check-for-leaks": "^1.2.1", diff --git a/devel/electron36/files/patch-build_config_rust.gni b/devel/electron36/files/patch-build_config_rust.gni index f4a09c1206c3..ce4c4bfe1255 100644 --- a/devel/electron36/files/patch-build_config_rust.gni +++ b/devel/electron36/files/patch-build_config_rust.gni @@ -1,13 +1,23 @@ ---- build/config/rust.gni.orig 2025-04-22 20:15:27 UTC +--- build/config/rust.gni.orig 2025-06-16 18:02:10 UTC +++ build/config/rust.gni -@@ -346,6 +346,10 @@ if (is_linux || is_chromeos) { - } - } +@@ -69,7 +69,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 (is_bsd) { -+ rust_abi_target = string_replace(rust_abi_target, "linux-gnu", current_os) + # If you're using a Rust toolchain as specified by rust_sysroot_absolute, + # you can specify whether it supports nacl here. +@@ -344,6 +345,10 @@ if (is_linux || is_chromeos) { + } else { + assert(false, "Architecture not supported") + } +} + - assert(!toolchain_has_rust || rust_abi_target != "") ++if (is_bsd) { ++ rust_abi_target = string_replace(rust_abi_target, "linux-gnu", current_os) + } - # This variable is passed to the Rust libstd build. + assert(!toolchain_has_rust || rust_abi_target != "") diff --git a/devel/electron36/files/patch-build_rust_allocator_lib.rs b/devel/electron36/files/patch-build_rust_allocator_lib.rs index 89fddf278294..169f7b234830 100644 --- a/devel/electron36/files/patch-build_rust_allocator_lib.rs +++ b/devel/electron36/files/patch-build_rust_allocator_lib.rs @@ -1,6 +1,6 @@ ---- build/rust/allocator/lib.rs.orig 2025-05-20 09:16:26 UTC +--- build/rust/allocator/lib.rs.orig 2025-10-04 08:35:33 UTC +++ build/rust/allocator/lib.rs -@@ -0,0 +1,119 @@ +@@ -0,0 +1,132 @@ +// Copyright 2025 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -92,11 +92,24 @@ + /// As part of rustc's contract for using `#[global_allocator]` without + /// rustc-generated shims we must define this symbol, since we are opting in + /// to unstable functionality. See https://github.com/rust-lang/rust/issues/123015 ++ #[rustc_std_internal_symbol] ++ #[linkage = "weak"] ++ fn __rust_no_alloc_shim_is_unstable_v2() {} ++ ++ // TODO(crbug.com/422538133) Remove after rolling past ++ // https://github.com/rust-lang/rust/pull/141061 + #[no_mangle] + #[linkage = "weak"] + static __rust_no_alloc_shim_is_unstable: u8 = 0; + ++ #[rustc_std_internal_symbol] ++ #[linkage = "weak"] ++ fn __rust_alloc_error_handler_should_panic_v2() -> u8 { ++ 0 ++ } ++ + // Mangle the symbol name as rustc expects. ++ // TODO(crbug.com/440481922): Remove this after rolling past https://github.com/rust-lang/rust/pull/143387 + #[rustc_std_internal_symbol] + #[allow(non_upper_case_globals)] + #[linkage = "weak"] diff --git a/devel/electron36/files/patch-build_rust_std_BUILD.gn b/devel/electron36/files/patch-build_rust_std_BUILD.gn index c6c2801bd47d..002ea97d51cd 100644 --- a/devel/electron36/files/patch-build_rust_std_BUILD.gn +++ b/devel/electron36/files/patch-build_rust_std_BUILD.gn @@ -1,4 +1,4 @@ ---- build/rust/std/BUILD.gn.orig 2025-05-20 09:16:26 UTC +--- build/rust/std/BUILD.gn.orig 2025-06-16 18:02:10 UTC +++ build/rust/std/BUILD.gn @@ -15,51 +15,12 @@ # allocator functions to PartitionAlloc when `use_partition_alloc_as_malloc` is @@ -52,7 +52,15 @@ # List of Rust stdlib rlibs which are present in the official Rust toolchain # we are using from the Android team. This is usually a version or two behind # nightly. Generally this matches the toolchain we build ourselves, but if -@@ -89,13 +50,20 @@ if (toolchain_has_rust) { +@@ -81,7 +42,6 @@ if (toolchain_has_rust) { + "rustc_demangle", + "std_detect", + "test", +- "unicode_width", + "unwind", + ] + +@@ -89,13 +49,20 @@ if (toolchain_has_rust) { # These are no longer present in the Windows toolchain. stdlib_files += [ "addr2line", @@ -74,7 +82,7 @@ } if (toolchain_for_rust_host_build_tools) { -@@ -115,7 +83,6 @@ if (toolchain_has_rust) { +@@ -115,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 = [ @@ -82,7 +90,7 @@ "rustc_std_workspace_alloc", "rustc_std_workspace_core", "rustc_std_workspace_std", -@@ -269,8 +236,6 @@ if (toolchain_has_rust) { +@@ -269,8 +235,6 @@ if (toolchain_has_rust) { foreach(libname, stdlib_files + skip_stdlib_files) { deps += [ "rules:$libname" ] } @@ -91,7 +99,7 @@ } } else { action("find_stdlib") { -@@ -396,12 +361,6 @@ if (toolchain_has_rust) { +@@ -396,12 +360,6 @@ if (toolchain_has_rust) { ":stdlib_public_dependent_libs", ] deps = [ ":prebuilt_rustc_copy_to_sysroot" ] diff --git a/devel/electron36/files/patch-electron_BUILD.gn b/devel/electron36/files/patch-electron_BUILD.gn index 1e399556d7df..877b28360e82 100644 --- a/devel/electron36/files/patch-electron_BUILD.gn +++ b/devel/electron36/files/patch-electron_BUILD.gn @@ -1,6 +1,6 @@ ---- electron/BUILD.gn.orig 2025-08-18 21:37:48 UTC +--- electron/BUILD.gn.orig 2025-09-08 12:48:33 UTC +++ electron/BUILD.gn -@@ -547,7 +547,7 @@ source_set("electron_lib") { +@@ -548,7 +548,7 @@ source_set("electron_lib") { defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ] } @@ -9,7 +9,7 @@ deps += [ "//components/crash/core/app", "//components/crash/core/browser", -@@ -640,6 +640,12 @@ source_set("electron_lib") { +@@ -641,6 +641,12 @@ source_set("electron_lib") { cflags_objcc = [ "-fobjc-weak" ] } } @@ -22,7 +22,7 @@ if (is_linux) { libs = [ "xshmfence" ] deps += [ -@@ -1218,7 +1224,7 @@ if (is_mac) { +@@ -1219,7 +1225,7 @@ if (is_mac) { ":electron_lib", ":electron_win32_resources", ":packed_resources", @@ -31,7 +31,7 @@ "//content:sandbox_helper_win", "//electron/buildflags", "//third_party/electron_node:libnode", -@@ -1245,7 +1251,7 @@ if (is_mac) { +@@ -1246,7 +1252,7 @@ if (is_mac) { public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ] } @@ -40,7 +40,7 @@ data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ] } -@@ -1312,7 +1318,7 @@ if (is_mac) { +@@ -1313,7 +1319,7 @@ if (is_mac) { configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } @@ -49,12 +49,14 @@ deps += [ "//sandbox/linux:chrome_sandbox" ] } } -@@ -1420,7 +1426,7 @@ dist_zip("electron_dist_zip") { - ":electron_version_file", - ":licenses", - ] -- if (is_linux) { -+ if (is_linux && !is_bsd) { - data_deps += [ "//sandbox/linux:chrome_sandbox" ] +@@ -1434,7 +1440,9 @@ dist_zip("electron_dist_zip") { + ] + } + +- data_deps += [ "//sandbox/linux:chrome_sandbox" ] ++ if (!is_bsd) { ++ data_deps += [ "//sandbox/linux:chrome_sandbox" ] ++ } } deps = data_deps + outputs = [ "$root_build_dir/dist.zip" ] diff --git a/devel/electron36/files/patch-electron_script_spec-runner.js b/devel/electron36/files/patch-electron_script_spec-runner.js index 48b303bb179e..44489b4673cd 100644 --- a/devel/electron36/files/patch-electron_script_spec-runner.js +++ b/devel/electron36/files/patch-electron_script_spec-runner.js @@ -1,9 +1,9 @@ ---- electron/script/spec-runner.js.orig 2025-03-10 00:01:50 UTC +--- electron/script/spec-runner.js.orig 2025-10-06 01:13:10 UTC +++ electron/script/spec-runner.js -@@ -200,7 +200,7 @@ async function runTestUsingElectron (specDir, testName - exe = path.resolve(BASE, utils.getElectronExec()); +@@ -359,7 +359,7 @@ async function runTestUsingElectron (specDir, testName + argsToPass = argsToPass.filter(arg => (arg.toString().indexOf('--files') === -1 && arg.toString().indexOf('spec/') === -1)); } - const runnerArgs = [`electron/${specDir}`, ...unknownArgs.slice(2)]; + const runnerArgs = [`electron/${specDir}`, ...argsToPass, ...additionalArgs]; - if (process.platform === 'linux') { + if (process.platform === 'linux' || process.platform === 'freebsd') { runnerArgs.unshift(path.resolve(__dirname, 'dbus_mock.py'), exe); diff --git a/devel/electron36/files/patch-electron_shell_services_node_node__service.cc b/devel/electron36/files/patch-electron_shell_services_node_node__service.cc index 51fe435d783f..e30819eff56e 100644 --- a/devel/electron36/files/patch-electron_shell_services_node_node__service.cc +++ b/devel/electron36/files/patch-electron_shell_services_node_node__service.cc @@ -1,6 +1,6 @@ ---- electron/shell/services/node/node_service.cc.orig 2025-01-29 20:10:57 UTC +--- electron/shell/services/node/node_service.cc.orig 2025-09-08 12:48:33 UTC +++ electron/shell/services/node/node_service.cc -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ #include "shell/common/node_includes.h" #include "shell/services/node/parent_port.h" @@ -9,7 +9,7 @@ #include "shell/common/crash_keys.h" #endif -@@ -39,7 +39,7 @@ void V8FatalErrorCallback(const char* location, const +@@ -40,7 +40,7 @@ void V8FatalErrorCallback(const char* location, const g_client_remote->OnV8FatalError(location, outstream.str()); } diff --git a/devel/electron36/files/patch-electron_spec_api-tray-spec.ts b/devel/electron36/files/patch-electron_spec_api-tray-spec.ts index cb822fdca402..2116612eaff6 100644 --- a/devel/electron36/files/patch-electron_spec_api-tray-spec.ts +++ b/devel/electron36/files/patch-electron_spec_api-tray-spec.ts @@ -1,5 +1,21 @@ ---- electron/spec/api-tray-spec.ts.orig 2024-10-09 13:53:06 UTC +--- electron/spec/api-tray-spec.ts.orig 2025-09-08 12:48:33 UTC +++ electron/spec/api-tray-spec.ts +@@ -30,13 +30,13 @@ describe('tray module', () => { + }).to.throw(/Failed to load image from path (.+)/); + }); + +- ifit(process.platform !== 'linux')('throws a descriptive error if an invalid guid is given', () => { ++ ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('throws a descriptive error if an invalid guid is given', () => { + expect(() => { + tray = new Tray(nativeImage.createEmpty(), 'I am not a guid'); + }).to.throw('Invalid GUID format'); + }); + +- ifit(process.platform !== 'linux')('accepts a valid guid', () => { ++ ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('accepts a valid guid', () => { + expect(() => { + tray = new Tray(nativeImage.createEmpty(), '0019A433-3526-48BA-A66C-676742C0FEFB'); + }).to.not.throw(); @@ -131,7 +131,7 @@ describe('tray module', () => { describe('tray.getBounds()', () => { afterEach(() => { tray.destroy(); }); diff --git a/devel/electron36/files/patch-net_dns_BUILD.gn b/devel/electron36/files/patch-net_dns_BUILD.gn index d51291a1422a..9cc82b31ad6e 100644 --- a/devel/electron36/files/patch-net_dns_BUILD.gn +++ b/devel/electron36/files/patch-net_dns_BUILD.gn @@ -1,4 +1,4 @@ ---- net/dns/BUILD.gn.orig 2025-04-06 11:53:44 UTC +--- net/dns/BUILD.gn.orig 2025-09-14 07:58:52 UTC +++ net/dns/BUILD.gn @@ -140,7 +140,7 @@ source_set("dns") { "dns_config_service_android.cc", @@ -9,7 +9,17 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -181,6 +181,7 @@ source_set("dns") { +@@ -174,6 +174,9 @@ source_set("dns") { + } + + deps = [ "//net:net_deps" ] ++ if (is_bsd) { ++ deps += [ "//services/screen_ai/buildflags" ] ++ } + + public_deps = [ + ":dns_client", +@@ -181,6 +184,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +27,7 @@ ] allow_circular_includes_from = [ -@@ -452,9 +453,9 @@ source_set("tests") { +@@ -452,9 +456,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/devel/electron36/files/patch-third__party_crabbyavif_BUILD.gn b/devel/electron36/files/patch-third__party_crabbyavif_BUILD.gn new file mode 100644 index 000000000000..ebe51ae2acfd --- /dev/null +++ b/devel/electron36/files/patch-third__party_crabbyavif_BUILD.gn @@ -0,0 +1,16 @@ +--- third_party/crabbyavif/BUILD.gn.orig 2025-06-16 18:02:10 UTC ++++ third_party/crabbyavif/BUILD.gn +@@ -162,7 +162,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. diff --git a/devel/electron36/files/yarn.lock b/devel/electron36/files/yarn.lock index a12aa3686643..11e117a506a8 100644 --- a/devel/electron36/files/yarn.lock +++ b/devel/electron36/files/yarn.lock @@ -1292,6 +1292,11 @@ resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== +"@xmldom/xmldom@^0.8.11": + version "0.8.11" + resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.11.tgz#b79de2d67389734c57c52595f7a7305e30c2d608" + integrity sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw== + "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -7280,14 +7285,7 @@ stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== |