diff options
Diffstat (limited to 'devel/electron36/files')
| -rw-r--r-- | devel/electron36/files/package.json | 1 | ||||
| -rw-r--r-- | devel/electron36/files/patch-build_config_rust.gni | 26 | ||||
| -rw-r--r-- | devel/electron36/files/patch-build_rust_allocator_lib.rs | 11 | ||||
| -rw-r--r-- | devel/electron36/files/patch-build_rust_std_BUILD.gn | 18 | ||||
| -rw-r--r-- | devel/electron36/files/patch-electron_script_spec-runner.js | 8 | ||||
| -rw-r--r-- | devel/electron36/files/patch-third__party_crabbyavif_BUILD.gn | 16 | ||||
| -rw-r--r-- | devel/electron36/files/yarn.lock | 14 |
7 files changed, 67 insertions, 27 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 e6dbd2f7e553..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-08-26 21:39:41 UTC +--- build/rust/allocator/lib.rs.orig 2025-10-04 08:35:33 UTC +++ build/rust/allocator/lib.rs -@@ -0,0 +1,125 @@ +@@ -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. @@ -102,7 +102,14 @@ + #[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_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-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== |