[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/, www-client/chromium/

["Stephan Hartmann" <sultan@gentoo.org>]

commit:     ae3aa2dad804883530914df28ed53408f139398a
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 11 17:09:49 2022 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 17:10:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae3aa2da

www-client/chromium: dev channel bump to 101.0.4929.5

Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>

 www-client/chromium/Manifest                       |  4 ++--
 ....4919.0.ebuild => chromium-101.0.4929.5.ebuild} |  3 +--
 .../chromium/files/chromium-101-system-icu.patch   | 26 ----------------------
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 4765553788af..abfdc1144c90 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,6 @@
 DIST chromium-100-patchset-4.tar.xz 5676 BLAKE2B aaa96413cc44ea75d2664b7d85130ca6f9ea4dfe736278806bb846baf97838fc1c8412b0320b8b22d5a2946fe1fb23fae244e297b924baafeb7a4983dab7e292 SHA512 3f88272d42f30112733e5e7473aec9dc31458386b34192ee34465b7045f63b0e8d496cddfc7efb2156cd8a9a84efd68437c1b194be13595cbe6e3736dcc187c9
 DIST chromium-100.0.4896.20.tar.xz 1351401408 BLAKE2B 34efdfc4a369c9d39b6002e07655984f39f01f491b7afed8bb77baf73e56b435d7fbb6e7eef0c44dcd081248a517f1d250955c25c693bb41fab944a0ebfe549d SHA512 5f28027968011dcb712dc3d771c6d112d4596e381a1418e01aa1f4cbd1ab03586fb641eddb4cacd5ea9c153353e09fdf563d263315af483c4f015b4db8e7235b
-DIST chromium-101-patchset-1.tar.xz 4864 BLAKE2B cb0d0b96778af773026bf423800ef1bd9e85625e554e3988185c6c6c9d1850500d436f0fb8a56e4d854adbc31f6d41e4b8b3ec6e4bf6dbb0f7db26084a55eee7 SHA512 3b30d08fde6c53b92f8809816750136fa6ba6e605975f22fcaea663c0f62119f80a9ac0d3f29e7a6ba7d2c3e6f5c45c63ea754249c3a018f45cec01366a8fb62
-DIST chromium-101.0.4919.0.tar.xz 1352317040 BLAKE2B 78b9d9a5f6d5cde318ab794bdcb322db706a8c03fb750703dcea26105f0f0d06d529e68f994b56c9b10ea257ed8a52f68384113dfcb2a30e1ea6143609eb59bd SHA512 b0e7969a442baea0a8665a31e4b452d84cd9318e0fd482c67bfff0d89f4c27d2f61745abaaf8f4d4ffda7a05c7b1310c8129f7d38ef2cfa9b46712208ad2048a
+DIST chromium-101-patchset-2.tar.xz 4172 BLAKE2B 9083a6b469f9d36886cc85b34fccafb8611bc29ac5980ce657988137748fe0d3797a2a7b243d0b3f58d963b8cf9147343a1b2a7a7003f62dc973013af9434943 SHA512 60c23fedf21408e0f81f61bc4b14e96f49db3322206498323739999fb3a12a7a0d79240c3ccbddda3820470264fd48fbccabbd23071828e0565bc5dd5467f51c
+DIST chromium-101.0.4929.5.tar.xz 1352192080 BLAKE2B f78b8854665d709b02b92125b68e6be87140e8da6e297e91b5146e97a5cf5737071324b3bef0537fa59f5e9c1f6a1843458bef7240f22c80183f5be50fafc2b7 SHA512 bf5729203c894ebf50af3cbcd56d5cecaa8b2459eba99d38f5501cb0f55af386fd98ce42bb10b6c0abbb88e65c62aeccdfe57f57f249982bc84512d3c3924aa6
 DIST chromium-99-patchset-3.tar.xz 3912 BLAKE2B 79030156e81ebd6b3c348fb429e23d0c866059e047e7cdc0f656a1b1ee290f3afa8b358d0e1df18a86616a35a9a256e7432a5ab4e9b952c7a360aed871236659 SHA512 63d951cb3d17c1d02d9ddbee3a44aca000c5ba2f908012584944ce7fc435aebfe39b9628d4bd043df97c4dd7afa0ad614c65368ca759b64a84654126f06f9ea8
 DIST chromium-99.0.4844.51.tar.xz 1316125164 BLAKE2B 5dc0c956b68301d48cd02af6ca2ac7330eaf46175038426587f7c7fe9baa228c25c17dc184f80f8b8fb6d069da981fcf1cb00231810bd70796dc4b0097cffc9b SHA512 85f81afa35907d59e7dee328c1c30d61a4106b8d5e9dabad4888c0a1962d8e4debfb88358417123979d8a4ad471acbf8d90c0a3bb2cc9bac5fef71b800bcc1af

diff --git a/www-client/chromium/chromium-101.0.4919.0.ebuild b/www-client/chromium/chromium-101.0.4929.5.ebuild
similarity index 99%
rename from www-client/chromium/chromium-101.0.4919.0.ebuild
rename to www-client/chromium/chromium-101.0.4929.5.ebuild
index 86e690d0f33d..909a2e05c304 100644
--- a/www-client/chromium/chromium-101.0.4919.0.ebuild
+++ b/www-client/chromium/chromium-101.0.4929.5.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="1"
+PATCHSET="2"
 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"
@@ -247,7 +247,6 @@ src_prepare() {
 		"${FILESDIR}/chromium-98-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-98-gtk4-build.patch"
 		"${FILESDIR}/chromium-101-libxml-unbundle.patch"
-		"${FILESDIR}/chromium-101-system-icu.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-101-system-icu.patch b/www-client/chromium/files/chromium-101-system-icu.patch
deleted file mode 100644
index 2e8557257da2..000000000000
--- a/www-client/chromium/files/chromium-101-system-icu.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f5dc3a38095d2d303284c9fd97de5606c782294f Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Fri, 4 Mar 2022 21:27:55 +0000
-Subject: [PATCH] unbundle: fix function name in character_emoji
-
-GetFreezePatternMutex was defined but GetFreezePatternLock is called.
----
- third_party/blink/renderer/platform/text/character_emoji.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/third_party/blink/renderer/platform/text/character_emoji.cc b/third_party/blink/renderer/platform/text/character_emoji.cc
-index 9516966..6cb50dc 100644
---- a/third_party/blink/renderer/platform/text/character_emoji.cc
-+++ b/third_party/blink/renderer/platform/text/character_emoji.cc
-@@ -13,7 +13,7 @@
- #include <unicode/uniset.h>
- 
- namespace {
--base::Lock& GetFreezePatternMutex() {
-+base::Lock& GetFreezePatternLock() {
-   DEFINE_THREAD_SAFE_STATIC_LOCAL(base::Lock, lock, ());
-   return lock;
- }
--- 
-2.34.1
-