Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 0 additions & 137 deletions srcpkgs/chromium/patches/chromium-143-revert-libpng_for_testonly.patch

This file was deleted.

This file was deleted.

This file was deleted.

39 changes: 39 additions & 0 deletions srcpkgs/chromium/patches/chromium-152-rust-cbor.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
Patch-Source: https://salsa.debian.org/chromium-team/chromium/-/blob/96bdb2b923774cf54f3c7598d941df3f769b7897/debian/patches/system/rust-cbor.patch

ERROR at //build/rust/crubit/BUILD.gn:11:5: Unable to load "/chr-build/chromium-152.0.7977.64/third_party/rust-toolchain/lib/third_party/crubit/support/BUILD.gn".
"$crubit_src_dir/support:support_cpp",
^------------------------------------

Patch taken from https://github.com/ungoogled-software/ungoogled-chromium/pull/3928/changes
(though clearly a more permanent solution is needed, if upstream is
planning to drop USE_CBOR_RUST..)

--- a/components/cbor/BUILD.gn
+++ b/components/cbor/BUILD.gn
@@ -12,7 +12,7 @@ buildflag_header("buildflags") {
# TODO(crbug.com/535682335): Remove `USE_CBOR_RUST` buildflag entirely,
# unconditionally enable Rust CBOR parser, and drop `is_cronet_build` check
# once Cronet supports Crubit dependencies.
- flags = [ "USE_CBOR_RUST=!$is_cronet_build" ]
+ flags = [ "USE_CBOR_RUST=$enable_cpp_api_from_rust" ]
}

component("cbor") {
@@ -37,7 +37,7 @@ component("cbor") {
"//base",
]

- if (!is_cronet_build) {
+ if (enable_cpp_api_from_rust) {
public_deps = [
"//build/rust/crubit",
"//components/cbor/rust:cbor_rust_bindings",
@@ -63,7 +63,7 @@ source_set("unit_tests") {
"//testing/gtest",
"//third_party/fuzztest",
]
- if (!is_cronet_build) {
+ if (enable_cpp_api_from_rust) {
deps += [ "//components/cbor/rust:cbor_rust_unittests" ]
}

22 changes: 22 additions & 0 deletions srcpkgs/chromium/patches/chromium-152-unbundle-opus-devtools.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
From 47459e81cbfc542aca5a4493dba8457fe11f7108 Mon Sep 17 00:00:00 2001
From: LN Liberda <lauren@selfisekai.rocks>
Date: Thu, 27 Aug 2026 20:27:03 +0200
Subject: [PATCH] unbundle/opus: add missing dep on opus in
devtools_media_encoding_service

---
content/services/devtools_media_encoding_service/BUILD.gn | 1 +
1 file changed, 1 insertion(+)

diff --git a/content/services/devtools_media_encoding_service/BUILD.gn b/content/services/devtools_media_encoding_service/BUILD.gn
index ce2b615256d36..ef222ca3597c2 100644
--- a/content/services/devtools_media_encoding_service/BUILD.gn
+++ b/content/services/devtools_media_encoding_service/BUILD.gn
@@ -18,6 +18,7 @@ source_set("devtools_media_encoding_service") {
"//media/mojo/common",
"//media/mojo/mojom",
"//mojo/public/cpp/bindings",
+ "//third_party/opus",
"//ui/gfx/geometry",
]

Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,25 @@ also does not ship the rust stdlib for every target, so add an additional
outputs += [ "$target_out_dir/lib$lib.rlib" ]
--- a/build/rust/std/find_std_rlibs.py
+++ b/build/rust/std/find_std_rlibs.py
@@ -26,6 +26,7 @@
help="Path to Rust binaries",
required=True),
parser.add_argument("--target", help="Rust target triple", required=False),
+ parser.add_argument("--sysroot", help="Rust sysroot", required=False),
parser.add_argument("--output",
help="Path to rlibs without suffixes",
required=True)
@@ -50,6 +51,8 @@
rustc_args = [rustc, "--print", "target-libdir"]
if args.target:
rustc_args.extend(["--target", args.target])
+ if args.sysroot:
+ rustc_args.extend(["--sysroot", args.sysroot])
rustlib_dir = subprocess.check_output(rustc_args).rstrip().decode()

# Copy the rlibs to a predictable location. Whilst we're doing so,
@@ -33,6 +33,9 @@
),
)
parser.add_argument(
+ "--sysroot", help="Rust sysroot", required=False
+ )
+ parser.add_argument(
"--output", help="Path to rlibs without suffixes", required=True
)
parser.add_argument(
@@ -61,6 +64,8 @@
rustc_args = [rustc, "--print", "target-libdir"]
if args.target:
rustc_args.extend(["--target", args.target])
+ if args.sysroot:
+ rustc_args.extend(["--sysroot", args.sysroot])
rustlib_dir = subprocess.check_output(rustc_args).rstrip().decode()
# crbug.com/467351944 - rustc --print target-libdir loses Windows subst paths
# due to calling GetFinalPathNameByHandle() during canonicalization. This
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1158,6 +1158,12 @@
Expand Down
Loading
Loading