www-client/chromium: dev channel bump to 102.0.4997.0

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

3 files changed, 3 insertions, 274 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ff886f270cbc..331f9f498a51 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -4,5 +4,5 @@ DIST chromium-100.0.4896.75.tar.xz 1358118152 BLAKE2B a7747bd1a3ea4e2cab313c139e
 DIST chromium-100.0.4896.88.tar.xz 1358219840 BLAKE2B c26ff1c3e226b01f9f7f39f5b51d864d4a068358daddfe86ac5b8fb59b8e4399e4079409caaa1100d3918051f023bfb4ec09070e62ddde6dc3a79009bded5f95 SHA512 875ca6ad8062afe12e69f38767ad021dbda3342ea0a30a92ae4c90bf337984307bc7c3ae9ebc339b9d4daa39c00647ea94f43d7d6783f519a084ae6bb5c50e38
 DIST chromium-101-patchset-4.tar.xz 3644 BLAKE2B 537be42d078338afc46fb8f358afecffdeea11ffc76d391a2c8785cee343bcde5de4d3c2a4102e2cd90a7331bf561c54b7e0c390e21785db3821d3cd39fcb080 SHA512 19370a96f1f3edcf4d529038dedfdc1bc680e6265832bf5b3d0a86f6dbc6784d34dd861ad39c328d4755e21966d19614cbd2f7719af2981abe2c7d8e0e985a78
 DIST chromium-101.0.4951.26.tar.xz 1401081820 BLAKE2B 395b381bccffd6072ca93d84f422c65c220813a7e153e09635fbf55417bc287613b305ab8355941c01e3d448d3680db6b5beac4fdf7a261738d6dd6530b7e27d SHA512 e22ac973f5093b8cb992587897be5ad79963a541e4aca56c2f36d26dd99370030413363371946f1faa50fd8adc53e42b50b99633c7704e2c39c24e6f49477a85
-DIST chromium-102-patchset-2.tar.xz 3548 BLAKE2B ebcdde1e72cfa21d1d5b1e8edcf06b2145a4c892cae5aa5a79c9196d18c7897d5c97da1cead0f421c39258702557464ef0aa0dee3eb7c9e162b18119ae6f75c5 SHA512 98c01231a2965965ec4d4017812ec0c95bdb9c7c5d27e127060d2f24eb1c19b0b82c64367102f191496c55a819da98c76085c88b672b37e5e4c489b60e15de67
-DIST chromium-102.0.4987.0.tar.xz 1427741816 BLAKE2B 5de977daa1d585dcb8ba88293f25dbec64b885d32d44a54ec53b48ae5aa01f4e9019d42f700a4f8f9ac98a892014c9b5e1149eff65562599078b92b3ed18909c SHA512 196c70e36517bcfc3b1fe79844a6bb5904d0863cd6db78477b83d2070b57075663081dfd709a82a71b661781899239870cbcb0b5c52dfda714ed0df3264250cd
+DIST chromium-102-patchset-3.tar.xz 4540 BLAKE2B 79daaafa620b8a2e3c0d5e04c43112d74ad5f5929753408a59f56098c13733a11c2c61b6ea303592916f78d1f3aef8ea6b32ef2fae8ce2c2ce2bb48c4781ea7f SHA512 c14499b775adc7fe3324dfbbad7322b7959d08d1d04b5e6d7a83f43f94b30e2e547c0635580356106e7c71ba9909a8759f8bd26f436f0599fb2cba99f568ebae
+DIST chromium-102.0.4997.0.tar.xz 1430480956 BLAKE2B a3ee13627cae99c41f3cd5a45610b1c766c2ce0d15aa7c717d297f51923c0bc7ed5c95f424eb51c3448336aa57e89cd7bc68325d17285a6972ac21ab1563af27 SHA512 59eec03408a7d8154e1988f6941101b7065bcb2c4c17568b00d2344a930aa909822b9bdef4a6b5476d3a909300521236402fe0e508be851237fc5bbc65acaeab
diff --git a/www-client/chromium/chromium-102.0.4987.0.ebuild b/www-client/chromium/chromium-102.0.4997.0.ebuild
index b24042a4eb88..3a02ebb0cc5b 100644
--- a/www-client/chromium/chromium-102.0.4987.0.ebuild
+++ b/www-client/chromium/chromium-102.0.4997.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"
@@ -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-102-dawn-revert.patch"
 		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 		"${FILESDIR}/chromium-cross-compile.patch"
@@ -327,7 +326,6 @@ src_prepare() {
 		third_party/dawn
 		third_party/dawn/third_party/gn/webgpu-cts
 		third_party/dawn/third_party/khronos
-		third_party/dawn/third_party/tint
 		third_party/depot_tools
 		third_party/devscripts
 		third_party/devtools-frontend
@@ -415,7 +413,6 @@ src_prepare() {
 		third_party/node
 		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
 		third_party/one_euro_filter
-		third_party/opencv
 		third_party/openscreen
 		third_party/openscreen/src/third_party/mozilla
 		third_party/openscreen/src/third_party/tinycbor/src/src
diff --git a/www-client/chromium/files/chromium-102-dawn-revert.patch b/www-client/chromium/files/chromium-102-dawn-revert.patch
deleted file mode 100644
index 6e77207b4813..000000000000
--- a/www-client/chromium/files/chromium-102-dawn-revert.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-diff --git a/third_party/dawn/generator/dawn_generator.gni b/third_party/dawn/generator/dawn_generator.gni
-index 28c5301..fb7e639 100644
---- a/third_party/dawn/generator/dawn_generator.gni
-+++ b/third_party/dawn/generator/dawn_generator.gni
-@@ -39,7 +39,6 @@ import("generator_lib.gni")
- 
- dawn_allowed_gen_output_dirs = [
-   "src/dawn/",
--  "src/dawn/common/",
-   "src/dawn/native/",
-   "src/dawn/native/opengl/",
-   "src/dawn/wire/client/",
-diff --git a/third_party/dawn/generator/dawn_version_generator.py b/third_party/dawn/generator/dawn_version_generator.py
-deleted file mode 100644
-index 462cb31..0000000
---- a/third_party/dawn/generator/dawn_version_generator.py
-+++ /dev/null
-@@ -1,105 +0,0 @@
--#!/usr/bin/env python3
--# Copyright 2022 The Dawn Authors
--#
--# Licensed under the Apache License, Version 2.0 (the "License");
--# you may not use this file except in compliance with the License.
--# You may obtain a copy of the License at
--#
--#     http://www.apache.org/licenses/LICENSE-2.0
--#
--# Unless required by applicable law or agreed to in writing, software
--# distributed under the License is distributed on an "AS IS" BASIS,
--# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--# See the License for the specific language governing permissions and
--# limitations under the License.
--
--import os, subprocess, sys
--
--from generator_lib import Generator, run_generator, FileRender
--
--
--def get_git():
--    return 'git.bat' if sys.platform == 'win32' else 'git'
--
--
--def get_gitHash(dawnDir):
--    result = subprocess.run([get_git(), 'rev-parse', 'HEAD'],
--                            stdout=subprocess.PIPE,
--                            cwd=dawnDir)
--    if result.returncode == 0:
--        return result.stdout.decode('utf-8').strip()
--    return ''
--
--
--def get_gitHead(dawnDir):
--    return [os.path.join(dawnDir, '.git', 'HEAD')]
--
--
--def unpackGitRef(packed, resolved):
--    with open(packed) as fin:
--        refs = fin.read().strip().split('\n')
--
--    # Strip comments
--    refs = [ref.split(' ') for ref in refs if ref.strip()[0] != '#']
--
--    # Parse results which are in the format [<gitHash>, <refFile>] from previous step.
--    refs = [gitHash for (gitHash, refFile) in refs if refFile == resolved]
--    if len(refs) == 1:
--        with open(resolved, 'w') as fout:
--            fout.write(refs[0] + '\n')
--        return True
--    return False
--
--
--def get_gitResolvedHead(dawnDir):
--    result = subprocess.run(
--        [get_git(), 'rev-parse', '--symbolic-full-name', 'HEAD'],
--        stdout=subprocess.PIPE,
--        cwd=dawnDir)
--    if result.returncode != 0:
--        raise Exception('Failed to execute git rev-parse to resolve git head.')
--
--    resolved = os.path.join(dawnDir, '.git',
--                            result.stdout.decode('utf-8').strip())
--
--    # Check a packed-refs file exists. If so, we need to potentially unpack and include it as a dep.
--    packed = os.path.join(dawnDir, '.git', 'packed-refs')
--    if os.path.exists(packed) and unpackGitRef(packed, resolved):
--        return [packed, resolved]
--
--    if not os.path.exists(resolved):
--        raise Exception('Unable to resolve git HEAD hash file:', path)
--    return [resolved]
--
--
--def compute_params(args):
--    return {
--        'get_gitHash': lambda: get_gitHash(os.path.abspath(args.dawn_dir)),
--    }
--
--
--class DawnVersionGenerator(Generator):
--    def get_description(self):
--        return 'Generates version dependent Dawn code. Currently regenerated dependent on git hash.'
--
--    def add_commandline_arguments(self, parser):
--        parser.add_argument('--dawn-dir',
--                            required=True,
--                            type=str,
--                            help='The Dawn root directory path to use')
--
--    def get_dependencies(self, args):
--        dawn_dir = os.path.abspath(args.dawn_dir)
--        return get_gitHead(dawn_dir) + get_gitResolvedHead(dawn_dir)
--
--    def get_file_renders(self, args):
--        params = compute_params(args)
--
--        return [
--            FileRender('dawn/common/Version.h',
--                       'src/dawn/common/Version_autogen.h', [params]),
--        ]
--
--
--if __name__ == '__main__':
--    sys.exit(run_generator(DawnVersionGenerator()))
-diff --git a/third_party/dawn/generator/templates/dawn/common/Version.h b/third_party/dawn/generator/templates/dawn/common/Version.h
-deleted file mode 100644
-index f9f67e7..0000000
---- a/third_party/dawn/generator/templates/dawn/common/Version.h
-+++ /dev/null
-@@ -1,24 +0,0 @@
--// Copyright 2022 The Dawn Authors
--//
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
--//
--//     http://www.apache.org/licenses/LICENSE-2.0
--//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
--
--#ifndef COMMON_VERISON_AUTOGEN_H_
--#define COMMON_VERISON_AUTOGEN_H_
--
--namespace dawn {
--
--static constexpr char kGitHash[] = "{{get_gitHash()}}";
--
--} // namespace dawn
--
--#endif  // COMMON_VERISON_AUTOGEN_H_
-diff --git a/third_party/dawn/src/dawn/common/BUILD.gn b/third_party/dawn/src/dawn/common/BUILD.gn
-index d09999d..8a15f02 100644
---- a/third_party/dawn/src/dawn/common/BUILD.gn
-+++ b/third_party/dawn/src/dawn/common/BUILD.gn
-@@ -15,7 +15,6 @@
- import("../../../scripts/dawn_overrides_with_defaults.gni")
- 
- import("//build_overrides/build.gni")
--import("${dawn_root}/generator/dawn_generator.gni")
- import("${dawn_root}/scripts/dawn_features.gni")
- 
- # Use Chromium's dcheck_always_on when available so that we respect it when
-@@ -168,15 +167,6 @@ config("internal_config") {
- # Common dawn library
- ###############################################################################
- 
--dawn_generator("dawn_version_gen") {
--  script = "${dawn_root}/generator/dawn_version_generator.py"
--  args = [
--    "--dawn-dir",
--    rebase_path("${dawn_root}", root_build_dir),
--  ]
--  outputs = [ "src/dawn/common/Version_autogen.h" ]
--}
--
- # This GN file is discovered by all Chromium builds, but common doesn't support
- # all of Chromium's OSes so we explicitly make the target visible only on
- # systems we know Dawn is able to compile on.
-@@ -233,8 +223,6 @@ if (is_win || is_linux || is_chromeos || is_mac || is_fuchsia || is_android) {
-       "xlib_with_undefs.h",
-     ]
- 
--    public_deps = [ ":dawn_version_gen" ]
--
-     if (is_mac) {
-       sources += [ "SystemUtils_mac.mm" ]
-     }
-@@ -253,7 +241,7 @@ if (is_win || is_linux || is_chromeos || is_mac || is_fuchsia || is_android) {
-       ]
-     }
-     if (dawn_enable_vulkan) {
--      public_deps += [ "${dawn_root}/third_party/khronos:vulkan_headers" ]
-+      public_deps = [ "${dawn_root}/third_party/khronos:vulkan_headers" ]
-     }
-     if (is_android) {
-       libs = [ "log" ]
-diff --git a/third_party/dawn/src/dawn/common/CMakeLists.txt b/third_party/dawn/src/dawn/common/CMakeLists.txt
-index 1c28e71..d839d84 100644
---- a/third_party/dawn/src/dawn/common/CMakeLists.txt
-+++ b/third_party/dawn/src/dawn/common/CMakeLists.txt
-@@ -12,17 +12,8 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--DawnGenerator(
--    SCRIPT "${Dawn_SOURCE_DIR}/generator/dawn_version_generator.py"
--    PRINT_NAME "Dawn version based utilities"
--    ARGS "--dawn-dir"
--         "${Dawn_SOURCE_DIR}"
--    RESULT_VARIABLE "DAWN_VERSION_AUTOGEN_SOURCES"
--)
--
- add_library(dawn_common STATIC ${DAWN_DUMMY_FILE})
- target_sources(dawn_common PRIVATE
--    ${DAWN_VERSION_AUTOGEN_SOURCES}
-     "Alloc.h"
-     "Assert.cpp"
-     "Assert.h"
-diff --git a/third_party/dawn/src/dawn/tests/BUILD.gn b/third_party/dawn/src/dawn/tests/BUILD.gn
-index 0951b9b..990b5b9 100644
---- a/third_party/dawn/src/dawn/tests/BUILD.gn
-+++ b/third_party/dawn/src/dawn/tests/BUILD.gn
-@@ -238,7 +238,6 @@ dawn_test("dawn_unittests") {
-     "unittests/SystemUtilsTests.cpp",
-     "unittests/ToBackendTests.cpp",
-     "unittests/TypedIntegerTests.cpp",
--    "unittests/VersionTests.cpp",
-     "unittests/native/CacheKeyTests.cpp",
-     "unittests/native/CommandBufferEncodingTests.cpp",
-     "unittests/native/CreatePipelineAsyncTaskTests.cpp",
-diff --git a/third_party/dawn/src/dawn/tests/unittests/VersionTests.cpp b/third_party/dawn/src/dawn/tests/unittests/VersionTests.cpp
-deleted file mode 100644
-index 60172a7..0000000
---- a/third_party/dawn/src/dawn/tests/unittests/VersionTests.cpp
-+++ /dev/null
-@@ -1,29 +0,0 @@
--// Copyright 2022 The Dawn Authors
--//
--// Licensed under the Apache License, Version 2.0 (the "License");
--// you may not use this file except in compliance with the License.
--// You may obtain a copy of the License at
--//
--//     http://www.apache.org/licenses/LICENSE-2.0
--//
--// Unless required by applicable law or agreed to in writing, software
--// distributed under the License is distributed on an "AS IS" BASIS,
--// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--// See the License for the specific language governing permissions and
--// limitations under the License.
--
--#include <gmock/gmock.h>
--#include <gtest/gtest.h>
--
--#include "dawn/common/Version_autogen.h"
--
--namespace dawn { namespace {
--
--    using ::testing::SizeIs;
--
--    TEST(VersionTests, GitCommitHashLength) {
--        // Git hashes should be 40 characters long.
--        EXPECT_THAT(std::string(kGitHash), SizeIs(40));
--    }
--
--}}  // namespace dawn::