Skip to content

Commit f37f10d

Browse files
authored
Merge pull request #54482 from wolfi-dev/wolfictl-0a22de87-ee29-4f9e-8e4d-ebedc0770417
chromium/137.0.7151.55 package update
2 parents d84d277 + 8c6d6a6 commit f37f10d

3 files changed

Lines changed: 30 additions & 9 deletions

File tree

chromium.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
# And remove the use of the strip pipeline below
88
package:
99
name: chromium
10-
version: "136.0.7103.113"
11-
epoch: 1
10+
version: "137.0.7151.55"
11+
epoch: 0
1212
description: "Open souce version of Google's chrome web browser"
1313
copyright:
1414
- license: BSD-3-Clause
@@ -156,7 +156,7 @@ pipeline:
156156
# Tarballs are built using the instructions here:
157157
# https://wiki.gentoo.org/wiki/Project:Chromium/How_to_make_a_Chromium_tarball
158158
uri: https://chromium-tarballs.distfiles.gentoo.org/chromium-${{package.version}}-linux.tar.xz
159-
expected-sha512: aff1f8f96f304d15ad984f06a5806733b8cc8689973b620b8ef43bb24cb10b2201f40b48158b7a2508cfbaffad3753c811519237c0e68c7a7303be575611896f
159+
expected-sha512: af1cdf9c2fba8d8446edeb2b9a97bd118b06d9e5e50e40a679bc0266b5a54192a62eb70476471a00743f3842dce51faa343f0cae068245feaa70059f0309d7ec
160160

161161
- name: Remove binaries from source tree
162162
runs: |

chromium/clang-19-compat.patch

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,31 @@
11
Description: Disable Clang >= 20 compiler options until packaged
2+
The -fextend-variable-liveness=none flag was added to Chromium to work with newer versions of Clang (likely Clang 20+)
3+
as -fextend-variable-liveness=none flag is not available in Clang<20
4+
It is a new compiler flag: https://releases.llvm.org/20.1.0/tools/clang/docs/ReleaseNotes.html#new-compiler-flags
5+
This whole patch can be removed once we package Clang 20+ in the future.
26
Author: James Page <james.page@chainguard.dev>
37

48
--- a/build/config/compiler/BUILD.gn.orig 2025-05-12 16:11:29.949768459 +0100
59
+++ b/build/config/compiler/BUILD.gn 2025-05-12 16:12:14.385296607 +0100
6-
@@ -312,7 +312,6 @@ config("compiler") {
10+
@@ -313,7 +313,6 @@ config("compiler") {
711
":compiler_cpu_abi",
812
":compiler_codegen",
913
":compiler_deterministic",
1014
- ":clang_warning_suppression",
1115
]
1216

1317
# Here we enable -fno-delete-null-pointer-checks, which makes various nullptr
18+
@@ -623,13 +622,6 @@ config("compiler") {
19+
default_toolchain != "//build/toolchain/cros:target") {
20+
cflags += [ "-Wa,--crel,--allow-experimental-crel" ]
21+
}
22+
-
23+
- # TODO(crbug.com/413427035): Remove once
24+
- # https://github.com/llvm/llvm-project/pull/136867/ is landed.
25+
- if (!is_win && !llvm_android_mainline &&
26+
- default_toolchain != "//build/toolchain/cros:target") {
27+
- cflags += [ "-fextend-variable-liveness=none" ]
28+
- }
29+
}
30+
31+
# C11/C++11 compiler flags setup.

chromium/gperf.patch

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ gperf massaging that causes the problem.
55

66
--- a/third_party/blink/renderer/build/scripts/gperf.py
77
+++ b/third_party/blink/renderer/build/scripts/gperf.py
8-
@@ -28,24 +28,6 @@
8+
@@ -28,27 +28,6 @@ def generate_gperf(gperf_path, gperf_input, gperf_args):
99
stdout=subprocess.PIPE,
1010
universal_newlines=True)
1111
gperf_output = gperf.communicate(gperf_input)[0]
@@ -16,10 +16,13 @@ gperf massaging that causes the problem.
1616
- # https://savannah.gnu.org/bugs/index.php?53028
1717
- gperf_output = re.sub(r'\bregister ', '', gperf_output)
1818
- # -Wimplicit-fallthrough needs an explicit fallthrough statement,
19-
- # so replace gperf's /*FALLTHROUGH*/ comment with the statement.
20-
- # https://savannah.gnu.org/bugs/index.php?53029
21-
- gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
22-
- ' [[fallthrough]];')
19+
- # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement.
20+
- # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2)
21+
- if re.search(
22+
- r'/\* C\+\+ code produced by gperf version 3\.[01](\.\d+)? \*/',
23+
- gperf_output):
24+
- gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
25+
- ' [[fallthrough]];')
2326
- # -Wpointer-to-int-cast warns about casting pointers to smaller ints
2427
- # Replace {(int)(long)&(foo), bar} with
2528
- # {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar}

0 commit comments

Comments
 (0)