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

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

commit:     1a9e3fb2365b41893c688580123a49ad64068d4a
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 09:32:53 2022 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 09:33:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a9e3fb2

www-client/chromium: dev channel bump to 99.0.4840.0

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>

 www-client/chromium/Manifest                       |  4 +--
 ...0.4818.0.ebuild => chromium-99.0.4840.0.ebuild} |  4 +--
 .../files/chromium-97-fix-tag-dragging-i3.patch    | 35 ----------------------
 3 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 0032f9f4b6ad..815d9898c11f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,5 +2,5 @@ DIST chromium-97-patchset-4.tar.xz 4240 BLAKE2B 450d013b6fd68f7e0bcb21a2b0828d53
 DIST chromium-97.0.4692.99.tar.xz 1213731872 BLAKE2B e7fdf30f562fe6d50615b8213e762825d3b346c9c87e3512c957cc68dc75bf31b551b262f72801a3b0b51f2ff5ee31939dc7d4b2c2f005a4aaaec1c37983909d SHA512 928684286b5bbc15b0e60bdf3b1eb5d644f31d13baa0b55c652b9e302f48776fac367af99d89b85ff8258455551846f7efb4f11772b182aa743c6beff844e7d5
 DIST chromium-98-patchset-5.tar.xz 4928 BLAKE2B f96fb34d5cb3c3ac2c6e327805322e5d6047b0b190a043795de1063c934ca6400800aafaaa4eea7ebad571298b96bf67e48ee0d2d1eb3e0bf23b14932734e026 SHA512 fae1010b91af7e6aa981ea22fc15c32a510b3e78ab71fec73b65290d963dfe6c42e5a2965446803519356858b60cd587018b1b2aea36e112e4d315efbdad7d8f
 DIST chromium-98.0.4758.66.tar.xz 1242209580 BLAKE2B 0e905caf6bee24ca357f3dcdadd0f105ea41f156030062b8b02febd15b73b3f1b774093c8f5bf23c7afa2863f342a85f6c994a9bf5aa3c8d0dc0310ef12c7db9 SHA512 0a05ca92ac114ed33523d7067c857834942ce533c77a3212f76b50c3e8e673d0b8d697d61e465e4ce8f7aab4a0d4b381682c48107321b394f93d2b20a0117e10
-DIST chromium-99-patchset-1.tar.xz 5076 BLAKE2B 3cc721ac21e56cb4b80a3377d8aaf354b56159662fc2b90c3f369496f7abcef1755313d8d8b8e44361fffb21023d68260ce8a41f58481ce12d93ae794e56d210 SHA512 97212a16cd59c1ab80d79425a2bda7742d3dbe68f4d47550651c88fbb8f7f286f70f8692aec8e69be8676c4c6b3c2ad8716bccab943ae4435290c1b6ba91dd81
-DIST chromium-99.0.4818.0.tar.xz 1313012452 BLAKE2B 6c31f15049295046e9c0ea12c6ed8fcd614548e724960c68c1fdee16828a4cdbd189c07b6da9cd59903897f6cbd206acbb1f9f6441ab77180c29fb4fb40f788b SHA512 3a96a9c8529cb6b01f9d765418d71cc5eac1c318ebcc50200e066ed3f44ec0dbfb6b43b313e5fcf5e78ab84304ea663ae162b7870538eeb38922ab53b83bd33b
+DIST chromium-99-patchset-2.tar.xz 4264 BLAKE2B 3c81029085931df7db5724845a9a1ef17fd19e1964cdb53f78cf0b8c3765ff81f97ccea344e4db853f780c14e18b6bf1839f0ef142906042385bfcde01364ab8 SHA512 14eef917ecab7668072834aac277d2faf32e9c2ca85268a7591b94ff69e9df331c0114da1ebcb92a332f8ad066eeaebd841a937e80198baf4649065b677cc2c3
+DIST chromium-99.0.4840.0.tar.xz 1315491932 BLAKE2B 7c01c962e604c8147d446cf0e9fd86538b7112d93a535ffdfd2a938462f0e9edf51c12bf01b068ff0d64776726bbfb04991fbfa0dcfedd428e7ee79610534559 SHA512 79f9b2e8f7e56ae0bcc49d1f5b7dc306d167dfc6b2652874b6f4fc795d63c6f4dc3bb74545ba586e57ba5e0a5f350eaf8ac1202953d9ed2f94b71198f494c907

diff --git a/www-client/chromium/chromium-99.0.4818.0.ebuild b/www-client/chromium/chromium-99.0.4840.0.ebuild
similarity index 99%
rename from www-client/chromium/chromium-99.0.4818.0.ebuild
rename to www-client/chromium/chromium-99.0.4840.0.ebuild
index b2d9fb16d746..539cfcc65eb4 100644
--- a/www-client/chromium/chromium-99.0.4818.0.ebuild
+++ b/www-client/chromium/chromium-99.0.4840.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="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"
@@ -230,7 +230,6 @@ src_prepare() {
 	local PATCHES=(
 		"${WORKDIR}/patches"
 		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-97-fix-tag-dragging-i3.patch"
 		"${FILESDIR}/chromium-97-arm-tflite-cast.patch"
 		"${FILESDIR}/chromium-98-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-98-system-libdrm.patch"
@@ -312,6 +311,7 @@ src_prepare() {
 		third_party/devscripts
 		third_party/devtools-frontend
 		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
 		third_party/devtools-frontend/src/front_end/third_party/axe-core
 		third_party/devtools-frontend/src/front_end/third_party/chromium
 		third_party/devtools-frontend/src/front_end/third_party/codemirror

diff --git a/www-client/chromium/files/chromium-97-fix-tag-dragging-i3.patch b/www-client/chromium/files/chromium-97-fix-tag-dragging-i3.patch
deleted file mode 100644
index e31f0112478f..000000000000
--- a/www-client/chromium/files/chromium-97-fix-tag-dragging-i3.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 98715f8730c5f389976538848e58401db66f9b5d Mon Sep 17 00:00:00 2001
-From: Marco Genasci <fedeliallalinea@gmail.com>
-Date: Wed, 12 Jan 2022 16:11:15 +0100
-Subject: [PATCH 2/2] [X11] Fix tag dragging in i3
-
-ref: https://bugs.chromium.org/p/chromium/issues/detail?id=1279532
-caused by: https://bugs.chromium.org/p/chromium/issues/detail?id=1263023
-Patch from:
-https://chromium-review.googlesource.com/c/chromium/src/+/3381679
----
- ui/platform_window/x11/x11_topmost_window_finder.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ui/platform_window/x11/x11_topmost_window_finder.cc b/ui/platform_window/x11/x11_topmost_window_finder.cc
-index e20bf0abf..c9c672c60 100644
---- a/ui/platform_window/x11/x11_topmost_window_finder.cc
-+++ b/ui/platform_window/x11/x11_topmost_window_finder.cc
-@@ -42,12 +42,12 @@ bool EnumerateChildren(ShouldStopIteratingCallback should_stop_iterating,
-   // reverse-iterate the list to check the windows from top-to-bottom.
-   std::vector<x11::Window>::reverse_iterator iter;
-   for (iter = windows.rbegin(); iter != windows.rend(); iter++) {
--    if (IsWindowNamed(*iter) && should_stop_iterating.Run(*iter))
--      return true;
-     if (depth < max_depth) {
-       if (EnumerateChildren(should_stop_iterating, *iter, max_depth, depth + 1))
-         return true;
-     }
-+    if (IsWindowNamed(*iter) && should_stop_iterating.Run(*iter))
-+      return true;
-   }
- 
-   return false;
--- 
-2.34.1
-