diff --git a/srcpkgs/chromium/patches/cr131-unbundle-freetype-enable.patch b/srcpkgs/chromium/patches/cr131-unbundle-freetype-enable.patch deleted file mode 100644 index 9bc3f8b9f5e..00000000000 --- a/srcpkgs/chromium/patches/cr131-unbundle-freetype-enable.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6fcc0d232c5d93061f2aac7f3a60ef96d36b8b1a Mon Sep 17 00:00:00 2001 -From: lauren n. liberda -Date: Tue, 22 Oct 2024 22:04:27 +0200 -Subject: [PATCH] [unbundle] add enable_freetype - -fixes freetype unbundle after https://crrev.com/c/5832411 - -Bug: none -Change-Id: If5573d2c0e833ef3c18b505c004b3fa997f903a0 ---- - -diff --git a/build/linux/unbundle/freetype.gn b/build/linux/unbundle/freetype.gn -index 73f96668..c780c630 100644 ---- a/build/linux/unbundle/freetype.gn -+++ b/build/linux/unbundle/freetype.gn -@@ -11,4 +11,9 @@ - # System FreeType configurations other than as described WILL INTRODUCE TEXT - # RENDERING AND SECURITY REGRESSIONS. - use_system_freetype = true -+ -+ # Use FreeType for font rendering. If this is set to false, FreeType is -+ # replaced with the Rust-based Fontations set of libraries plus Skia -+ # path rendering. -+ enable_freetype = true - } diff --git a/srcpkgs/chromium/patches/cross-build.patch b/srcpkgs/chromium/patches/cross-build.patch index 59e1bff61f3..748c7dd55ed 100644 --- a/srcpkgs/chromium/patches/cross-build.patch +++ b/srcpkgs/chromium/patches/cross-build.patch @@ -1,9 +1,9 @@ ---- a/build/config/compiler/BUILD.gn.orig +--- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -917,8 +917,13 @@ +@@ -1257,8 +1257,13 @@ } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia && - !(is_chromeos_lacros && is_chromeos_device)) { + !is_chromeos_device) { - cflags += [ "--target=aarch64-linux-gnu" ] - ldflags += [ "--target=aarch64-linux-gnu" ] + if (is_musl) { @@ -14,8 +14,8 @@ + ldflags += [ "--target=aarch64-linux-gnu" ] + } } - if (is_android) { - # Outline atomics crash on Exynos 9810. http://crbug.com/1272795 + } else if (current_cpu == "mipsel" && !is_nacl) { + ldflags += [ "-Wl,--hash-style=sysv" ] --- a/build/toolchain/linux/unbundle/BUILD.gn.orig +++ b/build/toolchain/linux/unbundle/BUILD.gn @@ -39,3 +39,22 @@ diff --git a/srcpkgs/chromium/patches/fix-constexpr-narrowing.patch b/srcpkgs/chromium/patches/fix-constexpr-narrowing.patch deleted file mode 100644 index 570ca6e69a8..00000000000 --- a/srcpkgs/chromium/patches/fix-constexpr-narrowing.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc.orig -+++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc -@@ -3881,15 +3881,15 @@ - const T&... values) { - std::string strkey = std::string(key); - -- if constexpr (Flags & kEncrypted) { -+ if constexpr (Flags & kEncrypted != 0) { - if (is_encrypted_) - UmaFunction(strkey + ".EME", values...); - } - -- if constexpr (Flags & kTotal) -+ if constexpr (Flags & kTotal != 0) - UmaFunction(strkey + ".All", values...); - -- if constexpr (Flags & kPlaybackType) { -+ if constexpr (Flags & kPlaybackType != 0) { - auto demuxer_type = GetDemuxerType(); - if (!demuxer_type.has_value()) - return; diff --git a/srcpkgs/chromium/patches/fix-libc-version-include.patch b/srcpkgs/chromium/patches/fix-libc-version-include.patch deleted file mode 100644 index d94dcf6deac..00000000000 --- a/srcpkgs/chromium/patches/fix-libc-version-include.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -61,8 +61,11 @@ - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(__GLIBC__) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+ -+#if defined(__GLIBC__) - #include -+#endif - - #include "base/linux_util.h" - #include "base/strings/string_split.h" diff --git a/srcpkgs/chromium/patches/revert-rust-Zdefault-visibility.patch b/srcpkgs/chromium/patches/revert-rust-Zdefault-visibility.patch new file mode 100644 index 00000000000..e2e436d6fa7 --- /dev/null +++ b/srcpkgs/chromium/patches/revert-rust-Zdefault-visibility.patch @@ -0,0 +1,11 @@ +Not supported yet +--- a/build/config/gcc/BUILD.gn ++++ b/build/config/gcc/BUILD.gn +@@ -32,7 +32,6 @@ + # See http://gcc.gnu.org/wiki/Visibility + config("symbol_visibility_hidden") { + cflags = [ "-fvisibility=hidden" ] +- rustflags = [ "-Zdefault-visibility=hidden" ] + + # Visibility attribute is not supported on AIX. + if (current_os != "aix") { diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch index cc4e858d2ab..060865aa60e 100644 --- a/srcpkgs/chromium/patches/sndio.patch +++ b/srcpkgs/chromium/patches/sndio.patch @@ -2,9 +2,9 @@ diff -Naur chromium-83.0.4103.97.orig/media/BUILD.gn chromium-83.0.4103.97/media --- chromium-129.0.6668.58/media/BUILD.gn 2024-09-18 00:00:12.319230000 +0200 +++ - 2024-09-19 19:44:06.486438185 +0200 @@ -66,6 +66,7 @@ - "USE_CHROMEOS_PROTECTED_MEDIA=$use_chromeos_protected_media", "USE_CRAS=$use_cras", "USE_PROPRIETARY_CODECS=$proprietary_codecs", + "ENABLE_GPU_CHANNEL_MEDIA_CAPTURE=$enable_gpu_channel_media_capture", + "USE_SNDIO=$use_sndio", ] diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 5c11c82d0d6..ecb3e910f37 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=131.0.6778.85 +version=132.0.6834.83 revision=1 archs="i686* x86_64* aarch64* armv7l*" _llvmver=19 @@ -29,9 +29,9 @@ short_desc="Google's attempt at creating a safer, faster, and more stable browse maintainer="Duncaen " 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=436a5e43dd089d10d0f72861473c1078bd7f9adfa60da6dd8d0ac01251f42994 +distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz" +#distfiles="https://chromium-tarballs.distfiles.gentoo.org/chromium-${version}.tar.xz" +checksum=f98315eacbf3be106feca37f8243d8c4092d4fd832c918aa36dc229eb6ab39e0 lib32disabled=yes