commit: 21efa52e7b3ab7e4a8dceb3a0d587b4455f9db9f Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Fri Mar 6 21:58:31 2026 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Fri Mar 6 22:04:33 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21efa52e
www-client/chromium: drop 145.0.7632.109 Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> www-client/chromium/Manifest | 2 - www-client/chromium/chromium-145.0.7632.109.ebuild | 1743 -------------------- .../chromium/files/chromium-109-system-zlib.patch | 10 - .../files/chromium-131-unbundle-icu-target.patch | 21 - .../files/chromium-138-nodejs-version-check.patch | 49 - www-client/chromium/files/chromium-browser.xml | 13 - .../chromium/files/chromium-cross-compile.patch | 12 - www-client/chromium/files/chromium-launcher-r7.sh | 59 - www-client/chromium/files/chromium-launcher-r8.sh | 64 - www-client/chromium/files/chromium.default | 5 - www-client/chromium/files/cr144-glibc-2.43.patch | 11 - .../cr145-fix-no-unrar-2-include-harder.patch | 74 - www-client/chromium/files/cr145-fix-no-unrar.patch | 144 -- .../files/cr145-oauth2-client-switches.patch | 37 - .../files/cr145-revert-to-rollup-wasm.patch | 90 - 15 files changed, 2334 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index ef39f1408448..1ec289261955 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,4 +1,3 @@ -DIST chromium-145.0.7632.109-linux.tar.xz 1416630532 BLAKE2B dac5230bc319295c9aac98ce9d707691372e6858098e12753c8295047c67faad65b004cce373803361f2b599c9fd3bb0236dfcebfa2fe85b8b8b0a4755292c52 SHA512 90a857d98aca2e70415332c1abd8c79ea81500254431a47b81f47ee2646cc0ff5368efe182a2cca12469b9b99a776ee47f9fef1d3343351cc31c60d5f55c4582 DIST chromium-145.0.7632.159-linux.tar.xz 1416662532 BLAKE2B 9ec13e6d5091bb6f89cdb107db75f1c226a2689e5a01c55349511957a7886721230b72fceb25eb97cc671bea4f56e2f0044ab139e0df8b26665e4b84ef8744d4 SHA512 a07d72ac4faa7ac6e5185fbdebcdf341563c5f07f5c83a33604884a832f11d28bcee3f67f12aeab11cff963ad5e1b1fc75d6baf92f7e8a7d3b25709d18783063 DIST chromium-146.0.7680.31-linux.tar.xz 1475597444 BLAKE2B d9f2e4929bc0fe9da8d85bb8e4a99cee220ec60a06f2bbe3836dce80a3f43ae6cd76ab8ea8d071f622deeba5a80826701bf0cefc80c9905120b902158eac9821 SHA512 bc8ef6b7e92baa15fc2b442211ba2d957e4edfb178d5c96d19745869fb575e570cb75175644cee165440f220feb3f26550b372dc4f513ee8514cb23beef78486 DIST chromium-146.0.7680.65-linux.tar.xz 1476320316 BLAKE2B bd8ef9d324e564f4d067d100728b15078f50e32a8e05ad17fd87dd9674d9eea97f7183aec4186895cfd0a21746fe1dfaa91f4d08642ce211460d7362b719ed9c SHA512 b61a05ecb22a530bfe357ad670ab78f69b50e401f056a7f04d57511abfb5d2d269d9e70f27688109bda1c23d03198a876b4f0992e640d88aa8aecd6d48e84496 @@ -8,7 +7,6 @@ DIST chromium-clang-llvmorg-23-init-2224-g5bd8dadb-3.tar.xz 57583584 BLAKE2B 7fd DIST chromium-clang-llvmorg-23-init-4965-g686acf63-1.tar.xz 57997052 BLAKE2B 5e8634c5641db77eb9f9454d21489557f264b88671f8efb25898b997337d014ea75260640415e4edd53e6fe0b033ea8f6f3aee9c08ec697f72f4566ebd36b0db SHA512 0f478d5c5894ee9ecb6dbf7a21e3928b82b49951a7b6dff0d5df29ba0972b83e44d5e5f0549eadd3c86214bbd9932960a020781ac7d9cf98bdeb2c9566543829 DIST chromium-openpower-6e839bd947.tar.bz2 438048 BLAKE2B 50acf6c3d5b17c920dba89895d31effb36e1e234099258cfaff8f4b1735b0a401c2c239a1e53265b1dfdb2969df7cb04041b3aa0ecafc8d1e2fd90497db51629 SHA512 f87b33235a26768dda73364b85f7713f5b200a65ca8e28b09ad8f5798b7da80d1cb62b3308263d88e58c01439eb67e365c08466b80299c2b3eeebef52cb977f7 DIST chromium-openpower-a85b64f07b.tar.bz2 2940 BLAKE2B 671e22109410b84d026ee9e73f6112e99023707b97b6af204da8adca7fd53c85d6f5b634ad400596bbc1314f21a011a38a25aa029580529306cc1ad958d4a913 SHA512 34b3e93c23f320e8ce8164527544e37c771d3663951b032e1213db83c0559a85588dbedaa1c92a493cb3e187d6afc8a9601c9e82c07d8cb402e2f1e2dc4b4312 -DIST chromium-patches-145-1.tar.bz2 11711 BLAKE2B a7d6a6e0bd129f3c96bea29bf58dfb91e90f74c3c7e619f7d3d18ea42b8046a1c1c81f463bf31fbff5990b77cb9bea1c289be93e96a22b4d2de0be7253955ce5 SHA512 1008ceac53ec94bc766085d74a703401b45f2b4ff59240dd853383e1c28e8781d9f0be3a58c2cd5470922e529a3ba583188dde0d84b2be04de9cb1b212c110a2 DIST chromium-patches-145-3.tar.bz2 18439 BLAKE2B c4ff5ff745348d08ba927a5b3210a9970d9a2c5dd78300c3c3d96198f49f32a90573a024d92d984dc62ebfc1fbd9edfd24e8bc7d0ed7a2bcfa2b22e400b79a78 SHA512 084b05c93a5a4506beec28e1a8c143bdd4021d28695a1cbb179595f020900336ac5364da3d2b5bb0ae77967e32292988134a29f6cc1ddb7eb67d29fec31dc75d DIST chromium-patches-146-1.tar.bz2 18524 BLAKE2B 4b00707bfb9d83a96f8fbfe1cf55b9dfd9347b93ff7f4ace249c6ec07bf63cf48bfee2e3207e7660213d190b253157ee07a3ff5c11fcb91e259d663f10cdd6dc SHA512 1c7e5bd4e8e0c010df4500bf8125b899672692dde0ad08dd8fb962a75440c46fa5d3216385c9ab186b750714775b2682f7eb326d43862582f73e6d0f13d7c0a9 DIST chromium-patches-147-2.tar.bz2 19019 BLAKE2B 99fe7aa0e762a851f1cf501d9b4d7c06143a6fcdccc13994d07d14046a909e503c32c42ca61db06a5b8a36d6cb33ec3b4dbd0b35c12a5f53c41092f44f278994 SHA512 194a836644fad78f351a3b2218de70f88f11750e57d1c256b222d42282cf0bc32a84c8cb21722149d0673babda8f42786ae2aa8225b1116e96537f487e546163 diff --git a/www-client/chromium/chromium-145.0.7632.109.ebuild b/www-client/chromium/chromium-145.0.7632.109.ebuild deleted file mode 100644 index 7c4526d87d67..000000000000 --- a/www-client/chromium/chromium-145.0.7632.109.ebuild +++ /dev/null @@ -1,1743 +0,0 @@ -# Copyright 2009-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# PACKAGING NOTES - -# Upstream roll their bundled Clang every two weeks, and the bundled Rust -# is rolled regularly and depends on that. While we do our best to build -# with system Clang, we may eventually hit the point where we need to use -# the bundled Clang due to the use of prerelease features. - -# USE=bundled-toolchain is intended for users who want to use the same toolchain -# as the upstream releases. It's also a good fallback in case we fall behind -# and need to get a release out quickly (less likely with `dev` in-tree). -# We can't rely on it as a default since the toolchain is only shipped for x86-64; -# other architectures will need to use system toolchain. - -# Since m133 we are using CI-generated tarballs from -# https://github.com/chromium-linux-tarballs/chromium-tarballs/ - -# These are bit-for-bit identical to the official releases, but are built -# using an external CI system that we have some control over, in case -# issues pop up again with official tarball generation. - -GN_MIN_VER=0.2318 -# chromium-tools/get-chromium-toolchain-strings.py (or just use Chromicler) -# Node for M145+ should be 24.12.0 but that's not packaged in Gentoo yet. See #969145 -TEST_FONT="a28b222b79851716f8358d2800157d9ffe117b3545031ae51f69b7e1e1b9a969" -BUNDLED_CLANG_VER="llvmorg-22-init-17020-gbd1bd178-2" -BUNDLED_RUST_VER="a4cfac7093a1c1c7fbdb6bc75d6b6dc4d385fc69-2" -RUST_SHORT_HASH=${BUNDLED_RUST_VER:0:10}-${BUNDLED_RUST_VER##*-} -NODE_VER="24.11.1" -ESBUILD_VER="0.25.1" # currently manual -ROLLUP_VER="4.57.1" # currently manual. -VIRTUALX_REQUIRED="pgo" - -CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he - hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr - sv sw ta te th tr uk ur vi zh-CN zh-TW" - -LLVM_COMPAT=( 21 ) -PYTHON_COMPAT=( python3_{11..13} ) -PYTHON_REQ_USE="xml(+)" -RUST_MIN_VER=1.91.0 -RUST_NEEDS_LLVM="yes please" -RUST_OPTIONAL="yes" # Not actually optional, but we don't need system Rust (or LLVM) with USE=bundled-toolchain -RUST_REQ_USE="rustfmt" # Upstream run rustfmt on bindgen output, so we need it to be available. - -inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 multiprocessing ninja-utils pax-utils -inherit python-any-r1 readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg-utils - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="https://www.chromium.org/"; -PPC64_HASH="a85b64f07b489b8c6fdb13ecf79c16c56c560fc6" -PATCH_V="${PV%%\.*}-1" -COPIUM_COMMIT="fe1caafa06f27542c18a881348f78e984e2d9fe2" -SRC_URI="https://github.com/chromium-linux-tarballs/chromium-tarballs/releases/download/${PV}/chromium-${PV}-linux.tar.xz - https://deps.gentoo.zip/www-client/chromium/rollup-wasm-node-${ROLLUP_VER}.tgz - !bundled-toolchain? ( - https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2 - https://codeberg.org/selfisekai/copium/archive/${COPIUM_COMMIT}.tar.gz - -> chromium-patches-copium-${COPIUM_COMMIT:0:10}.tar.gz - ) - bundled-toolchain? ( - https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-${BUNDLED_CLANG_VER}.tar.xz - -> chromium-clang-${BUNDLED_CLANG_VER}.tar.xz - https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-${BUNDLED_RUST_VER}-${BUNDLED_CLANG_VER%-*}.tar.xz - -> chromium-rust-toolchain-${RUST_SHORT_HASH}-${BUNDLED_CLANG_VER%-*}.tar.xz - ) - test? ( - https://chromium-fonts.storage.googleapis.com/${TEST_FONT} -> chromium-testfonts-${TEST_FONT:0:10}.tar.gz - ) - pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )" - -# https://gitweb.gentoo.org/proj/chromium-tools.git/tree/get-chromium-licences.py -LICENSE="BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 Base64 Boost-1.0 CC-BY-3.0 CC-BY-4.0 Clear-BSD" -LICENSE+=" FFT2D FTL IJG ISC LGPL-2 LGPL-2.1 libpng libpng2 MIT MPL-1.1 MPL-2.0 Ms-PL openssl PSF-2" -LICENSE+=" SGI-B-2.0 SSLeay SunSoft Unicode-3.0 Unicode-DFS-2015 Unlicense UoI-NCSA X11-Lucent" -LICENSE+=" rar? ( unRAR )" - -SLOT="0/stable" -# Dev exists mostly to give devs some breathing room for beta/stable releases; -# it shouldn't be keyworded but adventurous users can select it. -KEYWORDS="amd64 arm64" - -IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-zstd" -IUSE="+X ${IUSE_SYSTEM_LIBS} bindist bundled-toolchain cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo" -IUSE+=" +proprietary-codecs pulseaudio qt6 +rar +screencast selinux test +vaapi +wayland +widevine cpu_flags_ppc_vsx3" -RESTRICT=" - !bindist? ( bindist ) - !test? ( test ) - arm64? ( test )" # Tests require CFI, which requires LTO, which is broken on arm64 with LLVM 21. - -REQUIRED_USE=" - !headless? ( || ( X wayland ) ) - pgo? ( X !wayland ) - screencast? ( wayland ) - ffmpeg-chromium? ( bindist proprietary-codecs ) -" - -COMMON_X_DEPEND=" - x11-libs/libXcomposite:= - x11-libs/libXcursor:= - x11-libs/libXdamage:= - x11-libs/libXfixes:= - >=x11-libs/libXi-1.6.0:= - x11-libs/libXrandr:= - x11-libs/libXrender:= - x11-libs/libXtst:= - x11-libs/libxshmfence:= -" - -# sys-libs/zlib: https://bugs.gentoo.org/930365; -ng is not compatible. -# We _could_ use the bundled minizip, but that's against policy. -COMMON_SNAPSHOT_DEPEND=" - system-icu? ( >=dev-libs/icu-73.0:= ) - >=dev-libs/libxml2-2.12.4:=[icu] - dev-libs/nspr:= - >=dev-libs/nss-3.26:= - dev-libs/libxslt:= - media-libs/fontconfig:= - >=media-libs/freetype-2.11.0-r1:= - system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) - media-libs/libjpeg-turbo:= - system-zstd? ( >=app-arch/zstd-1.5.5:= ) - >=media-libs/libwebp-0.4.0:= - media-libs/mesa:=[gbm(+)] - >=media-libs/openh264-2.6.0:= - sys-libs/zlib:= - !headless? ( - dev-libs/glib:2 - >=media-libs/alsa-lib-1.0.19:= - pulseaudio? ( media-libs/libpulse:= ) - sys-apps/pciutils:= - kerberos? ( virtual/krb5 ) - vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) - X? ( - x11-base/xorg-proto:= - x11-libs/libX11:= - x11-libs/libxcb:= - x11-libs/libXext:= - ) - x11-libs/libxkbcommon:= - wayland? ( - dev-libs/libffi:= - dev-libs/wayland:= - screencast? ( media-video/pipewire:= ) - ) - ) -" - -COMMON_DEPEND=" - ${COMMON_SNAPSHOT_DEPEND} - app-arch/bzip2:= - dev-libs/expat:= - net-misc/curl[ssl] - sys-apps/dbus:= - media-libs/flac:= - sys-libs/zlib:=[minizip] - !headless? ( - >=app-accessibility/at-spi2-core-2.46.0:2 - media-libs/mesa:=[X?,wayland?] - virtual/udev - x11-libs/cairo:= - x11-libs/gdk-pixbuf:2 - x11-libs/pango:= - cups? ( >=net-print/cups-1.3.11:= ) - qt6? ( dev-qt/qtbase:6[gui,widgets] ) - X? ( ${COMMON_X_DEPEND} ) - ) -" -RDEPEND="${COMMON_DEPEND} - !headless? ( - || ( - x11-libs/gtk+:3[X?,wayland?] - gui-libs/gtk:4[X?,wayland?] - ) - qt6? ( dev-qt/qtbase:6[X?,wayland?] ) - ) - virtual/ttf-fonts - selinux? ( sec-policy/selinux-chromium ) - bindist? ( - !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) - ffmpeg-chromium? ( media-video/ffmpeg-chromium:${PV%%\.*} ) - ) -" -DEPEND="${COMMON_DEPEND} - !headless? ( - gtk4? ( gui-libs/gtk:4[X?,wayland?] ) - !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) - ) -" - -BDEPEND=" - ${COMMON_SNAPSHOT_DEPEND} - ${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - >=app-arch/gzip-1.7 - !headless? ( - qt6? ( dev-qt/qtbase:6 ) - ) - !bundled-toolchain? ( $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - llvm-core/llvm:${LLVM_SLOT} - llvm-core/lld:${LLVM_SLOT} - official? ( - !ppc64? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[cfi] ) - ) ') - ${RUST_DEPEND} - ) - pgo? ( - >=dev-python/selenium-3.141.0 - >=dev-util/web_page_replay_go-20220314 - ) - >=dev-util/bindgen-0.72.1 - >=dev-build/gn-${GN_MIN_VER} - app-alternatives/ninja - dev-lang/perl - >=dev-util/gperf-3.2 - dev-util/esbuild:${ESBUILD_VER} - dev-vcs/git - >=net-libs/nodejs-${NODE_VER}[inspector] - sys-apps/hwdata - >=sys-devel/bison-2.4.3 - sys-devel/flex - virtual/pkgconfig -" - -if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then - EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; -fi - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -Some web pages may require additional fonts to display properly. -Try installing some of the following packages if some characters -are not displayed properly: -- media-fonts/arphicfonts -- media-fonts/droid -- media-fonts/ipamonafont -- media-fonts/noto -- media-fonts/ja-ipafonts -- media-fonts/takao-fonts -- media-fonts/wqy-microhei -- media-fonts/wqy-zenhei - -To fix broken icons on the Downloads page, you should install an icon -theme that covers the appropriate MIME types, and configure this as your -GTK+ icon theme. - -For native file dialogs in KDE, install kde-apps/kdialog. - -To make password storage work with your desktop environment you may -have install one of the supported credentials management applications: -- app-crypt/libsecret (GNOME) -- kde-frameworks/kwallet (KDE) -If you have one of above packages installed, but don't want to use -them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS -in /etc/chromium/default. -" - -python_check_deps() { - python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" -} - -pre_build_checks() { - # Check build requirements: bugs #471810, #541816, #914220 - # We're going to start doing maths here on the size of an unpacked source tarball, - # this should make updates easier as chromium continues to balloon in size. - # xz -l /var/cache/distfiles/chromium-${PV}*.tar.xz - local base_disk=9 # Round up - use test && base_disk=$((base_disk + 5)) - local extra_disk=1 # Always include a little extra space - local memory=4 - tc-is-cross-compiler && extra_disk=$((extra_disk * 2)) - if tc-is-lto || use pgo; then - memory=$((memory * 2 + 1)) - tc-is-cross-compiler && extra_disk=$((extra_disk * 2)) # Double the requirements - use pgo && extra_disk=$((extra_disk + 4)) - fi - if is-flagq '-g?(gdb)?([1-9])'; then - if use custom-cflags; then - extra_disk=$((extra_disk + 5)) - fi - memory=$((memory * 2)) - fi - local CHECKREQS_MEMORY="${memory}G" - local CHECKREQS_DISK_BUILD="$((base_disk + extra_disk))G" - check-reqs_${EBUILD_PHASE_FUNC} -} - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - # The pre_build_checks are all about compilation resources, no need to run it for a binpkg - pre_build_checks - fi - - if use headless; then - local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt6" "vaapi" "wayland") - for myiuse in ${headless_unused_flags[@]}; do - use ${myiuse} && ewarn "Ignoring USE=${myiuse}, USE=headless is set." - done - fi - - if ! use bindist && use ffmpeg-chromium; then - ewarn "Ignoring USE=ffmpeg-chromium, USE=bindist is not set." - fi -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]]; then - # The pre_build_checks are all about compilation resources, no need to run it for a binpkg - pre_build_checks - - # We haven't massaged any CFLAGS yet, so we want to do this before we force CC/CXX to prevent warnings. - local want_lto="false" - tc-is-lto && want_lto="true" - - # The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment - # We'll set these to clang here then use llvm-utils functions to very explicitly set these - # to a sane value. - # This is effectively the 'force-clang' path if GCC support is re-added. - if use !bundled-toolchain; then - llvm-r1_pkg_setup - rust_pkg_setup - - # Forcing clang; respect llvm_slot_x to enable selection of impl via LLVM_COMPAT - AR=llvm-ar - CPP="${CHOST}-clang++-${LLVM_SLOT} -E" - NM=llvm-nm - CC="${CHOST}-clang-${LLVM_SLOT}" - CXX="${CHOST}-clang++-${LLVM_SLOT}" - fi - - use_lto="false" - local lto_usable="true" - if [[ "$want_lto" == "true" ]]; then - if use arm64 && [[ "${LLVM_SLOT}" -lt 22 ]]; then - einfo "LTO is broken with LLVM 21 on arm64, ignoring CFLAGS." - lto_usable="false" - else - use_lto="true" - fi - # We can rely on GN to do this for us; without this builds - # take significantly longer with LTO enabled. - filter-lto - fi - - if [[ "$use_lto" == "false" ]] && use official && [[ "$lto_usable" == "true" ]]; then - einfo "USE=official selected and LTO not detected." - einfo "It is _highly_ recommended that LTO be enabled for performance reasons" - einfo "and to be consistent with the upstream \"official\" build optimisations." - fi - - if [[ "$use_lto" == "false" ]] && use test; then - die "Tests require CFI which requires LTO" - fi - - export use_lto - - # 936858 - if tc-ld-is-mold; then - eerror "Your toolchain is using the mold linker." - eerror "This is not supported by Chromium." - die "Please switch to a different linker." - fi - - if tc-is-cross-compiler; then - use pgo && die "The pgo USE flag cannot be used when cross-compiling" - CPP="${CBUILD}-clang++-${LLVM_SLOT} -E" - fi - - # I hate doing this but upstream Rust have yet to come up with a better solution for - # us poor packagers. Required for Split LTO units, which are required for CFI. - export RUSTC_BOOTSTRAP=1 - - # Sanity checks for development convenience - if ver_test $(gn --version || die) -lt ${GN_MIN_VER}; then - die "dev-build/gn >= ${GN_MIN_VER} is required to build this Chromium" - fi - - # Sometimes, when adding a new LLVM slot, devs (me) forget to install an appropriate lld. - local lld_ver=$(ld.lld --version | awk '{split($2,a,"."); print a[1]}' || die "Failed to check lld version") - if [[ ${lld_ver} -lt ${LLVM_SLOT} ]]; then - die "Your lld version (${lld_ver}) is too old for the selected LLVM slot (${LLVM_SLOT}). Please install a newer lld or select an older LLVM slot." - fi - fi - - chromium_suid_sandbox_check_kernel_config -} - -src_unpack() { - unpack ${P}-linux.tar.xz - # These should only be required when we're not using the official toolchain - if use !bundled-toolchain; then - unpack chromium-patches-${PATCH_V}.tar.bz2 - unpack chromium-patches-copium-${COPIUM_COMMIT:0:10}.tar.gz - fi - - use pgo && unpack chromium-profiler-0.2.tar - - if use test; then - # A new testdata tarball is available for each release; but testfonts tend to remain stable - # for the duration of a release. - # This unpacks directly into/over ${WORKDIR}/${P} so we can just use `unpack`. - # Not generated by chromium-linux-tarballs. Apparently not required to run unit tests either, we'll see! - # unpack ${P}-linux-testdata.tar.xz - # This just contains a bunch of font files that need to be unpacked (or moved) to the correct location. - local testfonts_dir="${WORKDIR}/${P}/third_party/test_fonts/test_fonts" - local testfonts_tar="${DISTDIR}/chromium-testfonts-${TEST_FONT:0:10}.tar.gz" - einfo "Unpacking test fonts ..." - tar xf "${testfonts_tar}" -C "${testfonts_dir}" || die "Failed to unpack testfonts" - fi - - # We need to manually unpack this since M126 else we'd unpack one toolchain over the other. - # Since we're doing that anyway let's unpack to sensible locations to make symlink creation easier. - if use bundled-toolchain; then - einfo "Unpacking bundled Clang ..." - mkdir -p "${WORKDIR}"/clang || die "Failed to create clang directory" - tar xf "${DISTDIR}/chromium-clang-${BUNDLED_CLANG_VER}.tar.xz" -C "${WORKDIR}/clang" || die "Failed to unpack Clang" - einfo "Unpacking bundled Rust ..." - local rust_dir="${WORKDIR}/rust-toolchain" - mkdir -p "${rust_dir}" || die "Failed to create rust toolchain directory" - tar xf "${DISTDIR}/chromium-rust-toolchain-${RUST_SHORT_HASH}-${BUNDLED_CLANG_VER%-*}.tar.xz" -C "${rust_dir}" || - die "Failed to unpack Rust" - fi - - if use ppc64; then - unpack chromium-openpower-${PPC64_HASH:0:10}.tar.bz2 - fi - - # This is a dirty hack, but we need rollup to build successfully and it's proving to be challenging - # to build locally due to deps - unpack rollup-wasm-node-${ROLLUP_VER}.tgz -} - -remove_compiler_builtins() { - # We can't use the bundled compiler builtins with the system toolchain - # We used to `grep` then `sed`, but it was indirect. Combining the two into a single - # `awk` command is more efficient and lets us document the logic more clearly. - - local pattern=' configs += [ "//build/config/clang:compiler_builtins" ]' - local target='build/config/compiler/BUILD.gn' - - local tmpfile - tmpfile=$(mktemp) || die "Failed to create temporary file." - - if awk -v pat="${pattern}" ' - BEGIN { - match_found = 0 - } - - # If the delete countdown is active, decrement it and skip to the next line. - d > 0 { d--; next } - - # If the current line matches the pattern... - $0 == pat { - match_found = 1 # ...set our flag to true. - d = 2 # Set delete counter for this line and the next two. - prev = "" # Clear the buffered previous line so it is not printed. - next - } - - # For any other line, print the buffered previous line. - NR > 1 { print prev } - - # Buffer the current line to be printed on the next cycle. - { prev = $0 } - - END { - # Print the last line if it was not part of a deleted block. - if (d == 0) { print prev } - - # If the pattern was never found, exit with a failure code. - if (match_found == 0) { - exit 1 - } - } - ' "${target}" > "${tmpfile}"; then - # AWK SUCCEEDED (exit code 0): The pattern was found and edited. - # This is to avoid gawk's `-i inplace` option which users complain about. - mv "${tmpfile}" "${target}" - else - # AWK FAILED (exit code 1): The pattern was not found. - rm -f "${tmpfile}" - die "Awk patch failed: Pattern not found in ${target}." - fi -} - -src_prepare() { - # Calling this here supports resumption via FEATURES=keepwork - python_setup - - # Sanity check esbuild version before we start removing files. - # We _could_ patch the version check out - in theory esbuild upstream are being super conservative after - # arch(AUR) packaged an `esbuild` binary and set ESBUILD_BINARY_PATH=/usr/bin/esbuild, causing much breakage, - # but this is fine too and exactly matches what upstream are expecting. - # https://github.com/evanw/esbuild/issues/2894 - local esbuild_js="${S}/third_party/devtools-frontend/src/node_modules/esbuild/lib/main.js" - local found - found=$(awk -F'"' '/if \(binaryVersion !==/ {print $2}' "${esbuild_js}") - if [[ "${found}" != "${ESBUILD_VER}" ]]; then - die "esbuild version mismatch: expected ${ESBUILD_VER}, found ${found}" - fi - - elog "Removing bundled binaries from source tree ..." - # Purge bundled ELF files: These are non-portable and will cause issues if used instead of system versions. - # Use `--wasm` to also remove WebAssembly binaries, if desired - they're portable so shouldn't break builds. - ${EPYTHON} "${FILESDIR}/bin-finder.py" --elf "${S}" | awk '{print $1}' | xargs rm -f || - die "Failed to remove bundled binaries" - - # And now we restore any that we actually need, from the host system - local esbuild_path="${S}/third_party/devtools-frontend/src/third_party/esbuild" - local -A restore_list=( - ["/usr/bin/esbuild-${ESBUILD_VER}"]="${esbuild_path}/esbuild" - ["/usr/bin/node"]="${S}/third_party/node/linux/node-linux-x64/bin/node" - ) - - for src in "${!restore_list[@]}"; do - dst="${restore_list[${src}]}" - if [[ -f "${src}" ]]; then - einfo "Symlinking ${src} ..." - # Make sure the parent dir exists; some tarballs don't include (e.g.) node's bindir - mkdir -p "$(dirname "${dst}")" || die "Failed to create directory for ${dst}" - ln -s "${src}" "${dst}" || die "Failed to symlink ${dst} from ${src}" - else - die "Expected to find ${src} to restore ${dst}, but it does not exist." - fi - done - - # Until we can just symlink in a system rollup, we'll `mv` the wasm version and modify some files. - einfo "Moving rollup wasm-node package into place ..." - mkdir -p third_party/devtools-frontend/src/node_modules/@rollup/wasm-node || - die "Failed to create node_modules/@rollup/wasm-node" - mv "${WORKDIR}"/package/* third_party/devtools-frontend/src/node_modules/@rollup/wasm-node || - die "Failed to move rollup package" - - # To know which patches are safe to drop from files/ after tidying up old ebuilds: - # comm -13 \ - # <(grep 'FILESDIR' *.ebuild | grep patch | grep -o '\${FILESDIR}/[^") ]*' \ - # | sed 's|\${FILESDIR}/|files/|; s|\${PN}|chromium|' | sort -u) \ - # <(find files/ -name "*.patch" | sort) - - local PATCHES=( - "${FILESDIR}/${PN}-cross-compile.patch" - "${FILESDIR}/${PN}-109-system-zlib.patch" - "${FILESDIR}/${PN}-131-unbundle-icu-target.patch" - "${FILESDIR}/${PN}-138-nodejs-version-check.patch" - "${FILESDIR}/cr144-glibc-2.43.patch" - "${FILESDIR}/cr145-oauth2-client-switches.patch" - "${FILESDIR}/cr145-revert-to-rollup-wasm.patch" - "${FILESDIR}/cr145-fix-no-unrar.patch" - ) - # No copium patches here: they should only need to apply to unbundled toolchain builds - # and don't get fetched or unpacked. - - # https://issues.chromium.org/issues/442698344 - # Unreleased fontconfig changed magic numbers and google have rolled to this version - if has_version "<=media-libs/fontconfig-2.17.1"; then - PATCHES+=( "${FILESDIR}/chromium-142-work-with-old-fontconfig.patch" ) - fi - - if use bundled-toolchain; then - # We need to symlink the toolchain into the expected location - einfo "Symlinking Clang toolchain to expected location ..." - mkdir -p third_party/llvm-build/ || die "Failed to create llvm-build directory" - # the 'Chromium Linux Tarballs' seem to already have 'Release+Asserts/{lib,bin}'; not sure if this is an - # upstream change - we're using the same scripts to build, theoretically. We'll still attempt to create - # llvm-build, but we'll rm Release+Asserts and symlink directly. - if [[ -d third_party/llvm-build/Release+Asserts ]]; then - rm -r third_party/llvm-build/Release+Asserts || die "Failed to remove third_party/llvm-build/Release+Asserts" - fi - ln -s "${WORKDIR}"/clang third_party/llvm-build/Release+Asserts || die "Failed to bundle Clang" - einfo "Symlinking Rust toolchain to expected location ..." - # As above, so below - if [[ -d third_party/rust-toolchain ]]; then - rm -r third_party/rust-toolchain || die "Failed to remove third_party/rust-toolchain" - fi - ln -s "${WORKDIR}"/rust-toolchain third_party/rust-toolchain || die "Failed to bundle rust" - cp "${WORKDIR}"/rust-toolchain/VERSION \ - "${WORKDIR}"/rust-toolchain/INSTALLED_VERSION || die "Failed to set rust version" - else - # We don't need our toolchain patches if we're using the official toolchain - - # Copium patches go here. - PATCHES+=( - "${WORKDIR}/copium/cr143-libsync-__BEGIN_DECLS.patch" - "${WORKDIR}/copium/cr145-rustc_nightly_capability.patch" - ) - - # Automate conditional application of chromium-patches - # The directory structure is expected to be something like: - # chromium-patches-145/ - # ├── common/ - # │ ├── cr123-foo.patch - # │ └── cr135-bar.patch - # ├── llvm/ - # │ ├── cr144-baz.patch - # │ └── lt-23/ - # │ └── cr145-bleeding-edge-llvm-feature.patch - # Where `lt-23` means "apply this patch if the LLVM version is less than 23". - # Only categories in `slot_map` will be checked for version constraints. - shopt -s nullglob - local -A slot_map=( [llvm]="${LLVM_SLOT}" [rust]="${RUST_SLOT}" ) - - for category in "${WORKDIR}/chromium-patches-${PATCH_V}"/*/; do - local category_name="${category%/}" - category_name="${category_name##*/}" - - # Skip arch-specific categories if they don't match our arch - if [[ "${category_name}" == "ppc64le" ]]; then - use ppc64 || continue - fi - - # Unconditional patches for this category - PATCHES+=( "${category}"*.patch ) - - # Version-constrained subdirectories (e.g., llvm/lt-23/) - for constraint_dir in "${category}"*/; do - local dir_name="${constraint_dir%/}" - dir_name="${dir_name##*/}" - if [[ "${dir_name}" =~ ^lt-(.*)$ && -v slot_map[${category_name}] ]]; then - ver_test "${slot_map[${category_name}]}" -lt "${BASH_REMATCH[1]}" && - PATCHES+=( "${constraint_dir}"*.patch ) - fi - done - done - - shopt -u nullglob - - # Strictly speaking this doesn't need to be gated (no bundled toolchain for ppc64); it keeps the logic together - if use ppc64; then - local patchset_dir="${WORKDIR}/openpower-patches-${PPC64_HASH}/patches" - # patch causes build errors on 4K page systems (https://bugs.gentoo.org/show_bug.cgi?id=940304) - local page_size_patch="ppc64le/third_party/use-sysconf-page-size-on-ppc64.patch" - local isa_3_patch="ppc64le/core/baseline-isa-3-0.patch" - # Apply the OpenPOWER patches (check for page size and isa 3.0) - openpower_patches=( $(grep -E "^ppc64le|^upstream" "${patchset_dir}/series" | grep -v "${page_size_patch}" | - grep -v "${isa_3_patch}" || die) ) - for patch in "${openpower_patches[@]}"; do - PATCHES+=( "${patchset_dir}/${patch}" ) - done - if [[ $(getconf PAGESIZE) == 65536 ]]; then - PATCHES+=( "${patchset_dir}/${page_size_patch}" ) - fi - # We use vsx3 as a proxy for 'want isa3.0' (POWER9) - if use cpu_flags_ppc_vsx3 ; then - PATCHES+=( "${patchset_dir}/${isa_3_patch}" ) - fi - fi - - remove_compiler_builtins - - # We can't rely on the eselect'd Rust to actually include rustfmt, so we'll point to the selected slot specifically. - local suffix="" - if [[ "${RUST_TYPE}" == "binary" ]]; then - suffix="-bin-${RUST_SLOT}" - else - suffix="-${RUST_SLOT}" - fi - sed -i "s|/bin/rustfmt|/bin/rustfmt${suffix}|g" build/rust/rust_bindgen_generator.gni || - die "Failed to update rustfmt path" - - fi - - default - - # adjust python interpreter version - sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die - - # Use the system copy of hwdata's usb.ids; upstream is woefully out of date (2015!) - sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \ - -i services/device/public/cpp/usb/BUILD.gn || die "Failed to set system usb.ids path" - - # remove_bundled_libraries.py walks the source tree and looks for paths containing the substring 'third_party' - # whitelist matches use the right-most matching path component, so we need to whitelist from that point down. - local keeplibs=( - base/third_party/cityhash - base/third_party/double_conversion - base/third_party/icu - base/third_party/nspr - base/third_party/superfasthash - base/third_party/symbolize - base/third_party/xdg_user_dirs - buildtools/third_party/libc++ - buildtools/third_party/libc++abi - net/third_party/mozilla_security_manager - net/third_party/quic - net/third_party/uri_template - third_party/abseil-cpp - third_party/angle - third_party/angle/src/common/third_party/xxhash - third_party/angle/src/third_party/ceval - third_party/angle/src/third_party/libXNVCtrl - third_party/angle/src/third_party/volk - third_party/anonymous_tokens - third_party/apple_apsl - third_party/axe-core - third_party/bidimapper - third_party/blink - third_party/boringssl - third_party/boringssl/src/third_party/fiat - third_party/breakpad - third_party/breakpad/breakpad/src/third_party/curl - third_party/brotli - third_party/catapult - third_party/catapult/common/py_vulcanize/third_party/rcssmin - third_party/catapult/common/py_vulcanize/third_party/rjsmin - third_party/catapult/third_party/beautifulsoup4-4.9.3 - third_party/catapult/third_party/html5lib-1.1 - third_party/catapult/third_party/polymer - third_party/catapult/third_party/six - third_party/catapult/tracing/third_party/d3 - third_party/catapult/tracing/third_party/gl-matrix - third_party/catapult/tracing/third_party/jpeg-js - third_party/catapult/tracing/third_party/jszip - third_party/catapult/tracing/third_party/mannwhitneyu - third_party/catapult/tracing/third_party/oboe - third_party/catapult/tracing/third_party/pako - third_party/ced - third_party/cld_3 - third_party/closure_compiler - third_party/compiler-rt # Since M137 atomic is required; we could probably unbundle this as a target of opportunity. - third_party/content_analysis_sdk - third_party/cpuinfo - third_party/crabbyavif - third_party/crashpad - third_party/crashpad/crashpad/third_party/lss - third_party/crashpad/crashpad/third_party/zlib - third_party/crc32c - third_party/cros_system_api - third_party/d3 - third_party/dav1d - third_party/dawn - third_party/dawn/third_party/gn/webgpu-cts - third_party/dawn/third_party/khronos - third_party/dawn/third_party/renderdoc - third_party/dawn/third_party/webgpu-headers - third_party/depot_tools - third_party/devscripts - third_party/devtools-frontend - third_party/devtools-frontend/src/front_end/third_party/acorn - third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json - third_party/devtools-frontend/src/front_end/third_party/axe-core - third_party/devtools-frontend/src/front_end/third_party/chromium - third_party/devtools-frontend/src/front_end/third_party/codemirror - third_party/devtools-frontend/src/front_end/third_party/csp_evaluator - third_party/devtools-frontend/src/front_end/third_party/diff - third_party/devtools-frontend/src/front_end/third_party/i18n - third_party/devtools-frontend/src/front_end/third_party/intl-messageformat - third_party/devtools-frontend/src/front_end/third_party/json5 - third_party/devtools-frontend/src/front_end/third_party/legacy-javascript - third_party/devtools-frontend/src/front_end/third_party/lighthouse - third_party/devtools-frontend/src/front_end/third_party/lit - third_party/devtools-frontend/src/front_end/third_party/marked - third_party/devtools-frontend/src/front_end/third_party/puppeteer - third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt - third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/parsel-js - third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs - third_party/devtools-frontend/src/front_end/third_party/source-map-scopes-codec - third_party/devtools-frontend/src/front_end/third_party/third-party-web - third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data - third_party/devtools-frontend/src/front_end/third_party/wasmparser - third_party/devtools-frontend/src/front_end/third_party/web-vitals - third_party/devtools-frontend/src/third_party - third_party/dom_distiller_js - third_party/dragonbox - third_party/eigen3 - third_party/emoji-segmenter - third_party/farmhash - third_party/fast_float - third_party/fdlibm - third_party/federated_compute/chromium/fcp/confidentialcompute - third_party/federated_compute/src/fcp/base - third_party/federated_compute/src/fcp/confidentialcompute - third_party/federated_compute/src/fcp/protos/confidentialcompute - third_party/federated_compute/src/fcp/protos/federatedcompute - third_party/ffmpeg - third_party/fft2d - third_party/flatbuffers - third_party/fp16 - third_party/freetype - third_party/fusejs - third_party/fxdiv - third_party/gemmlowp - third_party/google_input_tools - third_party/google_input_tools/third_party/closure_library - third_party/google_input_tools/third_party/closure_library/third_party/closure - third_party/googletest - third_party/highway - third_party/hunspell - third_party/ink_stroke_modeler/src/ink_stroke_modeler - third_party/ink_stroke_modeler/src/ink_stroke_modeler/internal - third_party/ink/src/ink/brush - third_party/ink/src/ink/color - third_party/ink/src/ink/geometry - third_party/ink/src/ink/rendering - third_party/ink/src/ink/rendering/skia/common_internal - third_party/ink/src/ink/rendering/skia/native - third_party/ink/src/ink/rendering/skia/native/internal - third_party/ink/src/ink/strokes - third_party/ink/src/ink/types - third_party/inspector_protocol - third_party/ipcz - third_party/jinja2 - third_party/jsoncpp - third_party/khronos - third_party/lens_server_proto - third_party/leveldatabase - third_party/libaddressinput - third_party/libaom - third_party/libaom/source/libaom/third_party/fastfeat - third_party/libaom/source/libaom/third_party/SVT-AV1 - third_party/libaom/source/libaom/third_party/vector - third_party/libaom/source/libaom/third_party/x86inc - third_party/libc++ - third_party/libdrm - third_party/libgav1 - third_party/libjingle - third_party/libpfm4 - third_party/libphonenumber - third_party/libpng - third_party/libsecret - third_party/libsrtp - third_party/libsync - third_party/libtess2/libtess2 - third_party/libtess2/src/Include - third_party/libtess2/src/Source - third_party/liburlpattern - third_party/libva_protected_content - third_party/libvpx - third_party/libvpx/source/libvpx/third_party/x86inc - third_party/libwebm - third_party/libx11 - third_party/libxcb-keysyms - third_party/libxml/chromium - third_party/libyuv - third_party/libzip - third_party/lit - third_party/llvm-libc - third_party/llvm-libc/src/shared/ - third_party/lottie - third_party/lss - third_party/lzma_sdk - third_party/mako - third_party/markupsafe - third_party/material_color_utilities - third_party/metrics_proto - third_party/minigbm - third_party/ml_dtypes - third_party/modp_b64 - third_party/nasm - third_party/nearby - third_party/neon_2_sse - third_party/node - third_party/oak/chromium/proto - third_party/oak/chromium/proto/attestation - third_party/omnibox_proto - third_party/one_euro_filter - third_party/openscreen - third_party/openscreen/src/third_party/ - third_party/openscreen/src/third_party/tinycbor/src/src - third_party/opus - third_party/ots - third_party/pdfium - third_party/pdfium/third_party/agg23 - third_party/pdfium/third_party/bigint - third_party/pdfium/third_party/freetype - third_party/pdfium/third_party/lcms - third_party/pdfium/third_party/libopenjpeg - third_party/pdfium/third_party/libtiff - third_party/perfetto - third_party/perfetto/protos/third_party/chromium - third_party/perfetto/protos/third_party/pprof - third_party/perfetto/protos/third_party/simpleperf - third_party/pffft - third_party/ply - third_party/polymer - third_party/private_membership - third_party/private-join-and-compute - third_party/protobuf - third_party/protobuf/third_party/utf8_range - third_party/pthreadpool - third_party/puffin - third_party/pyjson5 - third_party/pyyaml - third_party/rapidhash - third_party/re2 - third_party/readability - third_party/rnnoise - third_party/rust - third_party/ruy - third_party/s2cellid - third_party/search_engines_data - third_party/securemessage - third_party/selenium-atoms - third_party/sentencepiece - third_party/sentencepiece/src/third_party/darts_clone - third_party/shell-encryption - third_party/simdutf - third_party/simplejson - third_party/six - third_party/skia - third_party/skia/include/third_party/vulkan - third_party/skia/third_party/vulkan - third_party/smhasher - third_party/snappy - third_party/spirv-headers - third_party/spirv-tools - third_party/sqlite - third_party/swiftshader - third_party/swiftshader/third_party/astc-encoder - third_party/swiftshader/third_party/llvm-subzero - third_party/swiftshader/third_party/marl - third_party/swiftshader/third_party/SPIRV-Headers/include/spirv - third_party/swiftshader/third_party/SPIRV-Tools - third_party/swiftshader/third_party/subzero - third_party/tensorflow_models - third_party/tensorflow-text - third_party/tflite - third_party/tflite/src/third_party/fft2d - third_party/tflite/src/third_party/xla/third_party/tsl - third_party/tflite/src/third_party/xla/xla/tsl/framework - third_party/tflite/src/third_party/xla/xla/tsl/lib/random - third_party/tflite/src/third_party/xla/xla/tsl/platform - third_party/tflite/src/third_party/xla/xla/tsl/protobuf - third_party/tflite/src/third_party/xla/xla/tsl/util - third_party/ukey2 - third_party/utf - third_party/vulkan - third_party/wayland - third_party/webdriver - third_party/webgpu-cts - third_party/webrtc - third_party/webrtc/common_audio/third_party/ooura - third_party/webrtc/common_audio/third_party/spl_sqrt_floor - third_party/webrtc/modules/third_party/fft - third_party/webrtc/modules/third_party/g711 - third_party/webrtc/modules/third_party/g722 - third_party/widevine - third_party/woff2 - third_party/wuffs - third_party/x11proto - third_party/xcbproto - third_party/xnnpack - third_party/zlib/google - third_party/zxcvbn-cpp - url/third_party/mozilla - v8/third_party/glibc - v8/third_party/inspector_protocol - v8/third_party/rapidhash-v8 - v8/third_party/siphash - v8/third_party/utf8-decoder - v8/third_party/v8 - v8/third_party/valgrind - - # gyp -> gn leftovers - third_party/speech-dispatcher - third_party/usb_ids - third_party/xdg-utils - ) - - if use rar; then - keeplibs+=( third_party/unrar ) - fi - - if use test; then - # tar tvf /var/cache/distfiles/${P}-testdata.tar.xz | grep '^d' | grep 'third_party' | awk '{print $NF}' - keeplibs+=( - third_party/breakpad/breakpad/src/processor - third_party/fuzztest - third_party/google_benchmark/src/include/benchmark - third_party/google_benchmark/src/src - third_party/test_fonts - third_party/test_fonts/fontconfig - ) - fi - - # USE=system-* - if ! use system-harfbuzz; then - keeplibs+=( third_party/harfbuzz-ng ) - fi - - if ! use system-icu; then - keeplibs+=( third_party/icu ) - fi - - if ! use system-zstd; then - keeplibs+=( third_party/zstd ) - fi - - # Arch-specific - if use arm64 || use ppc64 ; then - keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 ) - fi - # we need to generate ppc64 stuff because upstream does not ship it yet - # it has to be done before unbundling. - if use ppc64; then - pushd third_party/libvpx >/dev/null || die - mkdir -p source/config/linux/ppc64 || die - # requires git and clang, bug #832803 - # Revert https://chromium.googlesource.com/chromium/src/+/b463d0f40b08b4e896e7f458d89ae58ce2a27165%5E%21/third_party/libvpx/generate_gni.sh - # and https://chromium.googlesource.com/chromium/src/+/71ebcbce867dd31da5f8b405a28fcb0de0657d91%5E%21/third_party/libvpx/generate_gni.sh - # since we're not in a git repo - sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g; /^git -C/d; /git cl/d; /cd \$BASE_DIR\/\$LIBVPX_SRC_DIR/ign format --in-place \$BASE_DIR\/BUILD.gn\ngn format --in-place \$BASE_DIR\/libvpx_srcs.gni" \ - generate_gni.sh || die - ./generate_gni.sh || die - popd >/dev/null || die - - pushd third_party/ffmpeg >/dev/null || die - cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die - cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die - popd >/dev/null || die - fi - - # Sanity check keeplibs, on major version bumps it is often necessary to update this list - # and this enables us to hit them all at once. - # There are some entries that need to be whitelisted (TODO: Why? The file is understandable, the rest seem odd) - whitelist_libs=( - net/third_party/quic - third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json - third_party/libjingle - third_party/mesa - third_party/skia/third_party/vulkan - third_party/vulkan - ) - local not_found_libs=() - for lib in "${keeplibs[@]}"; do - if [[ ! -d "${lib}" ]] && ! has "${lib}" "${whitelist_libs[@]}"; then - not_found_libs+=( "${lib}" ) - fi - done - - if [[ ${#not_found_libs[@]} -gt 0 ]]; then - eerror "The following \`keeplibs\` directories were not found in the source tree:" - for lib in "${not_found_libs[@]}"; do - eerror " ${lib}" - done - die "Please update the ebuild." - fi - - # Remove most bundled libraries. Some are still needed. - einfo "Unbundling third-party libraries ..." - build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die - - # Interferes with our bundled clang path; we don't want stripped binaries anyway. - sed -i -e 's|${clang_base_path}/bin/llvm-strip|/bin/true|g' \ - -e 's|${clang_base_path}/bin/llvm-objcopy|/bin/true|g' \ - build/linux/strip_binary.gni || die -} - -chromium_configure() { - # Calling this here supports resumption via FEATURES=keepwork - python_setup - - # Bug 491582. - export TMPDIR="${WORKDIR}/temp" - mkdir -p -m 755 "${TMPDIR}" || die - - # https://bugs.gentoo.org/654216 - addpredict /dev/dri/ #nowarn - - # Use system-provided libraries. - # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_protobuf (bug #525560). - # TODO: use_system_sqlite (http://crbug.com/22208). - - # libevent: https://bugs.gentoo.org/593458 - local gn_system_libraries=( - flac - fontconfig - freetype - # Need harfbuzz_from_pkgconfig target - #harfbuzz-ng - libjpeg - libwebp - libxml - libxslt - openh264 - zlib - ) - if use system-icu; then - gn_system_libraries+=( icu ) - fi - - if use system-zstd; then - gn_system_libraries+=( zstd ) - fi - - build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || - die "Failed to replace GN files for system libraries" - - # TODO 131: The above call clobbers `enable_freetype = true` in the freetype gni file - # drop the last line, then append the freetype line and a new curly brace to end the block - local freetype_gni="build/config/freetype/freetype.gni" - sed -i -e '$d' ${freetype_gni} || die - echo " enable_freetype = true" >> ${freetype_gni} || die - echo "}" >> ${freetype_gni} || die - - if use !custom-cflags; then - replace-flags "-Os" "-O2" - strip-flags - # Debug info section overflows without component build - # Prevent linker from running out of address space, bug #471810 . - filter-flags "-g*" - # 949123: Several multimedia components explicitly build with specific CFLAGS and - # use runtime detection to enable optimisations; unfortunately any of our CFLAGS are suffixed - # to the end of the command line, which causes build failures. - use arm64 && filter-flags "-march*" "-mtune*" "-mcpu*" - fi - - # We don't use the same clang version as upstream, and with -Werror - # we need to make sure that we don't get superfluous warnings. - append-flags -Wno-unknown-warning-option - if tc-is-cross-compiler; then # can you cross-compile with the bundled toolchain? - export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option" - export BUILD_CFLAGS+=" -Wno-unknown-warning-option" - fi - - # Start building our GN options - local myconf_gn=() # Tip: strings must be quoted, bools or numbers are fine - - if use !bundled-toolchain; then - # We already forced the "correct" clang via pkg_setup - - if tc-is-cross-compiler; then - CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}" - CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}" - BUILD_AR=${AR} - BUILD_CC=${CC} - BUILD_CXX=${CXX} - BUILD_NM=${NM} - fi - - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX NM - - strip-unsupported-flags - append-ldflags -Wl,--undefined-version # https://bugs.gentoo.org/918897#c32 - - myconf_gn+=( - "is_clang=true" - "clang_use_chrome_plugins=false" - "use_clang_modules=false" # M141 enables this for the linux platform by default. - "use_lld=true" - 'custom_toolchain="//build/toolchain/linux/unbundle:default"' - # From M127 we need to provide a location for libclang. - # We patch this in for gentoo - see chromium-*-bindgen-custom-toolchain.patch - # rust_bindgen_root = directory with `bin/bindgen` beneath it. - # We don't need to set 'clang_base_path' for anything in our build - # and it defaults to the google toolchain location. Instead provide a location - # to where system clang lives so that bindgen can find system headers (e.g. stddef.h) - "bindgen_libclang_path=\"$(get_llvm_prefix)/$(get_libdir)\"" - "clang_base_path=\"${EPREFIX}/usr/lib/clang/${LLVM_SLOT}/\"" - "rust_bindgen_root=\"${EPREFIX}/usr/\"" - "rust_sysroot_absolute=\"$(get_rust_prefix)\"" - "rustc_version=\"${RUST_SLOT}\"" - ) - - if ! tc-is-cross-compiler; then - myconf_gn+=( 'host_toolchain="//build/toolchain/linux/unbundle:default"' ) - else - tc-export BUILD_{AR,CC,CXX,NM} - myconf_gn+=( - 'host_toolchain="//build/toolchain/linux/unbundle:host"' - 'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:host"' - "host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\"" - "pkg_config=\"$(tc-getPKG_CONFIG)\"" - ) - - # setup cups-config, build system only uses --libs option - if use cups; then - mkdir "${T}/cups-config" || die - cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die - export PATH="${PATH}:${T}/cups-config" - fi - - # Don't inherit PKG_CONFIG_PATH from environment - local -x PKG_CONFIG_PATH= - fi - - fi # !bundled-toolchain - - local myarch - myarch="$(tc-arch)" - case ${myarch} in - amd64) - # Bug 530248, 544702, 546984, 853646. - use !custom-cflags && filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 \ - -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a - myconf_gn+=( 'target_cpu="x64"' ) - ;; - arm64) - myconf_gn+=( 'target_cpu="arm64"' ) - ;; - ppc64) - myconf_gn+=( 'target_cpu="ppc64"' ) - ;; - *) - die "Failed to determine target arch, got '${myarch}'." - ;; - esac - - # Common options - - myconf_gn+=( - # Disable code formating of generated files - "blink_enable_generated_code_formatting=false" - # enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138. - # DCHECK is fatal by default, make it configurable at runtime, #bug 807881. - "dcheck_always_on=$(usex debug true false)" - "dcheck_is_configurable=$(usex debug true false)" - # Chromium builds provided by Linux distros should disable the testing config - "disable_fieldtrial_testing_config=true" - # 131 began laying the groundwork for replacing freetype with - # "Rust-based Fontations set of libraries plus Skia path rendering" - # We now need to opt-in - "enable_freetype=true" - "enable_hangout_services_extension=$(usex hangouts true false)" - # Don't need nocompile checks and GN crashes with our config (verify with modern GN) - "enable_nocompile_tests=false" - # pseudolocales are only used for testing - "enable_pseudolocales=false" - "enable_widevine=$(usex widevine true false)" - # Disable fatal linker warnings, bug 506268. - "fatal_linker_warnings=false" - # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys - # Note: these are for Gentoo use ONLY. For your own distribution, - # please get your own set of keys. Feel free to contact [email protected] for more info. - # note: OAuth2 is patched in; check patchset for details. - 'google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"' - # Component build isn't generally intended for use by end users. It's mostly useful - # for development and debugging. - "is_component_build=false" - # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. - "is_debug=false" - "is_official_build=$(usex official true false)" - # Enable ozone wayland and/or headless support - "ozone_auto_platforms=false" - "ozone_platform_headless=true" - # Enables building without non-free unRAR licence - "safe_browsing_use_unrar=$(usex rar true false)" - "thin_lto_enable_optimizations=${use_lto}" - "treat_warnings_as_errors=false" - # Use in-tree libc++ (buildtools/third_party/libc++ and buildtools/third_party/libc++abi) - # instead of the system C++ library for C++ standard library support. - # default: true, but let's be explicit (forced since 120 ; USE removed 127). - "use_custom_libcxx=true" - # Enable ozone wayland and/or headless support - "use_ozone=true" - # The sysroot is the oldest debian image that chromium supports, we don't need it - "use_sysroot=false" - # See dependency logic in third_party/BUILD.gn - "use_system_harfbuzz=$(usex system-harfbuzz true false)" - "use_thin_lto=${use_lto}" - # Only enabled for clang, but gcc has endian macros too - "v8_use_libm_trig_functions=true" - ) - - if use bindist ; then - myconf_gn+=( - # If this is set to false Chromium won't be able to load any proprietary codecs - # even if provided with an ffmpeg capable of h264/aac decoding - "proprietary_codecs=true" - 'ffmpeg_branding="Chrome"' - # build ffmpeg as an external component (libffmpeg.so) that we can remove / substitute - "is_component_ffmpeg=true" - ) - else - myconf_gn+=( - "proprietary_codecs=$(usex proprietary-codecs true false)" - "ffmpeg_branding=\"$(usex proprietary-codecs Chrome Chromium)\"" - ) - fi - - if use headless; then - myconf_gn+=( - "enable_print_preview=false" - "enable_remoting=false" - 'ozone_platform="headless"' - "rtc_use_pipewire=false" - "use_alsa=false" - "use_cups=false" - "use_gio=false" - "use_glib=false" - "use_gtk=false" - "use_kerberos=false" - "use_libpci=false" - "use_pangocairo=false" - "use_pulseaudio=false" - "use_qt5=false" - "use_qt6=false" - "use_udev=false" - "use_vaapi=false" - "use_xkbcommon=false" - ) - else - myconf_gn+=( - "gtk_version=$(usex gtk4 4 3)" - # link pulseaudio directly (DT_NEEDED) instead of using dlopen. - # helps with automated detection of ABI mismatches and prevents silent errors. - "link_pulseaudio=$(usex pulseaudio true false)" - "ozone_platform_wayland=$(usex wayland true false)" - "ozone_platform_x11=$(usex X true false)" - "ozone_platform=\"$(usex wayland wayland x11)\"" - "rtc_use_pipewire=$(usex screencast true false)" - "use_cups=$(usex cups true false)" - "use_kerberos=$(usex kerberos true false)" - "use_pulseaudio=$(usex pulseaudio true false)" - "use_qt5=false" - "use_system_libffi=$(usex wayland true false)" - "use_system_minigbm=true" - "use_vaapi=$(usex vaapi true false)" - "use_xkbcommon=true" - ) - if use qt6; then - local cbuild_libdir - cbuild_libdir="$(get_libdir)" - if tc-is-cross-compiler; then - # Hack to workaround get_libdir not being able to handle CBUILD, bug #794181 - cbuild_libdir="$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)" - cbuild_libdir="${cbuild_libdir:2}" - cbuild_libdir="${cbuild_libdir/% }" - fi - myconf_gn+=( - "use_qt6=true" - "moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\"" - ) - else - myconf_gn+=( "use_qt6=false" ) - fi - fi - - # Explicitly disable ICU data file support for system-icu/headless builds. - if use system-icu || use headless; then - myconf_gn+=( "icu_use_data_file=false" ) - fi - - if use official; then - # Allow building against system libraries in official builds - sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ - tools/generate_shim_headers/generate_shim_headers.py || die - if use !ppc64; then - myconf_gn+=( "is_cfi=${use_lto}" ) - else - myconf_gn+=( "is_cfi=false" ) # requires llvm-runtimes/compiler-rt-sanitizers[cfi] - fi - # Don't add symbols to build - myconf_gn+=( "symbol_level=0" ) - fi - - if use pgo; then - myconf_gn+=( "chrome_pgo_phase=${1}" ) - if [[ "$1" == "2" ]]; then - myconf_gn+=( "pgo_data_path=${2}" ) - fi - else - myconf_gn+=( "chrome_pgo_phase=0" ) - fi - - # Odds and ends - - # skipping typecheck is only supported on amd64, bug #876157 - if ! use amd64; then - myconf_gn+=( "devtools_skip_typecheck=false" ) - fi - - # Disable external code space for V8 for ppc64. It is disabled for ppc64 - # by default, but cross-compiling on amd64 enables it again. - if tc-is-cross-compiler && use ppc64; then - myconf_gn+=( "v8_enable_external_code_space=false" ) - fi - - einfo "Configuring Chromium ..." - set -- gn gen --args="${myconf_gn[*]}${EXTRA_GN:+ ${EXTRA_GN}}" out/Release - echo "$@" - "$@" || die "Failed to configure Chromium" -} - -src_configure() { - chromium_configure $(usex pgo 1 0) -} - -chromium_compile() { - - # Final link uses lots of file descriptors. - ulimit -n 2048 - - # Calling this here supports resumption via FEATURES=keepwork - python_setup - - # Don't inherit PYTHONPATH from environment, bug #789021, #812689 - local -x PYTHONPATH= - - # Build mksnapshot and pax-mark it. - if use pax-kernel; then - local x - for x in mksnapshot v8_context_snapshot_generator code_cache_generator; do - if tc-is-cross-compiler; then - eninja -C out/Release "host/${x}" - pax-mark m "out/Release/host/${x}" - else - eninja -C out/Release "${x}" - pax-mark m "out/Release/${x}" - fi - done - fi - - # Even though ninja autodetects number of CPUs, we respect - # user's options, for debugging with -j 1 or any other reason. - eninja -C out/Release chrome chromedriver chrome_sandbox $(use test && echo "base_unittests") - - pax-mark m out/Release/chrome - - # This codepath does minimal patching, so we're at the mercy of upstream - # CFLAGS. This is fine - we're not intending to force this on users - # and we do a lot of flag 'management' anyway. - if use bundled-toolchain; then - QA_FLAGS_IGNORED=" - usr/lib64/chromium-browser/chrome - usr/lib64/chromium-browser/chrome-sandbox - usr/lib64/chromium-browser/chromedriver - usr/lib64/chromium-browser/chrome_crashpad_handler - usr/lib64/chromium-browser/libEGL.so - usr/lib64/chromium-browser/libGLESv2.so - usr/lib64/chromium-browser/libVkICD_mock_icd.so - usr/lib64/chromium-browser/libVkLayer_khronos_validation.so - usr/lib64/chromium-browser/libqt6_shim.so - usr/lib64/chromium-browser/libvk_swiftshader.so - usr/lib64/chromium-browser/libvulkan.so.1 - " - fi -} - -# This function is called from virtx, and must always return so that Xvfb -# session isn't left running. If we return 1, virtx will call die(). -chromium_profile() { - einfo "Profiling for PGO" - - pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1 - - # Remove old profdata in case profiling was interrupted. - rm -rf "${1}" || return 1 - - if ! "${EPYTHON}" ./chromium_profiler.py \ - --chrome-executable "${S}/out/Release/chrome" \ - --chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \ - --add-arg no-sandbox --add-arg disable-dev-shm-usage \ - --profile-output "${1}"; then - eerror "Profiling failed" - return 1 - fi - - popd >/dev/null || return 1 -} - -src_compile() { - if use pgo; then - local profdata - - profdata="${WORKDIR}/chromium.profdata" - - if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then - chromium_compile - virtx chromium_profile "$profdata" - - touch "${WORKDIR}/.pgo-profiled" || die - fi - - if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then - # Remove phase 1 output - rm -r out/Release || die - - chromium_configure 2 "$profdata" - - touch "${WORKDIR}/.pgo-phase-2-configured" || die - fi - - if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then - chromium_compile - touch "${WORKDIR}/.pgo-phase-2-compiled" || die - fi - else - chromium_compile - fi - - mv out/Release/chromedriver{.unstripped,} || die - - rm -f out/Release/locales/*.pak.info || die - - # Generate support files (desktop file, manpage, etc.) See: #684550 #706786 #968958 - python3 "${FILESDIR}/generate-support-files.py" --installdir "/usr/$(get_libdir)/chromium-browser" || - die "Failed to generate support files" -} - -src_test() { - # Initial list of tests to skip pulled from Alpine. Thanks Lauren! - # https://issues.chromium.org/issues/40939315 - local skip_tests=( - 'MessagePumpLibeventTest.NestedNotification*' - ClampTest.Death - OptionalTest.DereferencingNoValueCrashes - PlatformThreadTest.SetCurrentThreadTypeTest - RawPtrTest.TrivialRelocability - SafeNumerics.IntMaxOperations - StackTraceTest.TraceStackFramePointersFromBuffer - StringPieceTest.InvalidLengthDeath - StringPieceTest.OutOfBoundsDeath - ThreadPoolEnvironmentConfig.CanUseBackgroundPriorityForWorker - ValuesUtilTest.FilePath - # Gentoo-specific - AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/0 - AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/1 - AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/2 - AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/3 - AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/0 - AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/1 - AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/2 - AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/3 - CharacterEncodingTest.GetCanonicalEncodingNameByAliasName - CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGFPE - CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGILL - CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGV - CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGVNonCanonicalAddress - FilePathTest.FromUTF8Unsafe_And_AsUTF8Unsafe - FileTest.GetInfoForCreationTime - ICUStringConversionsTest.ConvertToUtf8AndNormalize - NumberFormattingTest.FormatPercent - PathServiceTest.CheckedGetFailure - PlatformThreadTest.CanChangeThreadType - RustLogIntegrationTest.CheckAllSeverity - StackCanary.ChangingStackCanaryCrashesOnReturn - StackTraceDeathTest.StackDumpSignalHandlerIsMallocFree - SysStrings.SysNativeMBAndWide - SysStrings.SysNativeMBToWide - SysStrings.SysWideToNativeMB - TestLauncherTools.TruncateSnippetFocusedMatchesFatalMessagesTest - ToolsSanityTest.BadVirtualCallNull - ToolsSanityTest.BadVirtualCallWrongType - CancelableEventTest.BothCancelFailureAndSucceedOccurUnderContention #new m133: TODO investigate - DriveInfoTest.GetFileDriveInfo # new m137: TODO investigate - # Broken since M139 dev - CriticalProcessAndThreadSpotChecks/HangWatcherAnyCriticalThreadTests.AnyCriticalThreadHung/RendererProcessIsCritical - CriticalProcessAndThreadSpotChecks/HangWatcherAnyCriticalThreadTests.AnyCriticalThreadHung/UtilityProcessIsCritical - CriticalProcessAndThreadSpotChecks/HangWatcherAnyCriticalThreadTests.AnyCriticalThreadHung/BrowserProcessIsCritical - CriticalProcessAndThreadSpotChecks/HangWatcherAnyCriticalThreadTests.AnyCriticalThreadHung/MainThreadIsCritical - CriticalProcessAndThreadSpotChecks/HangWatcherAnyCriticalThreadTests.AnyCriticalThreadHung/IOThreadIsCritical - CriticalProcessAndThreadSpotChecks/HangWatcherAnyCriticalThreadTests.AnyCriticalThreadHung/CompositorThreadIsCritical - CriticalProcessAndThreadSpotChecks/HangWatcherAnyCriticalThreadTests.AnyCriticalThreadHung/ThreadPoolIsNotCritical - # M140 - CriticalProcessAndThreadSpotChecks/HangWatcherAnyCriticalThreadTests.AnyCriticalThreadHung/GpuProcessIsCritical - # M142 - needs investigation if they persist into beta - AlternateTestParams/PartitionAllocTest.Realloc/2 - AlternateTestParams/PartitionAllocTest.Realloc/3 - AlternateTestParams/PartitionAllocTest.ReallocDirectMapAligned/2 - AlternateTestParams/PartitionAllocTest.ReallocDirectMapAligned/3 - # M142 - new beta failures - 'LazyThreadPoolTaskRunnerEnvironmentTest.*' - ) - local test_filter="-$(IFS=:; printf '%s' "${skip_tests[*]}")" - # test-launcher-bot-mode enables parallelism and plain output - ./out/Release/base_unittests --test-launcher-bot-mode \ - --test-launcher-jobs="$(makeopts_jobs)" \ - --gtest_filter="${test_filter}" || die "Tests failed!" -} - -src_install() { - local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome - - newexe out/Release/chrome_sandbox chrome-sandbox - fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" - - doexe out/Release/chromedriver - doexe out/Release/chrome_crashpad_handler - - ozone_auto_session () { - use X && use wayland && ! use headless && echo true || echo false - } - local sedargs=( -e - "s:/usr/lib/:/usr/$(get_libdir)/:g; - s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g" - ) - sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die - doexe chromium-launcher.sh - - # It is important that we name the target "chromium-browser", - # xdg-utils expect it; bug #355517. - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser - # keep the old symlink around for consistency - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium - - dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver - - # Allow users to override command-line options, bug #357629. - insinto /etc/chromium - newins "${FILESDIR}/chromium.default" "default" - - pushd out/Release/locales > /dev/null || die - chromium_remove_language_paks - popd > /dev/null || die - - insinto "${CHROMIUM_HOME}" - doins out/Release/*.bin - doins out/Release/*.pak - - if use bindist; then - # We built libffmpeg as a component library, but we can't distribute it - # with proprietary codec support. Remove it and make a symlink to the requested - # system library. - rm -f out/Release/libffmpeg.so \ - || die "Failed to remove bundled libffmpeg.so (with proprietary codecs)" - # symlink the libffmpeg.so from either ffmpeg-chromium or ffmpeg[chromium]. - einfo "Creating symlink to libffmpeg.so from $(usex ffmpeg-chromium ffmpeg-chromium ffmpeg[chromium])..." - dosym ../chromium/libffmpeg.so$(usex ffmpeg-chromium .${PV%%\.*} "") \ - /usr/$(get_libdir)/chromium-browser/libffmpeg.so - fi - - ( - shopt -s nullglob - local files=(out/Release/*.so out/Release/*.so.[0-9]) - [[ ${#files[@]} -gt 0 ]] && doins "${files[@]}" - ) - - # Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland" - doins out/Release/xdg-{settings,mime} - - if ! use system-icu && ! use headless; then - doins out/Release/icudtl.dat - fi - - doins -r out/Release/locales - doins -r out/Release/MEIPreload - - # Install vk_swiftshader_icd.json; bug #827861 - doins out/Release/vk_swiftshader_icd.json - - if [[ -d out/Release/swiftshader ]]; then - insinto "${CHROMIUM_HOME}/swiftshader" - doins out/Release/swiftshader/*.so - fi - - # Install icons - local branding size - for size in 16 24 32 48 64 128 256 ; do - case ${size} in - 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; - *) branding="chrome/app/theme/chromium" ;; - esac - newicon -s ${size} "${branding}/product_logo_${size}.png" \ - chromium-browser.png - done - - # Install desktop entry - domenu out/Release/chromium-browser.desktop - - # Install GNOME default application entry (bug #303100). - insinto /usr/share/gnome-control-center/default-apps - doins out/Release/chromium-browser.xml - - # Install AppStream metadata - insinto /usr/share/appdata - doins out/Release/chromium-browser.appdata.xml - - # Install manpage; bug #684550 - doman out/Release/chromium-browser.1 - dosym chromium-browser.1 /usr/share/man/man1/chromium.1 - - readme.gentoo_create_doc -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - readme.gentoo_print_elog - - if ! use headless; then - if use vaapi; then - elog "Hardware-accelerated video decoding configuration:" - elog - elog "Chromium supports multiple backends for hardware acceleration. To enable one," - elog " Add to CHROMIUM_FLAGS in /etc/chromium/default:" - elog - elog "1. VA-API with OpenGL (recommended for most users):" - elog " --enable-features=AcceleratedVideoDecodeLinuxGL" - elog " VaapiVideoDecoder may need to be added as well, but try without first." - elog - if use wayland; then - elog "2. Enhanced Wayland/EGL performance:" - elog " --enable-features=AcceleratedVideoDecodeLinuxGL,AcceleratedVideoDecodeLinuxZeroCopyGL" - elog - fi - if use X; then - elog "$(usex wayland "3" "2"). VA-API with Vulkan:" - elog " --enable-features=VaapiVideoDecoder,VaapiIgnoreDriverChecks,Vulkan,DefaultANGLEVulkan,VulkanFromANGLE" - elog - if use wayland; then - elog " NOTE: Vulkan acceleration requires X11 and will not work under Wayland sessions." - elog " Use OpenGL-based acceleration instead when running under Wayland." - elog - fi - fi - elog "Additional options:" - elog " To enable hardware-accelerated encoding (if supported)" - elog " add 'AcceleratedVideoEncoder' to your feature list" - elog " VaapiIgnoreDriverChecks bypasses driver compatibility checks" - elog " (may be needed for newer/unsupported hardware)" - elog - else - elog "This Chromium build was compiled without VA-API support, which provides" - elog "hardware-accelerated video decoding." - fi - if use screencast; then - elog "Screencast is disabled by default at runtime. Either enable it" - elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer" - elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer" - elog "to CHROMIUM_FLAGS in /etc/chromium/default." - fi - if use gtk4; then - elog "Chromium prefers GTK3 over GTK4 at runtime. To override this" - elog "behavior you need to pass --gtk-version=4, e.g. by adding it" - elog "to CHROMIUM_FLAGS in /etc/chromium/default." - fi - fi - - if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then - ewarn "The lack of an '/etc/machine-id' file on this system booted with systemd" - ewarn "indicates that the Gentoo handbook was not followed to completion." - ewarn "" - ewarn "Chromium is known to behave unpredictably with this system configuration;" - ewarn "please complete the configuration of this system before logging any bugs." - fi -} diff --git a/www-client/chromium/files/chromium-109-system-zlib.patch b/www-client/chromium/files/chromium-109-system-zlib.patch deleted file mode 100644 index 5e8b2d80a9a8..000000000000 --- a/www-client/chromium/files/chromium-109-system-zlib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc -+++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc -@@ -19,7 +19,6 @@ limitations under the License. - #include <cstdio> - - #include "absl/strings/string_view.h" // from @com_google_absl --#include "third_party/zlib/contrib/minizip/ioapi.h" - - namespace tflite { - namespace metadata { diff --git a/www-client/chromium/files/chromium-131-unbundle-icu-target.patch b/www-client/chromium/files/chromium-131-unbundle-icu-target.patch deleted file mode 100644 index 618750f13f18..000000000000 --- a/www-client/chromium/files/chromium-131-unbundle-icu-target.patch +++ /dev/null @@ -1,21 +0,0 @@ -From a665875b4013eed997bd042326a038e24f3296e7 Mon Sep 17 00:00:00 2001 -From: Matt Jolly <[email protected]> -Date: Thu, 10 Oct 2024 14:36:51 +1000 -Subject: [PATCH] unbundle: add missing icu target - ---- a/build/linux/unbundle/icu.gn -+++ b/build/linux/unbundle/icu.gn -@@ -65,6 +65,10 @@ group("icuuc_public") { - public_deps = [ ":icuuc" ] - } - -+group("icui18n_hidden_visibility") { -+ public_deps = [ ":icuuc" ] -+} -+ - shim_headers("icui18n_shim") { - root_path = "source/i18n" - headers = [ --- -2.46.2 - diff --git a/www-client/chromium/files/chromium-138-nodejs-version-check.patch b/www-client/chromium/files/chromium-138-nodejs-version-check.patch deleted file mode 100644 index cc4b3b4b9e82..000000000000 --- a/www-client/chromium/files/chromium-138-nodejs-version-check.patch +++ /dev/null @@ -1,49 +0,0 @@ -https://issues.chromium.org/issues/418397211 -From: Matt Jolly <[email protected]> -Date: Tue, 25 Mar 2025 13:33:48 +1000 -Subject: [PATCH] Remove nodejs version check - -Added in https://github.com/chromium/chromium/commit/0ff8528999941d7182be6fc77aeb12a110a3cd86, -this change is only really useful for gclient checkouts and breaks the -ability for downstreams to provide their own, compatible, nodejs -version via the system package manager (or for use on arches other than -those that Google provides binaries for): - -[ERR_ASSERTION]: Failed NodeJS version check: Expected version 'v22.11.0', but found 'v22.13.1'. Did you run 'gclient sync' - -This is google development footgun protection, working around -poor development practices and gclient's inability to ensure -that the source tree is in a consistent state. We don't need it -here. - -Signed-off-by: Matt Jolly <[email protected]> ---- a/third_party/node/node.gni -+++ b/third_party/node/node.gni -@@ -36,15 +36,5 @@ template("node") { - } - } - -- # Automatically add a dependency to ":check_version" to ensure NodeJS is -- # always running the expected version, except when the ':check_version' -- # target itself is running in which case it shouldn't depend on itself. -- if (get_label_info(":" + target_name, "label_no_toolchain") != -- "//third_party/node:check_version") { -- if (!defined(deps)) { -- deps = [] -- } -- deps += [ "//third_party/node:check_version" ] -- } - } - } ---- a/third_party/protobuf/proto_library.gni -+++ b/third_party/protobuf/proto_library.gni -@@ -562,7 +562,6 @@ template("proto_library") { - _protoc_gen_ts_path, - "//tools/protoc_wrapper/protoc-gen-ts_proto.py", - ] + _protoc_gen_ts_runtime_deps -- deps += [ "//third_party/node:check_version" ] - } - - if (_generate_with_plugin) { --- -2.49.0 diff --git a/www-client/chromium/files/chromium-browser.xml b/www-client/chromium/files/chromium-browser.xml deleted file mode 100644 index 2c95a5584b33..000000000000 --- a/www-client/chromium/files/chromium-browser.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE default-apps SYSTEM "gnome-da-list.dtd"> -<default-apps> - <web-browsers> - <web-browser> - <name>Chromium</name> - <executable>chromium-browser</executable> - <command>chromium-browser %s</command> - <icon-name>chromium-browser</icon-name> - <run-in-terminal>false</run-in-terminal> - </web-browser> - </web-browsers> -</default-apps> diff --git a/www-client/chromium/files/chromium-cross-compile.patch b/www-client/chromium/files/chromium-cross-compile.patch deleted file mode 100644 index 430ceb7a4924..000000000000 --- a/www-client/chromium/files/chromium-cross-compile.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/build/toolchain/linux/unbundle/BUILD.gn -+++ b/build/toolchain/linux/unbundle/BUILD.gn -@@ -35,7 +35,7 @@ gcc_toolchain("host") { - extra_ldflags = getenv("BUILD_LDFLAGS") - - toolchain_args = { -- current_cpu = current_cpu -- current_os = current_os -+ current_cpu = host_cpu -+ current_os = host_os - } - } diff --git a/www-client/chromium/files/chromium-launcher-r7.sh b/www-client/chromium/files/chromium-launcher-r7.sh deleted file mode 100644 index a9ca5aee1a4f..000000000000 --- a/www-client/chromium/files/chromium-launcher-r7.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash - -# Allow the user to override command-line flags, bug #357629. -# This is based on Debian's chromium-browser package, and is intended -# to be consistent with Debian. -for f in /etc/chromium/*; do - [[ -f ${f} ]] && source "${f}" -done - -# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system -# default CHROMIUM_FLAGS (from /etc/chromium/default). -CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"} - -# Let the wrapped binary know that it has been run through the wrapper -export CHROME_WRAPPER=$(readlink -f "$0") - -PROGDIR=${CHROME_WRAPPER%/*} - -case ":$PATH:" in - *:$PROGDIR:*) - # $PATH already contains $PROGDIR - ;; - *) - # Append $PROGDIR to $PATH - export PATH="$PATH:$PROGDIR" - ;; -esac - -if [[ ${EUID} == 0 && -O ${XDG_CONFIG_HOME:-${HOME}} ]]; then - # Running as root with HOME owned by root. - # Pass --user-data-dir to work around upstream failsafe. - CHROMIUM_FLAGS="--user-data-dir=${XDG_CONFIG_HOME:-${HOME}/.config}/chromium - ${CHROMIUM_FLAGS}" -fi - -# Select session type and platform -if @@OZONE_AUTO_SESSION@@; then - platform= - if [[ ${XDG_SESSION_TYPE} == x11 ]]; then - platform=x11 - elif [[ ${XDG_SESSION_TYPE} == wayland ]]; then - platform=wayland - else - if [[ -n ${WAYLAND_DISPLAY} ]]; then - platform=wayland - else - platform=x11 - fi - fi - if ${DISABLE_OZONE_PLATFORM:-false}; then - platform=x11 - fi - CHROMIUM_FLAGS="--ozone-platform=${platform} ${CHROMIUM_FLAGS}" -fi - -# Set the .desktop file name -export CHROME_DESKTOP="chromium-browser.desktop" - -exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@" diff --git a/www-client/chromium/files/chromium-launcher-r8.sh b/www-client/chromium/files/chromium-launcher-r8.sh deleted file mode 100644 index 45bc0d698b33..000000000000 --- a/www-client/chromium/files/chromium-launcher-r8.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -# Allow the user to override command-line flags, bug #357629. -# This is based on Debian's chromium-browser package, and is intended -# to be consistent with Debian. -for f in /etc/chromium/*; do - # Skip backup files and hidden files #546394 - case "${f}" in - *~|*.bak|*.old|*.swp|*.tmp|*/.*) continue ;; - esac - [[ -f "${f}" ]] && source "${f}" -done - -# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system -# default CHROMIUM_FLAGS (from /etc/chromium/default). -CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"} - -# Let the wrapped binary know that it has been run through the wrapper -export CHROME_WRAPPER=$(readlink -f "$0") - -PROGDIR=${CHROME_WRAPPER%/*} - -case ":$PATH:" in - *:$PROGDIR:*) - # $PATH already contains $PROGDIR - ;; - *) - # Append $PROGDIR to $PATH - export PATH="$PATH:$PROGDIR" - ;; -esac - -if [[ ${EUID} == 0 && -O ${XDG_CONFIG_HOME:-${HOME}} ]]; then - # Running as root with HOME owned by root. - # Pass --user-data-dir to work around upstream failsafe. - echo "Refusing to run as root is a safety feature. Running as root disables the sandbox." >&2 - CHROMIUM_FLAGS="--user-data-dir=${XDG_CONFIG_HOME:-${HOME}/.config}/chromium - ${CHROMIUM_FLAGS}" -fi - -# Select session type and platform -if @@OZONE_AUTO_SESSION@@; then - platform= - if [[ ${XDG_SESSION_TYPE} == x11 ]]; then - platform=x11 - elif [[ ${XDG_SESSION_TYPE} == wayland ]]; then - platform=wayland - else - if [[ -n ${WAYLAND_DISPLAY} ]]; then - platform=wayland - else - platform=x11 - fi - fi - if ${DISABLE_OZONE_PLATFORM:-false}; then - platform=x11 - fi - CHROMIUM_FLAGS="--ozone-platform=${platform} ${CHROMIUM_FLAGS}" -fi - -# Set the .desktop file name -export CHROME_DESKTOP="chromium-browser.desktop" - -exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@" diff --git a/www-client/chromium/files/chromium.default b/www-client/chromium/files/chromium.default deleted file mode 100644 index c140cdeb5666..000000000000 --- a/www-client/chromium/files/chromium.default +++ /dev/null @@ -1,5 +0,0 @@ -# Default settings for chromium. This file is sourced by /bin/bash from -# the chromium launcher. - -# Options to pass to chromium. -#CHROMIUM_FLAGS="" diff --git a/www-client/chromium/files/cr144-glibc-2.43.patch b/www-client/chromium/files/cr144-glibc-2.43.patch deleted file mode 100644 index 0c1e06ca893d..000000000000 --- a/www-client/chromium/files/cr144-glibc-2.43.patch +++ /dev/null @@ -1,11 +0,0 @@ -https://bugs.gentoo.org/969846 -https://bugs.gentoo.org/969495 -https://crbug.com/456218403 ---- a/sandbox/linux/system_headers/linux_seccomp.h -+++ b/sandbox/linux/system_headers/linux_seccomp.h -@@ -7,4 +7,5 @@ - - #include <stdint.h> -+#include <signal.h> - #include <sys/ioctl.h> - diff --git a/www-client/chromium/files/cr145-fix-no-unrar-2-include-harder.patch b/www-client/chromium/files/cr145-fix-no-unrar-2-include-harder.patch deleted file mode 100644 index 6e57f6c6c67d..000000000000 --- a/www-client/chromium/files/cr145-fix-no-unrar-2-include-harder.patch +++ /dev/null @@ -1,74 +0,0 @@ -From c38c89ed1b9d600fe1d9ffe688d7029572f84b8e Mon Sep 17 00:00:00 2001 -From: Matt Jolly <[email protected]> -Date: Tue, 24 Feb 2026 17:13:23 +1000 -Subject: [PATCH] safe_browsing_use_unrar: add include guards - -While the previous fix to conditionalise unrar logic in -6dc59a3b7dc8de4903f3826e718f3231ab1a28ec allows the code to build, some -downstreams (like Gentoo) use the `unbundle/remove_bundled_libraries.py` -script to completely remove unrar from the source tree in configurations -where it is not desired. As this removes the headers, include guards are -required to enable a successful build when unrar is removed. - -Signed-off-by: Matt Jolly <[email protected]> ---- a/chrome/services/file_util/obfuscated_archive_analysis_delegate.h -+++ b/chrome/services/file_util/obfuscated_archive_analysis_delegate.h -@@ -7,7 +7,10 @@ - - #include "chrome/utility/safe_browsing/archive_analysis_delegate.h" - #include "components/enterprise/obfuscation/core/utils.h" -+ -+#if USE_UNRAR - #include "third_party/unrar/google/unrar_wrapper.h" -+#endif - - namespace safe_browsing { - ---- a/chrome/services/file_util/regular_archive_analysis_delegate.cc -+++ b/chrome/services/file_util/regular_archive_analysis_delegate.cc -@@ -9,9 +9,12 @@ - #include "base/containers/span.h" - #include "base/files/file.h" - #include "chrome/utility/safe_browsing/zip_writer_delegate.h" -+#include "third_party/zlib/google/zip_reader.h" -+ -+#if USE_UNRAR - #include "third_party/unrar/google/unrar_delegates.h" - #include "third_party/unrar/google/unrar_wrapper.h" --#include "third_party/zlib/google/zip_reader.h" -+#endif - - namespace safe_browsing { - ---- a/chrome/services/file_util/regular_archive_analysis_delegate.h -+++ b/chrome/services/file_util/regular_archive_analysis_delegate.h -@@ -6,7 +6,10 @@ - #define CHROME_SERVICES_FILE_UTIL_REGULAR_ARCHIVE_ANALYSIS_DELEGATE_H_ - - #include "chrome/utility/safe_browsing/archive_analysis_delegate.h" -+ -+#if USE_UNRAR - #include "third_party/unrar/google/unrar_delegates.h" -+#endif - - namespace safe_browsing { - ---- a/chrome/utility/safe_browsing/archive_analysis_delegate.h -+++ b/chrome/utility/safe_browsing/archive_analysis_delegate.h -@@ -9,9 +9,12 @@ - - #include "base/files/file.h" - #include "chrome/utility/safe_browsing/zip_writer_delegate.h" --#include "third_party/unrar/google/unrar_delegates.h" - #include "third_party/zlib/google/zip_reader.h" - -+#if USE_UNRAR -+#include "third_party/unrar/google/unrar_delegates.h" -+#endif -+ - namespace safe_browsing { - - // Delegate interface for abstracting archive analysis operations, specifically --- -2.52.0 - diff --git a/www-client/chromium/files/cr145-fix-no-unrar.patch b/www-client/chromium/files/cr145-fix-no-unrar.patch deleted file mode 100644 index fb7f78780d6b..000000000000 --- a/www-client/chromium/files/cr145-fix-no-unrar.patch +++ /dev/null @@ -1,144 +0,0 @@ -https://chromium-review.googlesource.com/c/chromium/src/+/7493269 -From: LN Liberda <[email protected]> -Date: Tue, 20 Jan 2026 17:01:22 -0800 -Subject: [PATCH] Fixes for safe_browsing_use_unrar=false - -Bug: none -Change-Id: Ie58652c7b7262d74cd9bd9cb88286aed3fda4426 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7493269 -Commit-Queue: Xinghui Lu <[email protected]> -Reviewed-by: Xinghui Lu <[email protected]> -Reviewed-by: Daniel Rubery <[email protected]> -Cr-Commit-Position: refs/heads/main@{#1571974} ---- a/chrome/services/file_util/BUILD.gn -+++ b/chrome/services/file_util/BUILD.gn -@@ -25,7 +25,6 @@ source_set("file_util") { - "//components/safe_browsing:buildflags", - "//extensions/buildflags", - "//mojo/public/cpp/bindings", -- "//third_party/unrar", - "//third_party/zlib", - ] - -@@ -36,7 +35,11 @@ source_set("file_util") { - "//mojo/public/mojom/base", - ] - -- defines = [] -+ defines = [ "USE_UNRAR=$safe_browsing_use_unrar" ] -+ -+ if (safe_browsing_use_unrar) { -+ deps += [ "//third_party/unrar" ] -+ } - - if (is_chromeos) { - sources += [ -@@ -67,8 +70,6 @@ source_set("file_util") { - "//chrome/utility/safe_browsing", - "//components/enterprise/obfuscation/core:enterprise_obfuscation", - ] -- -- defines += [ "USE_UNRAR=$safe_browsing_use_unrar" ] - } - - if (enable_extractors) { ---- a/chrome/services/file_util/obfuscated_archive_analysis_delegate.cc -+++ b/chrome/services/file_util/obfuscated_archive_analysis_delegate.cc -@@ -104,6 +104,7 @@ class ObfuscatedZipWriterDelegate : public zip::FileWriterDelegate, - bool closed_ = false; - }; - -+#if USE_UNRAR - class ObfuscatedRarReaderDelegate - : public third_party_unrar::RarReaderDelegate { - public: -@@ -175,6 +176,7 @@ class ObfuscatedRarWriterDelegate - std::unique_ptr<enterprise_obfuscation::DownloadObfuscator> obfuscator_; - bool init_ = false; - }; -+#endif - - } // namespace - -@@ -203,6 +205,7 @@ ObfuscatedArchiveAnalysisDelegate::CreateZipWriterDelegate(base::File file) { - return std::make_unique<ObfuscatedZipWriterDelegate>(std::move(file)); - } - -+#if USE_UNRAR - std::unique_ptr<third_party_unrar::RarReaderDelegate> - ObfuscatedArchiveAnalysisDelegate::CreateRarReaderDelegate(base::File file) { - base::expected<enterprise_obfuscation::ObfuscatedFileReader, -@@ -220,6 +223,7 @@ std::unique_ptr<third_party_unrar::RarWriterDelegate> - ObfuscatedArchiveAnalysisDelegate::CreateRarWriterDelegate(base::File file) { - return std::make_unique<ObfuscatedRarWriterDelegate>(std::move(file)); - } -+#endif - - std::unique_ptr<ArchiveAnalysisDelegate> - ObfuscatedArchiveAnalysisDelegate::CreateNestedDelegate( ---- a/chrome/services/file_util/obfuscated_archive_analysis_delegate.h -+++ b/chrome/services/file_util/obfuscated_archive_analysis_delegate.h -@@ -22,10 +22,12 @@ class ObfuscatedArchiveAnalysisDelegate : public ArchiveAnalysisDelegate { - base::File file) override; - std::unique_ptr<SafeBrowsingZipWriterDelegate> CreateZipWriterDelegate( - base::File file) override; -+#if USE_UNRAR - std::unique_ptr<third_party_unrar::RarReaderDelegate> CreateRarReaderDelegate( - base::File file) override; - std::unique_ptr<third_party_unrar::RarWriterDelegate> CreateRarWriterDelegate( - base::File file) override; -+#endif - std::unique_ptr<ArchiveAnalysisDelegate> CreateNestedDelegate( - base::File extracted_file) override; - ---- a/chrome/services/file_util/regular_archive_analysis_delegate.cc -+++ b/chrome/services/file_util/regular_archive_analysis_delegate.cc -@@ -92,6 +92,7 @@ RegularArchiveAnalysisDelegate::CreateZipWriterDelegate(base::File file) { - return std::make_unique<ZipWriterDelegate>(std::move(file)); - } - -+#if USE_UNRAR - std::unique_ptr<third_party_unrar::RarReaderDelegate> - RegularArchiveAnalysisDelegate::CreateRarReaderDelegate(base::File file) { - return std::make_unique<third_party_unrar::FileReader>(std::move(file)); -@@ -101,6 +102,7 @@ std::unique_ptr<third_party_unrar::RarWriterDelegate> - RegularArchiveAnalysisDelegate::CreateRarWriterDelegate(base::File file) { - return std::make_unique<third_party_unrar::FileWriter>(std::move(file)); - } -+#endif - - std::unique_ptr<ArchiveAnalysisDelegate> - RegularArchiveAnalysisDelegate::CreateNestedDelegate( ---- a/chrome/services/file_util/regular_archive_analysis_delegate.h -+++ b/chrome/services/file_util/regular_archive_analysis_delegate.h -@@ -20,10 +20,12 @@ class RegularArchiveAnalysisDelegate : public ArchiveAnalysisDelegate { - base::File file) override; - std::unique_ptr<SafeBrowsingZipWriterDelegate> CreateZipWriterDelegate( - base::File file) override; -+#if USE_UNRAR - std::unique_ptr<third_party_unrar::RarReaderDelegate> CreateRarReaderDelegate( - base::File file) override; - std::unique_ptr<third_party_unrar::RarWriterDelegate> CreateRarWriterDelegate( - base::File file) override; -+#endif - std::unique_ptr<ArchiveAnalysisDelegate> CreateNestedDelegate( - base::File extracted_file) override; - }; ---- a/chrome/utility/safe_browsing/archive_analysis_delegate.h -+++ b/chrome/utility/safe_browsing/archive_analysis_delegate.h -@@ -28,6 +28,7 @@ class ArchiveAnalysisDelegate { - virtual std::unique_ptr<SafeBrowsingZipWriterDelegate> - CreateZipWriterDelegate(base::File file) = 0; - -+#if USE_UNRAR - // Creates a reader delegate for reading the RAR archive. - virtual std::unique_ptr<third_party_unrar::RarReaderDelegate> - CreateRarReaderDelegate(base::File file) = 0; -@@ -35,6 +36,7 @@ class ArchiveAnalysisDelegate { - // Creates a writer delegate for writing extracted RAR entries. - virtual std::unique_ptr<third_party_unrar::RarWriterDelegate> - CreateRarWriterDelegate(base::File file) = 0; -+#endif - - // Creates a delegate for analyzing a nested archive extracted from the - // current archive. Returns nullptr if the nested archive cannot be handled diff --git a/www-client/chromium/files/cr145-oauth2-client-switches.patch b/www-client/chromium/files/cr145-oauth2-client-switches.patch deleted file mode 100644 index bb15bb15a0a5..000000000000 --- a/www-client/chromium/files/cr145-oauth2-client-switches.patch +++ /dev/null @@ -1,37 +0,0 @@ -From bed3753bad970327ed3839fb1b2cda1a234060dd Mon Sep 17 00:00:00 2001 -From: Matt Jolly <[email protected]> -Date: Sun, 18 Jan 2026 17:34:00 +1000 -Subject: [PATCH] Update OAuth credentials patch for 145 - -Google doesn't let us bake in OAuth2 credentials, and for some time, -Google sign-in has been broken. Arch dealt with this in March, and so -did we to some degree, but in the last few months, our sign-in -credentials have been broken. It appears that we actually did remove API -credentials in March around Chrome 89, but they got added back, perhaps -when rotating newer versions to replace older versions. Work around this -by following Arch's lead: we remove the predefined credentials, as -before, but also we patch Chromium so that people can use their own -easily, using Arch's patch for that. - -Signed-off-by: Matt Jolly <[email protected]> ---- a/google_apis/api_key_cache.cc -+++ b/google_apis/api_key_cache.cc -@@ -235,14 +235,14 @@ ApiKeyCache::ApiKeyCache(const DefaultApiKeys& default_api_keys) { - - std::string default_client_id = CalculateKeyValue( - default_api_keys.google_default_client_id, -- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(), nullptr, -+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(), ::switches::kOAuth2ClientID, - std::string(), environment.get(), command_line, gaia_config, - default_api_keys.allow_override_via_environment, - default_api_keys.allow_unset_values); - std::string default_client_secret = CalculateKeyValue( - default_api_keys.google_default_client_secret, - STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), std::string(), -- nullptr, std::string(), environment.get(), command_line, gaia_config, -+ ::switches::kOAuth2ClientSecret, std::string(), environment.get(), command_line, gaia_config, - default_api_keys.allow_override_via_environment, - default_api_keys.allow_unset_values); - --- -2.52.0 diff --git a/www-client/chromium/files/cr145-revert-to-rollup-wasm.patch b/www-client/chromium/files/cr145-revert-to-rollup-wasm.patch deleted file mode 100644 index c2d53661e742..000000000000 --- a/www-client/chromium/files/cr145-revert-to-rollup-wasm.patch +++ /dev/null @@ -1,90 +0,0 @@ -From dc66bab2e7a13ebfc18b83b70e77a5165ad36521 Mon Sep 17 00:00:00 2001 -From: Matt Jolly <[email protected]> -Date: Fri, 13 Feb 2026 19:25:21 +1000 -Subject: [PATCH] cr145: revert to rollup wasm - -This commit reverts most of 0cea597366df8740da5cc046cde6de2468ba1e56, -where the wasm version of rollup was replaced by a native node module -which is a _collossal pain_ for those of us that can't just download -random binaries from the internet. - -Signed-off-by: Matt Jolly <[email protected]> ---- a/third_party/devtools-frontend/src/front_end/Images/BUILD.gn -+++ b/third_party/devtools-frontend/src/front_end/Images/BUILD.gn -@@ -28,7 +28,7 @@ node_action("generate_css_vars") { - } - - node_action("optimize_images") { -- script = "node_modules/rollup/dist/bin/rollup" -+ script = "node_modules/@rollup/wasm-node/dist/bin/rollup" - - _bundled_entrypoint = target_gen_dir + "/Images.prebundle.js" - _output_file_location = target_gen_dir + "/Images.js" ---- a/third_party/devtools-frontend/src/front_end/models/live-metrics/web-vitals-injected/BUILD.gn -+++ b/third_party/devtools-frontend/src/front_end/models/live-metrics/web-vitals-injected/BUILD.gn -@@ -26,7 +26,7 @@ devtools_module("web-vitals-injected") { - } - - node_action("bundled_library") { -- script = "node_modules/rollup/dist/bin/rollup" -+ script = "node_modules/@rollup/wasm-node/dist/bin/rollup" - - _bundled_entrypoint = target_gen_dir + "/web-vitals-injected.js" - _output_file_location = target_gen_dir + "/web-vitals-injected.generated.js" ---- a/third_party/devtools-frontend/src/front_end/panels/recorder/injected/BUILD.gn -+++ b/third_party/devtools-frontend/src/front_end/panels/recorder/injected/BUILD.gn -@@ -55,7 +55,7 @@ devtools_entrypoint("bundle") { - } - - node_action("bundled_library") { -- script = "node_modules/rollup/dist/bin/rollup" -+ script = "node_modules/@rollup/wasm-node/dist/bin/rollup" - - _bundled_entrypoint = target_gen_dir + "/injected.js" - _output_file_location = target_gen_dir + "/injected.generated.js" ---- a/third_party/devtools-frontend/src/front_end/third_party/codemirror.next/rebuild.sh -+++ b/third_party/devtools-frontend/src/front_end/third_party/codemirror.next/rebuild.sh -@@ -1,6 +1,6 @@ - npm install - ../../../node_modules/.bin/tsc -d -t esnext -m esnext --moduleResolution node bundle.ts --../../../node_modules/rollup/dist/bin/rollup -c -+../../../node_modules/@rollup/wasm-node/dist/bin/rollup -c - rm -rf node_modules bundle.js bundle.d.ts - # Because there's a bug in clang causing it to reformat import lists even where formatting is disabled, run it right away - git cl format --js ---- a/third_party/devtools-frontend/src/front_end/third_party/lit/rebuild.sh -+++ b/third_party/devtools-frontend/src/front_end/third_party/lit/rebuild.sh -@@ -1,6 +1,6 @@ - npm install - ../../../node_modules/.bin/tsc -d -t esnext -m esnext --moduleResolution node src/* --../../../node_modules/rollup/dist/bin/rollup -c -+../../../node_modules/@rollup/wasm-node/dist/bin/rollup -c - rm -rf node_modules src/*.js src/*.d.ts - # Because there's a bug in clang causing it to reformat import lists even where formatting is disabled, run it right away - git cl format --js ---- a/third_party/devtools-frontend/src/inspector_overlay/BUILD.gn -+++ b/third_party/devtools-frontend/src/inspector_overlay/BUILD.gn -@@ -36,7 +36,7 @@ action("build_inspector_overlay") { - "$target_gen_dir/tool_window_controls.css", - "$target_gen_dir/main.js", - devtools_location_prepend + "inspector_overlay/loadCSS.rollup.js", -- devtools_location_prepend + "node_modules/rollup/dist/bin/rollup", -+ devtools_location_prepend + "node_modules/@rollup/wasm-node/dist/bin/rollup", - ] - - outputs = [ "$resources_out_dir/main.js" ] ---- a/third_party/devtools-frontend/src/scripts/devtools_paths.py -+++ b/third_party/devtools-frontend/src/scripts/devtools_paths.py -@@ -65,7 +65,8 @@ def license_checker_path(): - def rollup_path(): - return path.join( - node_modules_path(), -- 'rollup', -+ '@rollup', -+ 'wasm-node', - 'dist', - 'bin', - 'rollup', --- -2.52.0 -
