Gentoo Archives: gentoo-commits

From: Stephan Hartmann <sultan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/, www-client/chromium/
Date: Sun, 28 Feb 2021 09:16:09
Message-Id: 1614503762.8bf681f550ca32b2d1078b0884903caa580dbff6.sultan@gentoo
1 commit: 8bf681f550ca32b2d1078b0884903caa580dbff6
2 Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 28 09:15:21 2021 +0000
4 Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 28 09:16:02 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bf681f5
7
8 www-client/chromium: beta channel bump to 89.0.4389.69
9
10 Package-Manager: Portage-3.0.13, Repoman-3.0.2
11 Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
12
13 www-client/chromium/Manifest | 2 +-
14 ...4389.58.ebuild => chromium-89.0.4389.69.ebuild} | 1 -
15 .../files/chromium-89-empty-map-crash.patch | 39 ----------------------
16 3 files changed, 1 insertion(+), 41 deletions(-)
17
18 diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
19 index adce3ee13e4..4229742bd54 100644
20 --- a/www-client/chromium/Manifest
21 +++ b/www-client/chromium/Manifest
22 @@ -1,7 +1,7 @@
23 DIST chromium-88-patchset-3.tar.xz 8396 BLAKE2B 4c978f1a6efef3f71e3dd6340c392b74bc6a734b49a9ca43343d03903159dafc66159939f9a6c4b55665ddbe7bd97a26d8d86c285ec02cf76cad5f5cc7410570 SHA512 c39afa26f5b0b9930f6f67ce0c42eefd74c09d528b26bc0db57129b150f75ff83c8b1cb97bd9c5d75f288fb4767cc68c9c5ce89231b4a59f8ca02493e4dd281a
24 DIST chromium-88.0.4324.182.tar.xz 857221352 BLAKE2B 7263294154232533f18d0bc8eeaa7097c3578f8e585ce953c9e6990ec7c9ffbfbd0e69f89c4852c09197aab592877350f54590cf4f0bbec9481886f3fc34548a SHA512 ce8d507645e937107847199b55287ec5522e778851367a19c4cfa4ff5fae18e7c7ea999aa7b0ad0758fab68a003f201bf38ae51e3642388705de2ada9be87730
25 DIST chromium-89-patchset-6.tar.xz 4308 BLAKE2B 22e2db8b5e287925f8b550075e48ad381ccf7ef54e23d8f4e4aedff7fd6cfee8f9e70eff1edb8c867c256ee5ec881ef9379e18278b84b47ff08dcc00f5801667 SHA512 aa5d902c1959f50eb9a0d773a77bf12e5a955d796ee8b18f6e2143573dd73beec62109940e55a858fd9927753dba1d3bf9c1bd940b18a616e7b70b801e93f041
26 -DIST chromium-89.0.4389.58.tar.xz 890700788 BLAKE2B c8310497671ba1e528d31412e51f7dbbcd2a91a4a1537bd6fdd6acabffa4daad59df0fd9aed1ee92d6e07787f856f32b1f04af311bbb6d9e8c44214e330291fe SHA512 617db2e37cf668faf294167aba81be447e3a50c94c0bc8efa9b18964d18ef57c9dac26aae337f79f01773b69ec39c60117eb10fd102016da1f06de65a1979edc
27 +DIST chromium-89.0.4389.69.tar.xz 890779864 BLAKE2B 18f3d744979011cbe2cb50378e18feaf1fe7cb1ba5b2d7ef64dafa8924e0d460c12beaad7dc3145adad70c4de3ab19fae81b49fb03550ee0d3abd2c793a71ddc SHA512 0514648d2a4542b23c27de1a8fc2f46819d527faf4e2fbbde8c98227e8f189bd6fcc9b0bc5b22c67c3f9fa7522006264622118fbbe7fae0bcf39fea162f5daae
28 DIST chromium-90-patchset-5.tar.xz 3272 BLAKE2B 58d018d50dc088fe246e5135a7d2cbac949b499ff115a31f9be1fe9fa82e0dc7d16405edc77bb5f80130c12ed62a8bea2f337b9bb587d7a3e93c4b8f21f0a6ac SHA512 b3bf1a47181e0efde67cf1d8103d3e61920b49b685be7334610daf4a459e910310481aed95bf37e3315b6253807baab034e251d45b766a22b2a7b3c3daee4d8b
29 DIST chromium-90.0.4427.5.tar.xz 916946504 BLAKE2B 487ac72e59e1c3cdd4b4f7727bf0c723a07d583bf8c97d32e1e45541f74e1e9a1af80205e5a5e2fb36ccb876749ed61da4432419dc12fa944634e7b365858e83 SHA512 7e1bd45dd9303783562f9d4483004e48762917313f3b5cbb19af244ae71926f3487b253ee21e98237dd8f4b8ab244b9b8a2c97305b6e714e98ca24d5487c4b87
30 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
31
32 diff --git a/www-client/chromium/chromium-89.0.4389.58.ebuild b/www-client/chromium/chromium-89.0.4389.69.ebuild
33 similarity index 99%
34 rename from www-client/chromium/chromium-89.0.4389.58.ebuild
35 rename to www-client/chromium/chromium-89.0.4389.69.ebuild
36 index 9e6ff4e6370..dca398dbb76 100644
37 --- a/www-client/chromium/chromium-89.0.4389.58.ebuild
38 +++ b/www-client/chromium/chromium-89.0.4389.69.ebuild
39 @@ -233,7 +233,6 @@ src_prepare() {
40 "${WORKDIR}/patches"
41 "${FILESDIR}/chromium-89-webcodecs-deps.patch"
42 "${FILESDIR}/chromium-89-EnumTable-crash.patch"
43 - "${FILESDIR}/chromium-89-empty-map-crash.patch"
44 "${FILESDIR}/chromium-shim_headers.patch"
45 )
46
47
48 diff --git a/www-client/chromium/files/chromium-89-empty-map-crash.patch b/www-client/chromium/files/chromium-89-empty-map-crash.patch
49 deleted file mode 100644
50 index 9c00b83f4af..00000000000
51 --- a/www-client/chromium/files/chromium-89-empty-map-crash.patch
52 +++ /dev/null
53 @@ -1,39 +0,0 @@
54 -From 9e0bf3bb5954cc8848e33d6806a67e75199e7ceb Mon Sep 17 00:00:00 2001
55 -From: Stephan Hartmann <stha09@××××××××××.com>
56 -Date: Tue, 16 Feb 2021 19:51:38 +0000
57 -Subject: [PATCH] fix crash if smooth_thread_history_ is empty
58 -
59 -https://crrev.com/11ce5ea added smooth_thread_history_, but does
60 -not handle an empty std::map correctly. Decrementing iterator
61 -returned by lower_bound() only works, if the map is non-empty.
62 -
63 -Bug: 1169818
64 -Change-Id: If75c3d4c7412e77b3ae6c3e68fa3e3821dc75764
65 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2692534
66 -Reviewed-by: Behdad Bakhshinategh <behdadb@××××××××.org>
67 -Reviewed-by: Sadrul Chowdhury <sadrul@××××××××.org>
68 -Commit-Queue: Behdad Bakhshinategh <behdadb@××××××××.org>
69 -Cr-Commit-Position: refs/heads/master@{#854397}
70 ----
71 -
72 -diff --git a/cc/metrics/compositor_frame_reporting_controller.cc b/cc/metrics/compositor_frame_reporting_controller.cc
73 -index 6713366..dec573d1 100644
74 ---- a/cc/metrics/compositor_frame_reporting_controller.cc
75 -+++ b/cc/metrics/compositor_frame_reporting_controller.cc
76 -@@ -440,10 +440,12 @@
77 - }
78 -
79 - // keep the history for the last 3 seconds.
80 -- auto expired_smooth_thread = smooth_thread_history_.lower_bound(
81 -- Now() - base::TimeDelta::FromSeconds(3))--;
82 -- smooth_thread_history_.erase(smooth_thread_history_.begin(),
83 -- expired_smooth_thread);
84 -+ if (!smooth_thread_history_.empty()) {
85 -+ auto expired_smooth_thread = smooth_thread_history_.lower_bound(
86 -+ Now() - base::TimeDelta::FromSeconds(3))--;
87 -+ smooth_thread_history_.erase(smooth_thread_history_.begin(),
88 -+ expired_smooth_thread);
89 -+ }
90 -
91 - // Only trackes the history if there is a change in smooth_thread_
92 - if (current_smooth_thread != GetSmoothThread()) {