diff --git a/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch b/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch deleted file mode 100644 index ffa0e7ed108..00000000000 --- a/srcpkgs/chromium/patches/chromium-115-compiler-SkColor4f.patch +++ /dev/null @@ -1,27 +0,0 @@ -Patch-Source: https://src.fedoraproject.org/rpms/chromium/blob/1f8fd846d2cc72c90c73c9867619f0da43b9c816/f/chromium-115-compiler-SkColor4f.patch -diff -up chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.me chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc ---- chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.me 2023-06-24 10:38:11.011511463 +0200 -+++ chromium-115.0.5790.40/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc 2023-06-24 13:07:35.865375884 +0200 -@@ -84,6 +84,7 @@ CanvasStyle::CanvasStyle(const CanvasSty - - void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags, - float global_alpha) const { -+ SkColor4f custom_color = SkColor4f{0.0f, 0.0f, 0.0f, global_alpha}; - switch (type_) { - case kColor: - ApplyColorToFlags(flags, global_alpha); -@@ -91,12 +92,12 @@ void CanvasStyle::ApplyToFlags(cc::Paint - case kGradient: - GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(), - ImageDrawOptions()); -- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha)); -+ flags.setColor(custom_color); - break; - case kImagePattern: - GetCanvasPattern()->GetPattern()->ApplyToFlags( - flags, AffineTransformToSkMatrix(GetCanvasPattern()->GetTransform())); -- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha)); -+ flags.setColor(custom_color); - break; - default: - NOTREACHED(); diff --git a/srcpkgs/chromium/patches/libcxx-musl.patch b/srcpkgs/chromium/patches/libcxx-musl.patch new file mode 100644 index 00000000000..eaf36dca67e --- /dev/null +++ b/srcpkgs/chromium/patches/libcxx-musl.patch @@ -0,0 +1,41 @@ +From 39c6c8be2f3f607b413e3f05ab1f4678efdd129a Mon Sep 17 00:00:00 2001 +From: Brian Cain +Date: Thu, 27 Feb 2025 21:49:19 -0600 +Subject: [PATCH] [libc++] Fix the locale base API on Linux with musl (#128936) + +Since `363bfd6090b0 ([libc++] Use the new locale base API on Linux +(#128007), 2025-02-24)`, musl targets will fail to build with errors +due to missing strtoll_l functions. + +Co-authored-by: Pirama Arumuga Nainar +--- + libcxx/include/__locale_dir/support/linux.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/libcxx/include/__locale_dir/support/linux.h b/libcxx/include/__locale_dir/support/linux.h +index f1662c0112603..fa0b03c646a2a 100644 +--- a/third_party/libc++/src/include/__locale_dir/support/linux.h ++++ b/third_party/libc++/src/__locale_dir/support/linux.h +@@ -95,12 +95,22 @@ inline _LIBCPP_HIDE_FROM_ABI long double __strtold(const char* __nptr, char** __ + } + + inline _LIBCPP_HIDE_FROM_ABI long long __strtoll(const char* __nptr, char** __endptr, int __base, __locale_t __loc) { ++#if !_LIBCPP_HAS_MUSL_LIBC + return ::strtoll_l(__nptr, __endptr, __base, __loc); ++#else ++ (void)__loc; ++ return ::strtoll(__nptr, __endptr, __base); ++#endif + } + + inline _LIBCPP_HIDE_FROM_ABI unsigned long long + __strtoull(const char* __nptr, char** __endptr, int __base, __locale_t __loc) { ++#if !_LIBCPP_HAS_MUSL_LIBC + return ::strtoull_l(__nptr, __endptr, __base, __loc); ++#else ++ (void)__loc; ++ return ::strtoull(__nptr, __endptr, __base); ++#endif + } + + // diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 450e36124ec..c60f274e23d 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,7 +1,7 @@ # Template file for 'chromium' pkgname=chromium # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version -version=134.0.6998.88 +version=135.0.7049.52 revision=1 archs="i686* x86_64* aarch64* armv7l*" _llvmver=19 @@ -31,7 +31,7 @@ license="BSD-3-Clause" homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz" #distfiles="https://chromium-tarballs.distfiles.gentoo.org/chromium-${version}.tar.xz" -checksum=1ba3dfb7942b809cd42bd46ac531125f1181f163a6db256a22ba709275153acd +checksum=620ed41ac1c1bd465c775376deaafd43fd0f6cdd2be1971ed87511683728f5a7 lib32disabled=yes