commit: daf3009f01504b783a89ce1823b471a546bd855e Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> AuthorDate: Sun Feb 20 14:11:16 2022 +0000 Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> CommitDate: Sun Feb 20 14:11:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daf3009f
www-client/chromium: dev channel bump to 100.0.4892.0 Bug: https://bugs.gentoo.org/833619 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> www-client/chromium/Manifest | 4 +-- ....4878.0.ebuild => chromium-100.0.4892.0.ebuild} | 7 ++--- .../chromium-100-FindByDottedPath-nullptr.patch | 35 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 4729cd5f5657..d4a77beb8b96 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,5 +1,5 @@ -DIST chromium-100-patchset-2.tar.xz 5236 BLAKE2B e16bec015bd76b0129168e3c74e616d650d6d3e289fca4ecbfe4488ac94da47ba040366c71f0218a0d667ed5e9be67ec490452e83db70dc5b52c468327770b6b SHA512 7acaaca93a7478f7086d01f3bbd24381b14063548106002af050d2a38375b5ad6480167c38b4d7f304774a33fb1ca7806e610970e293812fa843f7c1ee372804 -DIST chromium-100.0.4878.0.tar.xz 1347295152 BLAKE2B f0cf6120bbaad695607440b5ce504ed5922a3378e23000e87296a8634c26caedad7fa9be0f3554c36f7b9da408fc7fb96495951dbf5eef37485ce61f3d9de6bc SHA512 38878447548d01a3b3a0681955c06f448b3bfc9a589aa8610ac233cab50072cb1a11b6d43c24573d79d4837417ceebe8f8f5a0e2ec9d45b9e2251b74659a9435 +DIST chromium-100-patchset-3.tar.xz 4664 BLAKE2B a7f1798b115ad885d4341ba5081e3c3c8c02665d714cede0a65a4b81713e5feab0836ca04405351245603a3818fd4fd7422bdc826112f9972477a55451d5fbf5 SHA512 215d655572fd0629a1a9b7597b3cde27456608c37258818f8fa472e098408e318b2d49d8abc2ed7c5a3ef08130de97b20ab4c05a229feb0e7c9d0620b0431d3e +DIST chromium-100.0.4892.0.tar.xz 1349973152 BLAKE2B c858d0fd76121ab03050b0265a6c969658317afa73b734ef7e91dcde5b13e1ccc3c59e0f5cacd5662ac062e6b6c572788d82a2714a1b380a988cb4db500e080a SHA512 fd6cd5e13a931e9e65132e93936064f0514d6285d91d31319a958fae37c8a96b70340b423e8b7f430209850255a13a9104e1d44ecb9038bb0617fc35cf38a5d3 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.4878.0.ebuild b/www-client/chromium/chromium-100.0.4892.0.ebuild similarity index 99% rename from www-client/chromium/chromium-100.0.4878.0.ebuild rename to www-client/chromium/chromium-100.0.4892.0.ebuild index dea4a2b373c0..35bf83892d8b 100644 --- a/www-client/chromium/chromium-100.0.4878.0.ebuild +++ b/www-client/chromium/chromium-100.0.4892.0.ebuild @@ -13,7 +13,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python- DESCRIPTION="Open-source version of Google Chrome web browser" HOMEPAGE="https://chromium.org/"; -PATCHSET="2" +PATCHSET="3" PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}" SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"; @@ -120,7 +120,6 @@ DEPEND="${COMMON_DEPEND} !gtk4? ( x11-libs/gtk+:3[X,wayland?] ) ) " -# dev-vcs/git - https://bugs.gentoo.org/593476 BDEPEND=" ${COMMON_SNAPSHOT_DEPEND} ${PYTHON_DEPS} @@ -131,7 +130,6 @@ BDEPEND=" libcxx? ( >=sys-devel/clang-12 ) dev-lang/perl >=dev-util/gn-0.1807 - dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] @@ -248,6 +246,7 @@ 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" @@ -1000,7 +999,7 @@ pkg_postinst() { 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-webrtc-pipewire-capturer" + elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer" elog "to CHROMIUM_FLAGS in /etc/chromium/default." fi if use gtk4; then diff --git a/www-client/chromium/files/chromium-100-FindByDottedPath-nullptr.patch b/www-client/chromium/files/chromium-100-FindByDottedPath-nullptr.patch new file mode 100644 index 000000000000..a8115a6741f8 --- /dev/null +++ b/www-client/chromium/files/chromium-100-FindByDottedPath-nullptr.patch @@ -0,0 +1,35 @@ +From ae21059c1d1aed902da40dd7502fbca9c5cf8e3f Mon Sep 17 00:00:00 2001 +From: Daniel Cheng <dch...@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;
