diff options
| author |   Stephan Hartmann <sultan@gentoo.org> | 2022-03-03 19:09:03 +0100 |
|---|---|---|
| committer | Stephan Hartmann <sultan@gentoo.org> | 2022-03-03 19:09:36 +0100 |
| commit | 52824df723a9b604fb9741028a9e35b2e01af339 (patch) | |
| tree | 8eb660be3572f87e8df9825f3c04003cda5b7686 | |
| parent | dev-python/pivy: removed obsolete 0.6.6 (diff) | |
| download | gentoo-52824df7.tar.gz gentoo-52824df7.tar.bz2 gentoo-52824df7.zip | |
www-client/chromium: dev channel bump to 100.0.4896.20
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Stephan Hartmann <sultan@gentoo.org>
| -rw-r--r-- | www-client/chromium/Manifest | 2 | ||||
| -rw-r--r-- | www-client/chromium/chromium-100.0.4896.20.ebuild (renamed from www-client/chromium/chromium-100.0.4896.12.ebuild) | 1 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-100-FindByDottedPath-nullptr.patch | 35 |
3 files changed, 1 insertions, 37 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index ee7887ff9efc..d55771717801 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,5 +1,5 @@ DIST chromium-100-patchset-4.tar.xz 5676 BLAKE2B aaa96413cc44ea75d2664b7d85130ca6f9ea4dfe736278806bb846baf97838fc1c8412b0320b8b22d5a2946fe1fb23fae244e297b924baafeb7a4983dab7e292 SHA512 3f88272d42f30112733e5e7473aec9dc31458386b34192ee34465b7045f63b0e8d496cddfc7efb2156cd8a9a84efd68437c1b194be13595cbe6e3736dcc187c9 -DIST chromium-100.0.4896.12.tar.xz 1350939468 BLAKE2B c6fdb5142991ff58d426875463f43ac4c7622e865804b8c3577848cff4643113ae5fdeb6aad64e854f84ab1dc183cc0f4d7110895718424075b2d3ad156957ae SHA512 b04a8df2df44d3d747e52a5f778c5ad7046e6d8c52e6bbd1463e011a4211cf42dbd2ff52c4d4f146142387d67ee3fadcdf6f6cc526ab0a1fa5917525ce190a12 +DIST chromium-100.0.4896.20.tar.xz 1351401408 BLAKE2B 34efdfc4a369c9d39b6002e07655984f39f01f491b7afed8bb77baf73e56b435d7fbb6e7eef0c44dcd081248a517f1d250955c25c693bb41fab944a0ebfe549d SHA512 5f28027968011dcb712dc3d771c6d112d4596e381a1418e01aa1f4cbd1ab03586fb641eddb4cacd5ea9c153353e09fdf563d263315af483c4f015b4db8e7235b DIST chromium-98-patchset-5.tar.xz 4928 BLAKE2B f96fb34d5cb3c3ac2c6e327805322e5d6047b0b190a043795de1063c934ca6400800aafaaa4eea7ebad571298b96bf67e48ee0d2d1eb3e0bf23b14932734e026 SHA512 fae1010b91af7e6aa981ea22fc15c32a510b3e78ab71fec73b65290d963dfe6c42e5a2965446803519356858b60cd587018b1b2aea36e112e4d315efbdad7d8f DIST chromium-98.0.4758.102.tar.xz 1242565220 BLAKE2B f3c52961f62697108ee993fb2e5f2117d45f4ec3b1bd31a326f9b10cf3f5e62bbbc6b3dd5257da5fb248df6cf7ad5b8b169d6967ab952916d76a16951cdf81ad SHA512 7bcbeb8c8701b77e6143a811667dbc00d6b36a16b2256ced66d7ad49dafdb1f9fede61811e4ddd2aff478bda604aad5ce675261c2cb5f16722ff6d55bdf803a4 DIST chromium-99-patchset-3.tar.xz 3912 BLAKE2B 79030156e81ebd6b3c348fb429e23d0c866059e047e7cdc0f656a1b1ee290f3afa8b358d0e1df18a86616a35a9a256e7432a5ab4e9b952c7a360aed871236659 SHA512 63d951cb3d17c1d02d9ddbee3a44aca000c5ba2f908012584944ce7fc435aebfe39b9628d4bd043df97c4dd7afa0ad614c65368ca759b64a84654126f06f9ea8 diff --git a/www-client/chromium/chromium-100.0.4896.12.ebuild b/www-client/chromium/chromium-100.0.4896.20.ebuild index be7eb8d4d52b..72ca6cc04b28 100644 --- a/www-client/chromium/chromium-100.0.4896.12.ebuild +++ b/www-client/chromium/chromium-100.0.4896.20.ebuild @@ -246,7 +246,6 @@ src_prepare() { "${FILESDIR}/chromium-97-arm-tflite-cast.patch" "${FILESDIR}/chromium-98-EnumTable-crash.patch" "${FILESDIR}/chromium-98-gtk4-build.patch" - "${FILESDIR}/chromium-100-FindByDottedPath-nullptr.patch" "${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch" "${FILESDIR}/chromium-shim_headers.patch" "${FILESDIR}/chromium-cross-compile.patch" diff --git a/www-client/chromium/files/chromium-100-FindByDottedPath-nullptr.patch b/www-client/chromium/files/chromium-100-FindByDottedPath-nullptr.patch deleted file mode 100644 index a8115a6741f8..000000000000 --- a/www-client/chromium/files/chromium-100-FindByDottedPath-nullptr.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ae21059c1d1aed902da40dd7502fbca9c5cf8e3f Mon Sep 17 00:00:00 2001 -From: Daniel Cheng <dcheng@chromium.org> -Date: Sat, 19 Feb 2022 21:38:32 -0800 -Subject: [PATCH] Add missing null check in base::Value::Dict::FindByDottedPath() - -This happens to not crash through sheer luck most of the time. -`GetIfDict()`'s implementation looks like: - - return absl::get_if<Value::Dict>(&data_); - -`data_` is the first member of `base::Value::Dict`, and so `&data_` -evaluates to a null pointer. `absl::get_if<T>()` returns `nullptr` if -the input pointer is null, so it happens to silently (but incorrectly) -work most of the time. - -Fixed: 1299245 -Change-Id: I95ac65542b27f1ee0f7ce0bdec4575035a953820 - -(without unittest) ---- - -diff --git a/base/values.cc b/base/values.cc -index 25feea9..fcb00bf 100644 ---- a/base/values.cc -+++ b/base/values.cc -@@ -608,6 +608,9 @@ - if (!splitter.HasNext()) { - return current_value; - } -+ if (!current_value) { -+ return nullptr; -+ } - current_dict = current_value->GetIfDict(); - if (!current_dict) { - return nullptr; |