Skip to content
Open
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

This file was deleted.

75 changes: 0 additions & 75 deletions srcpkgs/chromium/patches/chromium-148-rust-toolchain-var.patch

This file was deleted.

This file was deleted.

23 changes: 23 additions & 0 deletions srcpkgs/chromium/patches/chromium-149-llvm22.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Disable clang flags not supported by llvm 22.
--- a/build/config/sanitizers/sanitizers.gni
+++ b/build/config/sanitizers/sanitizers.gni
@@ -540,7 +540,7 @@
# be usable even in release builds, i.e. as widely as possible.
# It's important not to have full-on UBSan workarounds activate
# just because we built support for a specific sanitizer.
- "-fsanitize-ignore-for-ubsan-feature=${invoker.sanitizer}",
+ # "-fsanitize-ignore-for-ubsan-feature=${invoker.sanitizer}",
]
if (defined(invoker.cflags)) {
cflags += invoker.cflags
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -590,7 +590,7 @@
# Flags for diagnostics.
cflags += [ "-fcolor-diagnostics" ]
if (!is_win) {
- cflags += [ "-fdiagnostics-show-inlining-chain" ]
+ # cflags += [ "-fdiagnostics-show-inlining-chain" ]
} else {
# Combine after https://github.com/llvm/llvm-project/pull/192241
cflags += [ "/clang:-fdiagnostics-show-inlining-chain" ]
59 changes: 59 additions & 0 deletions srcpkgs/chromium/patches/chromium-149-rust-toolchain-var.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
From 5f1fdab4f819433c081603358190b7f64449ff92 Mon Sep 17 00:00:00 2001
From: LN Liberda <lauren@selfisekai.rocks>
Date: Sat, 4 Apr 2026 20:49:57 +0200
Subject: [PATCH] Use rust_sysroot instead of hardcoding
//third_party/rust-toolchain

Bug: 491242305
---
build/config/rust.gni | 4 ++--
build/rust/cargo_crate.gni | 4 ++--
build/rust/std/BUILD.gn | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/config/rust.gni b/build/config/rust.gni
index af3dfac4574f9..82fa215ea75d9 100644
--- a/build/config/rust.gni
+++ b/build/config/rust.gni
@@ -433,7 +433,7 @@ rustc_wrapper_inputs = [
]

if (host_os == "win") {
- rustc_wrapper_inputs += [ "//third_party/rust-toolchain/bin/rustc.exe" ]
+ rustc_wrapper_inputs += [ "$rust_sysroot/bin/rustc.exe" ]
} else {
- rustc_wrapper_inputs += [ "//third_party/rust-toolchain/bin/rustc" ]
+ rustc_wrapper_inputs += [ "$rust_sysroot/bin/rustc" ]
}
diff --git a/build/rust/cargo_crate.gni b/build/rust/cargo_crate.gni
index 4b07ea1312ebc..2b78953c17825 100644
--- a/build/rust/cargo_crate.gni
+++ b/build/rust/cargo_crate.gni
@@ -464,9 +464,9 @@ template("cargo_crate") {
]

if (host_os == "win") {
- inputs += [ "//third_party/rust-toolchain/bin/rustc.exe" ]
+ inputs += [ "$rust_sysroot/bin/rustc.exe" ]
} else {
- inputs += [ "//third_party/rust-toolchain/bin/rustc" ]
+ inputs += [ "$rust_sysroot/bin/rustc" ]
}

build_script_target = ":${_build_script_name}($rust_macro_toolchain)"
diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
index 105a1d52a1682..88ed50182a604 100644
--- a/build/rust/std/BUILD.gn
+++ b/build/rust/std/BUILD.gn
@@ -269,9 +269,9 @@ if (toolchain_has_rust) {
out_depfile = rebase_path(depfile, root_build_dir)

if (host_os == "win") {
- inputs = [ "//third_party/rust-toolchain/bin/rustc.exe" ]
+ inputs = [ "$rust_sysroot/bin/rustc.exe" ]
} else {
- inputs = [ "//third_party/rust-toolchain/bin/rustc" ]
+ inputs = [ "$rust_sysroot/bin/rustc" ]
}

# For the rustc sysroot we must include even the rlibs we don't pass to
4 changes: 2 additions & 2 deletions srcpkgs/chromium/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
version=148.0.7778.178
version=149.0.7827.53
revision=1
_rollup=4.22.4
archs="i686* x86_64* aarch64* armv7l*"
Expand Down Expand Up @@ -36,7 +36,7 @@ homepage="https://www.chromium.org/"
# distfiles="https://chromium.googlesource.com/chromium/src.git/+archive/refs/tags/${version}.tar.gz"
distfiles="https://github.com/chromium-linux-tarballs/chromium-tarballs/releases/download/${version}/chromium-${version}-linux.tar.xz
https://registry.npmjs.org/@rollup/wasm-node/-/wasm-node-${_rollup}.tgz"
checksum="e98de6a40890ae63b070d498e36bde272b99cfa85fe174c72b1994fa8fe0dc4d
checksum="f5ba5fc886c20a6524419a7a7f26a59a3019a94331b369693e09be807654569b
ee49bf67bd9bee869405af78162d028e2af0fcfca80497404f56b1b99f272717"

skip_extraction="wasm-node-${_rollup}.tgz"
Expand Down
6 changes: 3 additions & 3 deletions srcpkgs/gn/template
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Template file for 'gn'
pkgname=gn
version=0.0.20260411
version=0.0.20260603
revision=1
_ref=ec56d4d935a0e2ab9d52b88dd00c93ec51233055
_ref=6f8c0328ee29c76e3566a216f2f0cf2992daa6ed
create_wrksrc=yes
hostmakedepends="python3 ninja"
short_desc="Meta-build system that generates build files for Ninja"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://gn.googlesource.com/gn"
distfiles="https://gn.googlesource.com/gn/+archive/${_ref}.tar.gz"
checksum=@7b8a4f44c5a65b7cb430a3e49a4cd202b3ed4e60bee70bc1dc817521a011235e
checksum=@08ab176aec39784af379b34aa42620522c7f478d0db38ae1286427e67ad892ec

do_configure() {
cat <<-EOF >src/gn/last_commit_position.h
Expand Down