Skip to content

Commit 9c5ef23

Browse files
committed
chromium: update to 137.0.7151.103.
1 parent c4e9e09 commit 9c5ef23

5 files changed

Lines changed: 86 additions & 6 deletions

File tree

srcpkgs/chromium/patches/llvm19.patch

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,14 @@
99
from_build_root =
1010
rebase_path(clang_warning_suppression_file, root_build_dir)
1111
inputs = [ clang_warning_suppression_file ]
12+
--- a/build/config/compiler/BUILD.gn
13+
+++ b/build/config/compiler/BUILD.gn
14+
@@ -627,7 +627,7 @@
15+
# TODO(crbug.com/413427035): Remove once
16+
# https://github.com/llvm/llvm-project/pull/136867/ is landed.
17+
if (!is_win && !llvm_android_mainline &&
18+
- default_toolchain != "//build/toolchain/cros:target") {
19+
+ default_toolchain != "//build/toolchain/cros:target" && clang_version != "19") {
20+
cflags += [ "-fextend-variable-liveness=none" ]
21+
}
22+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Source: https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/community/chromium/no-sandbox-settls.patch
2+
this optimisation of CLONE_SETTLS is not valid used like this, and future musl
3+
clone(3) will EINVAL on this use
4+
--
5+
--- a/sandbox/linux/services/credentials.cc
6+
+++ b/sandbox/linux/services/credentials.cc
7+
@@ -89,7 +89,7 @@
8+
9+
int clone_flags = CLONE_FS | LINUX_SIGCHLD;
10+
void* tls = nullptr;
11+
-#if (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM_FAMILY)) && \
12+
+#if defined(__GLIBC__) && (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM_FAMILY)) && \
13+
!defined(MEMORY_SANITIZER)
14+
// Use CLONE_VM | CLONE_VFORK as an optimization to avoid copying page tables.
15+
// Since clone writes to the new child's TLS before returning, we must set a

srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch renamed to srcpkgs/chromium/patches/musl-tid-caching.patch

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ see: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13579
55
--
66
--- a/sandbox/linux/services/namespace_sandbox.cc
77
+++ b/sandbox/linux/services/namespace_sandbox.cc
8-
@@ -209,6 +209,70 @@
8+
@@ -209,6 +209,72 @@
99
return base::LaunchProcess(argv, launch_options_copy);
1010
}
1111

12-
+#if defined(__aarch64__) || defined(__arm__) || defined(__powerpc__)
12+
+#if !defined(LIBC_GLIBC)
13+
+#if defined(__aarch64__)
1314
+#define TLS_ABOVE_TP
1415
+#endif
1516
+
@@ -72,15 +73,18 @@ see: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13579
7273
+ pid_t* cached_tid_location = &reinterpret_cast<struct musl_pthread*>(pthread_self())->tid;
7374
+ *cached_tid_location = real_tid;
7475
+}
76+
+#endif
7577
+
7678
// static
7779
pid_t NamespaceSandbox::ForkInNewPidNamespace(bool drop_capabilities_in_child) {
7880
const pid_t pid =
79-
@@ -226,6 +290,7 @@
81+
@@ -226,6 +292,8 @@
8082
#if defined(LIBC_GLIBC)
8183
MaybeUpdateGlibcTidCache();
82-
#endif
84+
-#endif
85+
+#else
8386
+ MaybeUpdateMuslTidCache();
87+
+#endif
8488
return 0;
8589
}
8690

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
From 83f11d630aa1cb6d5ceb292364412f7b0585a201 Mon Sep 17 00:00:00 2001
2+
From: Matt Jolly <kangie@gentoo.org>
3+
Date: Mon, 19 May 2025 11:21:10 -0700
4+
Subject: [PATCH] Fix build with system libpng
5+
6+
`cbc692a42241970e1da492d5b14326e81ecb1061` refactored
7+
`fxcodec::CFX_DIBAttribute` and changed the names of its members.
8+
9+
Unfortunately this change appears to have been typo'd in the
10+
'system libpng' build path, which is not checked by CI, resulting
11+
in downstream build failures in Chromium.
12+
13+
Signed-off-by: Matt Jolly <kangie@gentoo.org>
14+
Change-Id: Id4c2c24f76cb709a0bc78badcaf63eb9c5868fe3
15+
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/132130
16+
Reviewed-by: Lei Zhang <thestig@chromium.org>
17+
Commit-Queue: Tom Sepez <tsepez@chromium.org>
18+
Reviewed-by: Tom Sepez <tsepez@chromium.org>
19+
---
20+
AUTHORS | 1 +
21+
core/fxcodec/png/png_decoder.cpp | 4 ++--
22+
2 files changed, 3 insertions(+), 2 deletions(-)
23+
24+
diff --git a/AUTHORS b/AUTHORS
25+
index 3cd57a711..567f8f5c9 100644
26+
--- a/third_party/pdfium/AUTHORS
27+
+++ b/third_party/pdfium/AUTHORS
28+
@@ -32,6 +32,7 @@ Justin Pierce <brkfstmnchr@gmail.com>
29+
Ke Liu <stackexploit@gmail.com>
30+
Luật Nguyễn <manhluat93.php@gmail.com>
31+
Manuel Geißer <geisserml@gmail.com>
32+
+Matt Jolly <kangie@gentoo.org>
33+
Michael Doppler <m.doppler@gmail.com>
34+
Miklos Vajna <vmiklos@vmiklos.hu>
35+
Minh Trần <myoki.crystal@gmail.com>
36+
diff --git a/core/fxcodec/png/png_decoder.cpp b/core/fxcodec/png/png_decoder.cpp
37+
index 278e381ea..7b6edcd04 100644
38+
--- a/third_party/pdfium/core/fxcodec/png/png_decoder.cpp
39+
+++ b/third_party/pdfium/core/fxcodec/png/png_decoder.cpp
40+
@@ -52,8 +52,8 @@ void _png_load_bmp_attribute(png_structp png_ptr,
41+
CFX_DIBAttribute* pAttribute) {
42+
if (pAttribute) {
43+
#if defined(PNG_pHYs_SUPPORTED)
44+
- pAttribute->xdpi_ = png_get_x_pixels_per_meter(png_ptr, info_ptr);
45+
- pAttribute->ydpi_ = png_get_y_pixels_per_meter(png_ptr, info_ptr);
46+
+ pAttribute->x_dpi_ = png_get_x_pixels_per_meter(png_ptr, info_ptr);
47+
+ pAttribute->y_dpi_ = png_get_y_pixels_per_meter(png_ptr, info_ptr);
48+
png_uint_32 res_x, res_y;
49+
int unit_type;
50+
png_get_pHYs(png_ptr, info_ptr, &res_x, &res_y, &unit_type);

srcpkgs/chromium/template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'chromium'
22
pkgname=chromium
33
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
4-
version=136.0.7103.59
4+
version=137.0.7151.103
55
revision=1
66
archs="i686* x86_64* aarch64* armv7l*"
77
_llvmver=19
@@ -31,7 +31,7 @@ license="BSD-3-Clause"
3131
homepage="https://www.chromium.org/"
3232
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"
3333
#distfiles="https://chromium-tarballs.distfiles.gentoo.org/chromium-${version}.tar.xz"
34-
checksum=3ce1ef863767b3a72058a0f0ceb150cc7b8a9ba8bc24e19c98d25f8b395a8cfe
34+
checksum=31083a39c661942a3617e272787a3927f9b7eeaf2a4e2de1ac3affc8a7f05ef3
3535

3636
lib32disabled=yes
3737

0 commit comments

Comments
 (0)