summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Jolly <kangie@gentoo.org>2024-05-20 15:58:25 +1000
committerMatt Jolly <kangie@gentoo.org>2024-05-21 15:52:49 +1000
commit2768b5411d655e8cca7b2d663253831ad540be00 (patch)
treebcfacb67553f5583c195b5ec9a792a10e2daead5
parentmedia-video/ffmpeg-chromium: add 126 (diff)
downloadgentoo-2768b5411d655e8cca7b2d663253831ad540be00.tar.gz
gentoo-2768b5411d655e8cca7b2d663253831ad540be00.tar.bz2
gentoo-2768b5411d655e8cca7b2d663253831ad540be00.zip
www-client/chromium: add 126.0.6478.8, drop 125.0.6422.26
- Update for Python 3.13 - Make clang18 workaround more strict (only applies if Major Ver = 18 and Mirco Ver < 6); this should give bad versions time to age out while reducing impact on up-to-date users. Signed-off-by: Matt Jolly <kangie@gentoo.org>
-rw-r--r--www-client/chromium/Manifest5
-rw-r--r--www-client/chromium/chromium-126.0.6478.8.ebuild (renamed from www-client/chromium/chromium-125.0.6422.26.ebuild)17
-rw-r--r--www-client/chromium/files/chromium-126-oauth2-client-switches.patch45
3 files changed, 57 insertions, 10 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ee9effab0841..749210c250d6 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -4,10 +4,13 @@ DIST chromium-124.0.6367.155.tar.xz 3446276744 BLAKE2B af057b9c1053878294ce3a4dd
DIST chromium-124.0.6367.207.tar.xz 3450794132 BLAKE2B b5e66e5483e48f165dcdb4c4e540913c2e4d4f93550beb1c529502122e5850594d555057e02c762a5ac2d0cc5ee5531476a5adda4ee1b43a39e0e6fcfe27ccbe SHA512 4ab47f51653b214d78215a95ff6c52db7f1f0d9bf331ec67a9b74109be8df66e84ebc927794a74777e692a77cdfd7d3fdba79190e0a70e18ee975e33050941df
DIST chromium-125-clang.tar.xz 50745124 BLAKE2B 6d9a8752a648c5e202c5597dd1adf52af9d37784166f75ab803a6dfbb4cd88e57f88851052f005d388020cd840d6854cbd295220f519325d5bfa3174ed9115dd SHA512 32200f39c1d4a24db30d67bfd324490c9fe4fcba2efb7bf83b6db14944a772cdd256dad93d7e23bf9efefc6c98007afde06ba7f8f2a1aafa7e27457e2193e23c
DIST chromium-125-rust.tar.xz 150461068 BLAKE2B b62fd93d4de25803da5eb98f67c25c455d7ae8e86f202e614bcbe9787957e63ec01ef3eabde3eb7a69d51d25a95a32577477e69ab71c008dcb55411f6d755433 SHA512 6cedf2cfdfefea782c7f1b1b13daae8e44f0678cb2a92454cdea5cd95ada14bd331fc5634da0267369743ab31d9d73ec30d971bdd7a9b68c2f2270a22c552b8c
-DIST chromium-125.0.6422.26.tar.xz 3444217168 BLAKE2B 102b7c49728717e3f76760fd2b92a666423c9d86fd68acce41c06fcf39b8724b3bd14934d2760d3fbc5aeabf7a2052894a0829addfba0ee44bfba37adbdf21e9 SHA512 75c026bde0fc9c9020af6883c8a4fcf0beb6c4d46be390b3bedadc07899b7cca10f91931425c19128d55206f61ab9953373826c67b11bbfbcf2f883802a48733
DIST chromium-125.0.6422.60.tar.xz 3453234996 BLAKE2B 67b98557fdff66d6f74363820a07ae0e22c2e0b9ce1ba23b14d59b9baea7a3b727db85e158c525a111b686ce8fcdc8f3cc28e07c2b049e36dba6acf131572e57 SHA512 531bebdd363373f12c3f978cbba9de47cf99386c0ea15a9723d92f5facda50f9beae5a8a5ed8f4e49f3787f1c616b3cd45b852f872f3559b14fc64673d4b4de6
+DIST chromium-126-clang.tar.xz 50615992 BLAKE2B 293709399ddf343ba195cec452974178228ebb72921931ad58136351956b881f8dc0bc8ca740252bcd4971701c9ee8ccc0a33648aee25a5b1cece56e0af6b83f SHA512 7bb2938b1df452585d0ee93da3bcf9c3e64e88e39059a713fe21758df670190b12ca002ef2764dc99efdb4284b4c4b7cde861e2e495d99956c21120a51b8c3dc
+DIST chromium-126-rust.tar.xz 150643432 BLAKE2B d9c827008a2fae07977628beccdf3cf4e5d9bf3c9728e4b2839c8bc86ee2f87844921064e30c067a1b620a3d53cbf54a74053172b1436239332fc668f772924d SHA512 431c0305a81e59da231d56f1b119226b661d7f5a93d0da92afbfc384b0e5be28f282c2911137983298a5369c93b60184d41875ec63b47048a782ee2b1301fc77
+DIST chromium-126.0.6478.8.tar.xz 4133359308 BLAKE2B bb9bdeace0119730c74ed2d7399df05ca8913f30e2f848c4107a8482654e7cf725c163ac0bf17fee1568772553af00799ef3d0ea315e617e51efe150105db6ff SHA512 e4e9a9779f074061b7ea36afbfa40f69f9228765262a65b8d6714d50e75d56060e0e23485bbd143dba4ccc6183fdec18c9af1c873bb3aa6cee063e90e6cbf4fd
DIST chromium-patches-124.tar.bz2 4706 BLAKE2B 5acae233ce7b43669dbf65c368467f94c9a0ec509713ec4510943ede12d495dad1670a5c0a7435e0e16251c7429145e575cb1c9661439ff1c626d709856b6a94 SHA512 3d0d365b6d484def626153b07c0ab187195f27ebada63bd2547b52ed1e2157aab2415a6140c293a140d7a0545ae0fc1cdd431b37fa0c4a212a34c13baccb358c
DIST chromium-patches-125.tar.bz2 4688 BLAKE2B 96cffec1931f59bfad53efee930292ca123e3daf3cf6f062583aae15853283c32ce2f564de7e35b678a34ed7981d5e8796059d00d5409c31d3e2e5839f93cf9c SHA512 fe4173b2409002d52fd443e87ce4894b53d0b24808f002766942086b99174cb9da42b6e7f92d80d6432d78d7ae3458265ec6cf091a76d0e4e25b44dfdd438dcf
+DIST chromium-patches-126.tar.bz2 4538 BLAKE2B c1f224015618ec908ef09d0c04a2243923371e2caeccd60d93747599fd1434b284291a5b4326008db21749cf78827d5a4b50d22fc805dcd3c1fd86303dc82729 SHA512 6692075adac0379b5f27d1023de1a051cf7f7f7138efd32dfc3af0d501b714142a16daf18022bb46d92218587f364f4dafe9f4aea24f6826e88b0e7cc2be7d0b
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_123.0.6312.105-1raptor0~deb12u1.debian.tar.xz 579484 BLAKE2B 587082358377f7bc0dca0dec83772abb7e040ad894ca4d456a294b7f5c19297acbc5b1dac725d3c1dbaaeefd480328c6c06c607438e560aa6359c1e98c4b1c9c SHA512 6b670a139e284cc96da65ff3c1b3e715cd9b436de2404792d619cfad23e2040fd931e7cc49f0b1ac17e11522804a4c9a621cb943e0dab33fb5bf422e954c5421
diff --git a/www-client/chromium/chromium-125.0.6422.26.ebuild b/www-client/chromium/chromium-126.0.6478.8.ebuild
index 595006853106..11b4f1f6b96b 100644
--- a/www-client/chromium/chromium-125.0.6422.26.ebuild
+++ b/www-client/chromium/chromium-126.0.6478.8.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..13} )
PYTHON_REQ_USE="xml(+)"
# PACKAGING NOTES
@@ -43,8 +43,8 @@ LLVM_MAX_SLOT=19
LLVM_MIN_SLOT=17
RUST_MIN_VER=1.72.0
# chromium-tools/get-chromium-toolchain-strings.sh
-GOOGLE_CLANG_VER=llvmorg-19-init-8091-gab037c4f-1
-GOOGLE_RUST_VER=ab71ee7a9214c2793108a41efb065aa77aeb7326-1
+GOOGLE_CLANG_VER=llvmorg-19-init-9433-g76ea5feb-1
+GOOGLE_RUST_VER=31e6e8c6c5b6ce62656c922c7384d3376018c980-2
# https://bugs.chromium.org/p/v8/issues/detail?id=14449 - V8 used in 120 can't build with GCC
# Resolved upstream, requires testing and some backporting I'm sure
@@ -422,13 +422,11 @@ src_prepare() {
"chrome/browser/media/router/media_router_feature.cc" || die
local PATCHES=(
- "${FILESDIR}/chromium-cross-compile.patch"
"${FILESDIR}/chromium-109-system-zlib.patch"
"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
- "${FILESDIR}/chromium-124-libwebp-shim-sharpyuv.patch"
- "${FILESDIR}/chromium-125-oauth2-client-switches.patch"
"${FILESDIR}/chromium-125-system-zstd.patch"
- "${FILESDIR}/chromium-125-ninja-1-12.patch"
+ "${FILESDIR}/chromium-126-oauth2-client-switches.patch"
+ "${FILESDIR}/chromium-cross-compile.patch"
)
if use system-toolchain; then
@@ -471,7 +469,6 @@ src_prepare() {
local keeplibs=(
base/third_party/cityhash
base/third_party/double_conversion
- base/third_party/dynamic_annotations
base/third_party/icu
base/third_party/nspr
base/third_party/superfasthash
@@ -658,6 +655,8 @@ src_prepare() {
third_party/s2cellid
third_party/securemessage
third_party/selenium-atoms
+ third_party/sentencepiece
+ third_party/sentencepiece/src/third_party/darts_clone
third_party/shell-encryption
third_party/simplejson
third_party/skia
@@ -817,7 +816,7 @@ chromium_configure() {
# Workaround for build failure with clang-18 and -march=native without
# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
use amd64 && is-flagq -march=native &&
- [[ $(clang-major-version) -ge 18 ]] &&
+ [[ $(clang-major-version) -eq 18 ]] && [[ $(clang-minor-version) -lt 6 ]] &&
tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
append-flags -mevex512
else
diff --git a/www-client/chromium/files/chromium-126-oauth2-client-switches.patch b/www-client/chromium/files/chromium-126-oauth2-client-switches.patch
new file mode 100644
index 000000000000..b7ddf794aa27
--- /dev/null
+++ b/www-client/chromium/files/chromium-126-oauth2-client-switches.patch
@@ -0,0 +1,45 @@
+From b6cda4bc2283a02a5b5209c0f4282a8365f6f33e Mon Sep 17 00:00:00 2001
+From: Matt Jolly <Matt.Jolly@footclan.ninja>
+Date: Tue, 21 May 2024 10:04:24 +1000
+Subject: [PATCH] www-client/chromium: work around dead oauth2 credentials -
+ 126 update
+
+126 changed the function proto; patch rebased.
+
+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.
+
+For more info, see:
+
+https://archlinux.org/news/chromium-losing-sync-support-in-early-march/
+https://bodhi.fedoraproject.org/updates/FEDORA-2021-48866282e5
+https://hackaday.com/2021/01/26/whats-the-deal-with-chromium-on-linux-google-at-odds-with-package-maintainers/
+
+Bug: https://bugs.gentoo.org/791871
+Signed-off-by: Matt Jolly <kangie@gentoo.org>
+--- a/google_apis/google_api_keys-inc.cc
++++ b/google_apis/google_api_keys-inc.cc
+@@ -193,11 +193,11 @@ class APIKeyCache {
+ std::string default_client_id = CalculateKeyValue(
+ GOOGLE_DEFAULT_CLIENT_ID,
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(),
+- nullptr, std::string(), environment.get(), command_line, gaia_config);
++ ::switches::kOAuth2ClientID, std::string(), environment.get(), command_line, gaia_config);
+ std::string default_client_secret = CalculateKeyValue(
+ 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);
+
+ // We currently only allow overriding the baked-in values for the
+ // default OAuth2 client ID and secret using a command-line
+--
+2.45.1
+