www-client/chromium: sync with upstream
This commit is contained in:
parent
5a654599e6
commit
4ac6ca465d
2 changed files with 44 additions and 7 deletions
|
@ -1,9 +1,8 @@
|
||||||
DIST chromium-127-clang.tar.xz 50869256 BLAKE2B a25c78c28e1a19bb251ce78831ff8aeea51f0ff0a3fcba4f57e14e676aadba38f248554a52d9f67da8c0ccf533ef9f60b4bbb26f8935914efa2b871444e61d8f SHA512 9033c2dd7dd217917caf3dbed52f72ded18fe81b431edd4ef82fe7c592f7b9fbf6d5d2c8f7ba4ebffb4994bef20579d30aea9dd1ad36db86bec5d0adb6eca062
|
DIST chromium-127-clang.tar.xz 50869256 BLAKE2B a25c78c28e1a19bb251ce78831ff8aeea51f0ff0a3fcba4f57e14e676aadba38f248554a52d9f67da8c0ccf533ef9f60b4bbb26f8935914efa2b871444e61d8f SHA512 9033c2dd7dd217917caf3dbed52f72ded18fe81b431edd4ef82fe7c592f7b9fbf6d5d2c8f7ba4ebffb4994bef20579d30aea9dd1ad36db86bec5d0adb6eca062
|
||||||
DIST chromium-127-rust.tar.xz 151082700 BLAKE2B 53b5e72724425ae97bbb22e128ca5e826a2db5fb49f615c5331cdf6d790c253d58061223ff9fbd7f4deecaa19668e7b905b0a661380f48ce74d7f66a9605be18 SHA512 a47fc0bdbf48da9c8c17c91d9dc1a4a3f09578e82199c0d5843dfb6188803161cdb98d065ee3f85ceaf78efd2c233397c325c4c9f2d19255f38734a81599404b
|
DIST chromium-127-rust.tar.xz 151082700 BLAKE2B 53b5e72724425ae97bbb22e128ca5e826a2db5fb49f615c5331cdf6d790c253d58061223ff9fbd7f4deecaa19668e7b905b0a661380f48ce74d7f66a9605be18 SHA512 a47fc0bdbf48da9c8c17c91d9dc1a4a3f09578e82199c0d5843dfb6188803161cdb98d065ee3f85ceaf78efd2c233397c325c4c9f2d19255f38734a81599404b
|
||||||
DIST chromium-127.0.6533.88.tar.xz 6614557448 BLAKE2B 5940def45d64ccea7bb6d577a2b7c8ac4c4f868dc29dcb9ad03b0ce5459b737c60969ed3403da9d3630c3e2bfb297f2b08a4b58fb6921da8711715ba606268cd SHA512 226384246c17a9dd40f070937d0f1532b2bf7101f2e8707716fdf006cf087f2ab1c5eac719a2a52cf1fa7387e4c57bc088f5ac20d6235bd2dc58cfbfea538363
|
DIST chromium-127.0.6533.119.tar.xz 6621220264 BLAKE2B fdbf51920d3fee096420cb43aee34f2e6cd51f5531829a68bb61003e4607934d2d045fcd6dbe0c35bd433b000bcefc92919da404666d8e304054d9846dafd943 SHA512 9b774d1798ef76264d60ab46cf552fdec54d325ad1010573084c7c132c47319af63d8127fb9e42441412ac365efa57c25ac80963b644b558595b3d5bfad21e9c
|
||||||
DIST chromium-127.0.6533.99.tar.xz 6618098428 BLAKE2B 6a89e4ff8edcda31d8c04ae846c2869a96157b1b07c59614fe5f8fedba1699bc3b4d53adc9c94a0170d3288d8c9282348e275090848fc92a4c06b2e04104248b SHA512 e851e34c0f0b240fa08e60c0cb4373aead7656187bab7fd0dea5bad7cfc6b4ffe38b43f108f20528a508023cdd437b392b5c2ca09a1b1f5f21ba83d4fa88fd99
|
DIST chromium-127.0.6533.99.tar.xz 6618098428 BLAKE2B 6a89e4ff8edcda31d8c04ae846c2869a96157b1b07c59614fe5f8fedba1699bc3b4d53adc9c94a0170d3288d8c9282348e275090848fc92a4c06b2e04104248b SHA512 e851e34c0f0b240fa08e60c0cb4373aead7656187bab7fd0dea5bad7cfc6b4ffe38b43f108f20528a508023cdd437b392b5c2ca09a1b1f5f21ba83d4fa88fd99
|
||||||
DIST chromium-patches-127-1.tar.bz2 4907 BLAKE2B 3d8599c4c75a0993f6627e4570e5059c5cc5036b2f7916685ca75742f483af8c07f22d5ac8a594a64a92bffe0262fd75c2e3417639197558a5bd3da909ac2c65 SHA512 a75a42d5c5c54fd6e53469a229f0f5382eb3108ffa6e7c503ec03fa7e5e8e470291981373e039ff8d7326ab420ad894d7d3cd8a918921438376924f7aa125924
|
DIST chromium-patches-127-1.tar.bz2 4907 BLAKE2B 3d8599c4c75a0993f6627e4570e5059c5cc5036b2f7916685ca75742f483af8c07f22d5ac8a594a64a92bffe0262fd75c2e3417639197558a5bd3da909ac2c65 SHA512 a75a42d5c5c54fd6e53469a229f0f5382eb3108ffa6e7c503ec03fa7e5e8e470291981373e039ff8d7326ab420ad894d7d3cd8a918921438376924f7aa125924
|
||||||
DIST chromium-patches-127.tar.bz2 4545 BLAKE2B cd0221e74a886ad3fc598e92876021b847a92a587ddc66774357ccf06bdd14e23f8bfede9bbe6fd154af8cea570bfa6ee27a2ff393883bd314a7d1326c7260f5 SHA512 938926ecd406d96662a6ed6e9fab9efab156f5691e98c044c75c4d335075f61e80eae2cf3be9b626c01d3542c1785dd0fc63ac31e5cbf1555a8eca3c6aed8c56
|
|
||||||
DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 1d898939df023c59285b27bee552470483ea06375d1ee8d6947b89c5927c23cc7bfec6b49f3b376ece931d11a56f8e2a45791e0f92ad61974fc8c34c1082d89c SHA512 8a71cb007e47cda8e5fe5d185729389e65c48bd322c8ee8b3986bee8571427b959628f2666bda646a3f89ae64197c0957d3626845ff03461dbd5dee4c964d07c
|
DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 1d898939df023c59285b27bee552470483ea06375d1ee8d6947b89c5927c23cc7bfec6b49f3b376ece931d11a56f8e2a45791e0f92ad61974fc8c34c1082d89c SHA512 8a71cb007e47cda8e5fe5d185729389e65c48bd322c8ee8b3986bee8571427b959628f2666bda646a3f89ae64197c0957d3626845ff03461dbd5dee4c964d07c
|
||||||
DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
|
DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
|
||||||
DIST chromium_127.0.6533.88-1raptor0~deb12u2.debian.tar.xz 8675684 BLAKE2B 868de8a681496c5da5aa9ebb8d27c84b35313038da85232c89d58f6ab7a4ac15866e8d0650d5283023aa38ab55da93f3b6a97280afdd1a3cf69a021517bfa8ab SHA512 3afea47fedad9c1374b238028ea642cde603f548af9992fdcff836745cf8c4243d0781f56e8710ca1bb22b0a552944c62a67a4799f8073fbe309d0f5a514c724
|
DIST chromium_127.0.6533.88-1raptor0~deb12u2.debian.tar.xz 8675684 BLAKE2B 868de8a681496c5da5aa9ebb8d27c84b35313038da85232c89d58f6ab7a4ac15866e8d0650d5283023aa38ab55da93f3b6a97280afdd1a3cf69a021517bfa8ab SHA512 3afea47fedad9c1374b238028ea642cde603f548af9992fdcff836745cf8c4243d0781f56e8710ca1bb22b0a552944c62a67a4799f8073fbe309d0f5a514c724
|
||||||
|
|
|
@ -51,7 +51,7 @@ inherit python-any-r1 qmake-utils readme.gentoo-r1 systemd toolchain-funcs virtu
|
||||||
DESCRIPTION="Open-source version of Google Chrome web browser"
|
DESCRIPTION="Open-source version of Google Chrome web browser"
|
||||||
HOMEPAGE="https://www.chromium.org/"
|
HOMEPAGE="https://www.chromium.org/"
|
||||||
PATCHSET_PPC64="127.0.6533.88-1raptor0~deb12u2"
|
PATCHSET_PPC64="127.0.6533.88-1raptor0~deb12u2"
|
||||||
PATCH_V="${PV%%\.*}"
|
PATCH_V="${PV%%\.*}-1"
|
||||||
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
|
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
|
||||||
system-toolchain? (
|
system-toolchain? (
|
||||||
https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
|
https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
|
||||||
|
@ -70,7 +70,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
|
||||||
|
|
||||||
LICENSE="BSD"
|
LICENSE="BSD"
|
||||||
SLOT="0/stable"
|
SLOT="0/stable"
|
||||||
KEYWORDS="arm64"
|
KEYWORDS="~arm64"
|
||||||
IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
|
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="+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 +system-toolchain +vaapi +wayland +widevine"
|
IUSE+=" qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine"
|
||||||
|
@ -97,7 +97,7 @@ COMMON_X_DEPEND="
|
||||||
"
|
"
|
||||||
|
|
||||||
COMMON_SNAPSHOT_DEPEND="
|
COMMON_SNAPSHOT_DEPEND="
|
||||||
system-icu? ( >=dev-libs/icu-71.1:= )
|
system-icu? ( >=dev-libs/icu-73.0:= )
|
||||||
>=dev-libs/libxml2-2.12.4:=[icu]
|
>=dev-libs/libxml2-2.12.4:=[icu]
|
||||||
dev-libs/nspr:=
|
dev-libs/nspr:=
|
||||||
>=dev-libs/nss-3.26:=
|
>=dev-libs/nss-3.26:=
|
||||||
|
@ -121,9 +121,10 @@ COMMON_SNAPSHOT_DEPEND="
|
||||||
kerberos? ( virtual/krb5 )
|
kerberos? ( virtual/krb5 )
|
||||||
vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
|
vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
|
||||||
X? (
|
X? (
|
||||||
|
x11-base/xorg-proto:=
|
||||||
x11-libs/libX11:=
|
x11-libs/libX11:=
|
||||||
x11-libs/libXext:=
|
|
||||||
x11-libs/libxcb:=
|
x11-libs/libxcb:=
|
||||||
|
x11-libs/libXext:=
|
||||||
)
|
)
|
||||||
x11-libs/libxkbcommon:=
|
x11-libs/libxkbcommon:=
|
||||||
wayland? (
|
wayland? (
|
||||||
|
@ -221,7 +222,7 @@ BDEPEND="
|
||||||
>=dev-python/selenium-3.141.0
|
>=dev-python/selenium-3.141.0
|
||||||
>=dev-util/web_page_replay_go-20220314
|
>=dev-util/web_page_replay_go-20220314
|
||||||
)
|
)
|
||||||
dev-util/bindgen
|
>=dev-util/bindgen-0.68.0
|
||||||
)
|
)
|
||||||
>=dev-build/gn-${GN_MIN_VER}
|
>=dev-build/gn-${GN_MIN_VER}
|
||||||
dev-build/ninja
|
dev-build/ninja
|
||||||
|
@ -353,6 +354,36 @@ chromium_extract_rust_version() {
|
||||||
echo $rustc_version
|
echo $rustc_version
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# https://github.com/gentoo/gentoo/pull/28355
|
||||||
|
chromium_tc-ld-is-mold() {
|
||||||
|
local out
|
||||||
|
|
||||||
|
# Ensure ld output is in English.
|
||||||
|
local -x LC_ALL=C
|
||||||
|
|
||||||
|
# First check the linker directly.
|
||||||
|
out=$($(tc-getLD "$@") --version 2>&1)
|
||||||
|
if [[ ${out} == *"mold"* ]] ; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Then see if they're selecting mold via compiler flags.
|
||||||
|
# Note: We're assuming they're using LDFLAGS to hold the
|
||||||
|
# options and not CFLAGS/CXXFLAGS.
|
||||||
|
local base="${T}/test-tc-linker"
|
||||||
|
cat <<-EOF > "${base}.c"
|
||||||
|
int main(void) { return 0; }
|
||||||
|
EOF
|
||||||
|
out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1)
|
||||||
|
rm -f "${base}"*
|
||||||
|
if [[ ${out} == *"mold"* ]] ; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# No mold here!
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
pkg_setup() {
|
pkg_setup() {
|
||||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||||
# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
|
# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
|
||||||
|
@ -370,6 +401,13 @@ pkg_setup() {
|
||||||
einfo "and to be consistent with the upstream \"official\" build optimisations."
|
einfo "and to be consistent with the upstream \"official\" build optimisations."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# 936858
|
||||||
|
if chromium_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
|
||||||
|
|
||||||
LLVM_SLOT=$(chromium_pick_llvm_slot)
|
LLVM_SLOT=$(chromium_pick_llvm_slot)
|
||||||
export LLVM_SLOT # used in src_configure for rust-y business
|
export LLVM_SLOT # used in src_configure for rust-y business
|
||||||
AR=llvm-ar
|
AR=llvm-ar
|
Loading…
Add table
Reference in a new issue