jaredallard/overlay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 2

www-client/chromium: sync with upstream

Browse source
This commit is contained in:
github-actions[bot] 2025-01-29 00:03:07 +00:00 • committed by GitHub
parent d9cf2d698a
commit f4de6eaf0d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 165 additions and 1561 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
www-client/chromium/Manifest
View file

@ -1,9 +1,7 @@
DIST chromium-132.0.6834.110-linux-testdata.tar.xz 299682228 BLAKE2B 93775b8f3ee34484fb93fefd5eb7bd2b2d9c2f26d869a1ae65968a7151b975ccf8b94027b0cbbbce6a1805292da50fbf084dce038c24fdc651fb6d0387c22d1d SHA512 3dd3332a83227d198c8cf9f42bc1d395bcbb2f7f711cdbd2a5f1f804944a37ac5c2f39fc65717a4bb3324c987abbee0a7eefd7048df7811f0edb6db60ffeb340
DIST chromium-132.0.6834.110-linux.tar.xz 2196336616 BLAKE2B a31932fdf003b6fbe59b61804d28e2f321cbb257311f45f732dbc4868cdb844a22521ced70d98a1cec647ef4c3de26d1881210c0a54098c416d9d9e9da214781 SHA512 962c85c16f2c59656347b4804b8766a3669d23764f1802d96af00de889047ce43ebe2cddc511ad9bc88e8e55a0cfc957d7f2b96e9a8680dc6d983293968adf9e
DIST chromium-132.0.6834.159-linux-testdata.tar.xz 299714080 BLAKE2B e6b4691524548d4a316852d88e7f7893571c870375613686fd53503c79cdbf02a4aa2d4a64591ce5069704044031a3579cfab99e439cf2675c4bbbb6011a9f9c SHA512 b20c57e06195fc4a3e12d035d421801a64c3d7dee3ace760e3a8349fdfdbda4c52abcaf01cf0920d668683a7c89a949862b995dd96a98323de2b300ac6067718
DIST chromium-132.0.6834.159-linux.tar.xz 2196432176 BLAKE2B ec797628558a62cd73b47979ecaac5ab50c3af01e6f0b2018a6783e2374f341e48681ff3975333a31d26af06d40e6af3051a123f29442eda1a9d63ef371aef30 SHA512 afe6e8df6a46401fe4d21e3d9e1f06f2bc1c680705b2d79206d933b0c7cad81a5045a46019d8e79bee3e16a57b83a5b9ff024dd570f9f7e29b1784088dd2f01b
DIST chromium-132.0.6834.83-linux-testdata.tar.xz 299789728 BLAKE2B 043d122ef3ee62012cf55ca2754df932d0e48f08df06b78551cb79ec0c4781a52d5333b02645a981748c2c75928ebc91a21d7caf5e248d94b55fbf6ba4f8c974 SHA512 8122b750f22bb61e257b201bac731975f001a801b626d1ca0b037bc8f6cba34fcd104e47efc48c5122838e8196cdec720fb4a30af8ed0f00eb8943bda67da2d0
DIST chromium-132.0.6834.83-linux.tar.xz 2193406712 BLAKE2B 65cd156a97bcb4888ed30fc29f30e58e5c701e371454ad16427898ec8c51d54da10c36d1bc05157ad64ad4ca3e4b8c54cdd81c82f7f4c57abe6af71c8c050b13 SHA512 f5f1e1f620988ae5cbf042eb0acad5cc00bcf1854d3fb78574ea123dbeb8f5b065dff3fbd5f169c6acf3ed4bc7394d066b1bf6de53b8ccf1ac0432cfde8585fe
DIST chromium-133.0.6943.16-linux-testdata.tar.xz 299224176 BLAKE2B 80850cdc182cd8825d3b4ed7392ca00d2b35bd208815ad900e59f493a1d64644c7575b496ee67d761591fa66e6b3b3856b3508abd109a49398c4cd7041073fde SHA512 3c2c3e1236787c39796d6b2b61cc7660d8d6f6b46d5cb554631e3e5a82b209ebcbec0a75174305434bc732af616e48f59a8111153d7d69d4def4919bda604af1
DIST chromium-133.0.6943.16-linux.tar.xz 2300561364 BLAKE2B 017121eae6209b12faa07cfae86d7c81f4a544f8cf7ec7b20d36150902fcc238c76124317a42b59952134a6804411c8a664ac50403edcd4be71d19450c020bee SHA512 942ab013749b7038c143cc4ced89dba28d3420bf50831ab28ed5bc769896ed23aa3a3c51312767a2bc6708cc0800493a6f62fe3b403d5488bdd5b8867fb26e01
DIST chromium-133.0.6943.27-linux-testdata.tar.xz 299232560 BLAKE2B 88cd384d378bab17d622f4d5d58a0173215f4e4b7b4450ae0ac50d9e56270b8012f767a317eb6ace8530e339bf865d7432799dcdb62d227ef3c0c9a3cc5fcbbd SHA512 c8af61effc377b90845ffb2cddf4068c9d5c2e1e50706b94a124ce4c5dd492bd1ea5eff6404d4a7e427619fe1ae68b94c3c7d9698fa4e1246a9d9a4cdd830c1c
DIST chromium-133.0.6943.27-linux.tar.xz 2300194124 BLAKE2B 7219cc54f799cc5ab4d64c90454f47495028ff291d4b96a5c504efdffc993e75d60b906b59211e681263276e1292f0fdcbb46c32c409f9d5dd72aa6d726b66fe SHA512 e7c0fd65782de14b3f9a2be5f2bb5a8ac8cf26216b3924026d0257d94bd82558ea349bfa6f34cff9768a39d7670dcb9144873a4d46ef63b9d4c93c4056a6f728
DIST chromium-134-clang.tar.xz 54177680 BLAKE2B ebe3e42ba0950f067b0febec65e575ec510f64a056e0a1a9dfffebde02809429c98461638784149dc31423ade29f1dbe4b060af06d8371c0ca8d10d83c7d8617 SHA512 4cf26e6f895ca1b268afcde296f2e7c761f99584170e1f3deecb1c5501be2121f173934a4598124bed69d0bd266f799bf03adfdb2190cb9f23c1212072a8bace

38
www-client/chromium/chromium-132.0.6834.110.ebuild → www-client/chromium/chromium-132.0.6834.159.ebuild
View file

@ -25,7 +25,7 @@ RUST_MIN_VER=1.78.0
RUST_NEEDS_LLVM="yes please"
inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 multiprocessing ninja-utils pax-utils
inherit python-any-r1 qmake-utils readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg-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/"
@ -52,7 +52,7 @@ fi
IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
IUSE+=" qt5 qt6 +screencast selinux test +vaapi +wayland +widevine cpu_flags_ppc_vsx3"
IUSE+=" qt6 +screencast selinux test +vaapi +wayland +widevine cpu_flags_ppc_vsx3"
RESTRICT="
!bindist? ( bindist )
!test? ( test )
@ -61,7 +61,6 @@ RESTRICT="
REQUIRED_USE="
!headless? ( || ( X wayland ) )
pgo? ( X !wayland )
qt6? ( qt5 )
screencast? ( wayland )
ffmpeg-chromium? ( bindist proprietary-codecs )
"
@ -133,10 +132,6 @@ COMMON_DEPEND="
x11-libs/cairo:=
x11-libs/gdk-pixbuf:2
x11-libs/pango:=
qt5? (
dev-qt/qtcore:5
dev-qt/qtwidgets:5
)
qt6? ( dev-qt/qtbase:6[gui,widgets] )
)
"
@ -146,7 +141,6 @@ RDEPEND="${COMMON_DEPEND}
x11-libs/gtk+:3[X?,wayland?]
gui-libs/gtk:4[X?,wayland?]
)
qt5? ( dev-qt/qtgui:5[X?,wayland?] )
qt6? ( dev-qt/qtbase:6[X?,wayland?] )
)
virtual/ttf-fonts
@ -171,7 +165,6 @@ BDEPEND="
')
>=app-arch/gzip-1.7
!headless? (
qt5? ( dev-qt/qtcore:5 )
qt6? ( dev-qt/qtbase:6 )
)
$(llvm_gen_dep '
@ -265,7 +258,7 @@ pkg_pretend() {
fi
if use headless; then
local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland")
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
@ -374,6 +367,7 @@ src_prepare() {
"${FILESDIR}/chromium-131-unbundle-icu-target.patch"
"${FILESDIR}/chromium-131-oauth2-client-switches.patch"
"${FILESDIR}/chromium-132-bindgen-custom-toolchain.patch"
"${FILESDIR}/chromium-134-qt5-optional.patch"
)
if use widevine; then
@ -1078,7 +1072,9 @@ chromium_configure() {
else
myconf_gn+=" use_system_minigbm=true"
myconf_gn+=" use_xkbcommon=true"
if use qt5 || use qt6; then
myconf_gn+=" use_qt5=false"
if use qt6; then
myconf_gn+=" use_qt6=true"
local cbuild_libdir=$(get_libdir)
if tc-is-cross-compiler; then
# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
@ -1086,21 +1082,9 @@ chromium_configure() {
cbuild_libdir=${cbuild_libdir:2}
cbuild_libdir=${cbuild_libdir/% }
fi
if use qt5; then
if tc-is-cross-compiler; then
myconf_gn+=" moc_qt5_path=\"${EPREFIX}/${cbuild_libdir}/qt5/bin\""
else
myconf_gn+=" moc_qt5_path=\"$(qt5_get_bindir)\""
fi
fi
if use qt6; then
myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\""
fi
myconf_gn+=" use_qt=true"
myconf_gn+=" use_qt6=$(usex qt6 true false)"
else
myconf_gn+=" use_qt=false"
myconf_gn+=" use_qt6=false"
fi
myconf_gn+=" ozone_platform_x11=$(usex X true false)"
myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
@ -1441,12 +1425,6 @@ pkg_postinst() {
elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
elog "to CHROMIUM_FLAGS in /etc/chromium/default."
fi
if use qt5 && use qt6; then
elog "Chromium automatically selects Qt5 or Qt6 based on your desktop"
elog "environment. To override you need to pass --qt-version=5 or"
elog "--qt-version=6, e.g. by adding it to CHROMIUM_FLAGS in"
elog "/etc/chromium/default."
fi
fi
if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then

1461
www-client/chromium/chromium-133.0.6943.16.ebuild
View file

File diff suppressed because it is too large Load diff

38
www-client/chromium/chromium-133.0.6943.27.ebuild
View file

@ -25,7 +25,7 @@ RUST_MIN_VER=1.78.0
RUST_NEEDS_LLVM="yes please"
inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 multiprocessing ninja-utils pax-utils
inherit python-any-r1 qmake-utils readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg-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/"
@ -52,7 +52,7 @@ fi
IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
IUSE+=" qt5 qt6 +screencast selinux test +vaapi +wayland +widevine"
IUSE+=" qt6 +screencast selinux test +vaapi +wayland +widevine"
RESTRICT="
!bindist? ( bindist )
!test? ( test )
@ -61,7 +61,6 @@ RESTRICT="
REQUIRED_USE="
!headless? ( || ( X wayland ) )
pgo? ( X !wayland )
qt6? ( qt5 )
screencast? ( wayland )
ffmpeg-chromium? ( bindist proprietary-codecs )
"
@ -133,10 +132,6 @@ COMMON_DEPEND="
x11-libs/cairo:=
x11-libs/gdk-pixbuf:2
x11-libs/pango:=
qt5? (
dev-qt/qtcore:5
dev-qt/qtwidgets:5
)
qt6? ( dev-qt/qtbase:6[gui,widgets] )
)
"
@ -146,7 +141,6 @@ RDEPEND="${COMMON_DEPEND}
x11-libs/gtk+:3[X?,wayland?]
gui-libs/gtk:4[X?,wayland?]
)
qt5? ( dev-qt/qtgui:5[X?,wayland?] )
qt6? ( dev-qt/qtbase:6[X?,wayland?] )
)
virtual/ttf-fonts
@ -171,7 +165,6 @@ BDEPEND="
')
>=app-arch/gzip-1.7
!headless? (
qt5? ( dev-qt/qtcore:5 )
qt6? ( dev-qt/qtbase:6 )
)
$(llvm_gen_dep '
@ -265,7 +258,7 @@ pkg_pretend() {
fi
if use headless; then
local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland")
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
@ -374,6 +367,7 @@ src_prepare() {
"${FILESDIR}/chromium-131-unbundle-icu-target.patch"
"${FILESDIR}/chromium-131-oauth2-client-switches.patch"
"${FILESDIR}/chromium-132-bindgen-custom-toolchain.patch"
"${FILESDIR}/chromium-134-qt5-optional.patch"
)
if use widevine; then
@ -1079,7 +1073,9 @@ chromium_configure() {
else
myconf_gn+=" use_system_minigbm=true"
myconf_gn+=" use_xkbcommon=true"
if use qt5 || use qt6; then
myconf_gn+=" use_qt5=false"
if use qt6; then
myconf_gn+=" use_qt6=true"
local cbuild_libdir=$(get_libdir)
if tc-is-cross-compiler; then
# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
@ -1087,21 +1083,9 @@ chromium_configure() {
cbuild_libdir=${cbuild_libdir:2}
cbuild_libdir=${cbuild_libdir/% }
fi
if use qt5; then
if tc-is-cross-compiler; then
myconf_gn+=" moc_qt5_path=\"${EPREFIX}/${cbuild_libdir}/qt5/bin\""
else
myconf_gn+=" moc_qt5_path=\"$(qt5_get_bindir)\""
fi
fi
if use qt6; then
myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\""
fi
myconf_gn+=" use_qt=true"
myconf_gn+=" use_qt6=$(usex qt6 true false)"
else
myconf_gn+=" use_qt=false"
myconf_gn+=" use_qt6=false"
fi
myconf_gn+=" ozone_platform_x11=$(usex X true false)"
myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
@ -1443,12 +1427,6 @@ pkg_postinst() {
elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
elog "to CHROMIUM_FLAGS in /etc/chromium/default."
fi
if use qt5 && use qt6; then
elog "Chromium automatically selects Qt5 or Qt6 based on your desktop"
elog "environment. To override you need to pass --qt-version=5 or"
elog "--qt-version=6, e.g. by adding it to CHROMIUM_FLAGS in"
elog "/etc/chromium/default."
fi
fi
if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then

44
www-client/chromium/chromium-134.0.6974.3.ebuild
View file

@ -42,7 +42,7 @@ RUST_NEEDS_LLVM="yes please"
RUST_OPTIONAL="yes" # Not actually optional, but we don't need system Rust (or LLVM) with USE=bundled-toolchain
inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 multiprocessing ninja-utils pax-utils
inherit python-any-r1 qmake-utils readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg-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/"
@ -77,7 +77,7 @@ fi
IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +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 qt5 qt6 +screencast selinux test +vaapi +wayland +widevine cpu_flags_ppc_vsx3"
IUSE+=" +proprietary-codecs pulseaudio qt6 +screencast selinux test +vaapi +wayland +widevine cpu_flags_ppc_vsx3"
RESTRICT="
!bindist? ( bindist )
!test? ( test )
@ -86,7 +86,6 @@ RESTRICT="
REQUIRED_USE="
!headless? ( || ( X wayland ) )
pgo? ( X !wayland )
qt6? ( qt5 )
screencast? ( wayland )
ffmpeg-chromium? ( bindist proprietary-codecs )
"
@ -150,19 +149,15 @@ COMMON_DEPEND="
media-libs/flac:=
sys-libs/zlib:=[minizip]
!headless? (
X? ( ${COMMON_X_DEPEND} )
>=app-accessibility/at-spi2-core-2.46.0:2
media-libs/mesa:=[X?,wayland?]
cups? ( >=net-print/cups-1.3.11:= )
virtual/udev
x11-libs/cairo:=
x11-libs/gdk-pixbuf:2
x11-libs/pango:=
qt5? (
dev-qt/qtcore:5
dev-qt/qtwidgets:5
)
cups? ( >=net-print/cups-1.3.11:= )
qt6? ( dev-qt/qtbase:6[gui,widgets] )
X? ( ${COMMON_X_DEPEND} )
)
"
RDEPEND="${COMMON_DEPEND}
@ -171,7 +166,6 @@ RDEPEND="${COMMON_DEPEND}
x11-libs/gtk+:3[X?,wayland?]
gui-libs/gtk:4[X?,wayland?]
)
qt5? ( dev-qt/qtgui:5[X?,wayland?] )
qt6? ( dev-qt/qtbase:6[X?,wayland?] )
)
virtual/ttf-fonts
@ -196,7 +190,6 @@ BDEPEND="
')
>=app-arch/gzip-1.7
!headless? (
qt5? ( dev-qt/qtcore:5 )
qt6? ( dev-qt/qtbase:6 )
)
!bundled-toolchain? ( $(llvm_gen_dep '
@ -291,7 +284,7 @@ pkg_pretend() {
fi
if use headless; then
local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland")
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
@ -414,6 +407,7 @@ src_prepare() {
"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
"${FILESDIR}/chromium-131-unbundle-icu-target.patch"
"${FILESDIR}/chromium-134-oauth2-client-switches.patch"
"${FILESDIR}/chromium-134-qt5-optional.patch"
)
if use widevine; then
@ -1165,7 +1159,9 @@ chromium_configure() {
else
myconf_gn+=" use_system_minigbm=true"
myconf_gn+=" use_xkbcommon=true"
if use qt5 || use qt6; then
myconf_gn+=" use_qt5=false"
if use qt6; then
myconf_gn+=" use_qt6=true"
local cbuild_libdir=$(get_libdir)
if tc-is-cross-compiler; then
# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
@ -1173,21 +1169,9 @@ chromium_configure() {
cbuild_libdir=${cbuild_libdir:2}
cbuild_libdir=${cbuild_libdir/% }
fi
if use qt5; then
if tc-is-cross-compiler; then
myconf_gn+=" moc_qt5_path=\"${EPREFIX}/${cbuild_libdir}/qt5/bin\""
else
myconf_gn+=" moc_qt5_path=\"$(qt5_get_bindir)\""
fi
fi
if use qt6; then
myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\""
fi
myconf_gn+=" use_qt=true"
myconf_gn+=" use_qt6=$(usex qt6 true false)"
else
myconf_gn+=" use_qt=false"
myconf_gn+=" use_qt6=false"
fi
myconf_gn+=" ozone_platform_x11=$(usex X true false)"
myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
@ -1282,7 +1266,7 @@ chromium_compile() {
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/libqt5_shim.so
usr/lib64/chromium-browser/libqt6_shim.so
usr/lib64/chromium-browser/libvk_swiftshader.so
usr/lib64/chromium-browser/libvulkan.so.1
"
@ -1547,12 +1531,6 @@ pkg_postinst() {
elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
elog "to CHROMIUM_FLAGS in /etc/chromium/default."
fi
if use qt5 && use qt6; then
elog "Chromium automatically selects Qt5 or Qt6 based on your desktop"
elog "environment. To override you need to pass --qt-version=5 or"
elog "--qt-version=6, e.g. by adding it to CHROMIUM_FLAGS in"
elog "/etc/chromium/default."
fi
fi
if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then

133
www-client/chromium/files/chromium-134-qt5-optional.patch Normal file
View file

@ -0,0 +1,133 @@
https://chromium.googlesource.com/chromium/src/+/0d8d0e0943489b59e452b4d0214959821880ad7f
From: Matt Jolly <kangie@gentoo.org>
Date: Tue, 28 Jan 2025 12:00:57 -0800
Subject: [PATCH] UI: make QT5 optional
To build with `use_qt6`, QT5 (`use_qt`) is also required.
This is undesirable for downstreams who are actively working
to drop support for QT5 (e.g. Gentoo).
To resolve this:
- Add `use_qt5`
- Replace most `use_qt` conditionals with this option;
these appear to be from before QT6 support was added.
- Use `use_qt5` to gate some previously unconditional QT5-related
items in chrome/installer/linux
- Remove `use_qt` as an argument, instead set to `use_qt5 || use_qt6`.
This change should not impact the current behaviour; if no options
are selected QT5 and QT6 support will be enabled, using existing logic
unless one is explicitly disabled with `use_qt{x}=false`.
See-also: https://bugs.gentoo.org/926166, https://bugs.gentoo.org/948836
Signed-off-by: Matt Jolly <kangie@gentoo.org>
Fixed: 328182252
Change-Id: I22ec7a068356412d3f9fce68a19aee4f8c89892c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6205488
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1412471}
--- a/chrome/installer/linux/BUILD.gn
+++ b/chrome/installer/linux/BUILD.gn
@@ -77,10 +77,10 @@ if (enable_swiftshader) {
packaging_files += [ "$root_out_dir/vk_swiftshader_icd.json" ]
}
-if (use_qt) {
- # Even though this is a shared library, add it to `packaging_files` instead of
- # `packaging_files_shlibs` to skip the dependency check. This is intentional
- # to prevent a hard dependency on QT for the package.
+# Even though this is a shared library, add it to `packaging_files` instead of
+# `packaging_files_shlibs` to skip the dependency check. This is intentional
+# to prevent a hard dependency on QT for the package.
+if (use_qt5) {
packaging_files += [ "$root_out_dir/libqt5_shim.so" ]
}
if (use_qt6) {
@@ -206,7 +206,7 @@ if (build_with_internal_optimization_guide) {
}
}
-if (use_qt) {
+if (use_qt5) {
strip_binary("strip_qt5_shim") {
binary_input = "$root_out_dir/libqt5_shim.so"
deps = [ "//ui/qt:qt5_shim" ]
@@ -399,7 +399,7 @@ group("installer_deps") {
"//components/optimization_guide/internal:optimization_guide_internal",
]
}
- if (use_qt) {
+ if (use_qt5) {
public_deps += [
":strip_qt5_shim",
"//ui/qt:qt5_shim",
--- a/ui/qt/BUILD.gn
+++ b/ui/qt/BUILD.gn
@@ -101,10 +101,12 @@ template("qt_shim") {
}
}
}
-qt_shim("qt5_shim") {
- qt_version = "5"
- if (!use_sysroot) {
- moc_qt_path = "$moc_qt5_path"
+if (use_qt5) {
+ qt_shim("qt5_shim") {
+ qt_version = "5"
+ if (!use_sysroot) {
+ moc_qt_path = "$moc_qt5_path"
+ }
}
}
if (use_qt6) {
@@ -122,7 +124,10 @@ component("qt") {
defines = [ "IS_QT_IMPL" ]
# qt_shim is in data_deps since we want to load it manually.
- data_deps = [ ":qt5_shim" ]
+ data_deps = []
+ if (use_qt5) {
+ data_deps += [ ":qt5_shim" ]
+ }
if (use_qt6) {
data_deps += [ ":qt6_shim" ]
}
--- a/ui/qt/qt.gni
+++ b/ui/qt/qt.gni
@@ -6,27 +6,20 @@ import("//build/config/cast.gni")
import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/sysroot.gni")
+# TODO(crbug.com/40260415): Allow QT in MSAN builds once QT is
+# added to the instrumented libraries.
declare_args() {
- # TODO(crbug.com/40260415): Allow QT in MSAN builds once QT is
- # added to the instrumented libraries.
- use_qt = is_linux && !is_castos && !is_msan
+ use_qt5 = use_sysroot && is_linux && !is_castos && !is_msan
+ use_qt6 = use_sysroot && is_linux && !is_castos && !is_msan
}
declare_args() {
- if (!use_sysroot && use_qt) {
+ if (!use_sysroot && use_qt5) {
moc_qt5_path = ""
}
-}
-
-declare_args() {
- use_qt6 = use_qt && use_sysroot
-}
-
-declare_args() {
if (!use_sysroot && use_qt6) {
moc_qt6_path = ""
}
}
-# use_qt6 => use_qt
-assert(!use_qt6 || use_qt)
+use_qt = use_qt5 || use_qt6