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

[Stephan Hartmann]

commit:     80573012dd89ca319af9bcba9465383bb85e40d8
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  8 12:28:23 2022 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 12:28:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80573012

www-client/chromium: dev channel bump to 102.0.4987.0

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

 www-client/chromium/Manifest                       |   4 +-
 ....4972.0.ebuild => chromium-102.0.4987.0.ebuild} |   4 +-
 .../chromium/files/chromium-102-dawn-revert.patch  | 268 +++++++++++++++++++++
 3 files changed, 272 insertions(+), 4 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 903ff9cfe59b..c336cf8ef20c 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -4,5 +4,5 @@ DIST chromium-100.0.4896.60.tar.xz 1357922968 BLAKE2B a4efa2d4a6bfed6a20552b8cd9
 DIST chromium-100.0.4896.75.tar.xz 1358118152 BLAKE2B a7747bd1a3ea4e2cab313c139ed68726a253c5b5c71c7b9817aeac94eb9ba167bc28a7c6d498e719c62b4054583c56aa2f2c45ce4351ee3437995393919712ef SHA512 df066ee1a9f8ae324c6ab0d788e01e5d30a9d30148c45f88b270dc00246d34d74a760e7ae6eb8490c4d688ad2d7b8f00d604bb0a260dd3fb7bfc80d3a987958e
 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-1.tar.xz 3804 BLAKE2B 099109dab19ef3e45a1927a893b5d5484d8743458b2027b3cc3aad644f970bbd3fafc2d56f958b33c52b8aaa42f5498ffd4a73baf82374e73e3aaa7deebbefe2 SHA512 1411050d819034e1eeee2918cd8d5daf29982e7a3965d1f0cd9833dfddd488108aa38780f459ec0abc7d5b5dfa395e3f464a3555d6208908966e0c23fb4af01f
-DIST chromium-102.0.4972.0.tar.xz 1405292324 BLAKE2B 470dc49986b34b7c8c8759a44ab28b5ee562fce6999ec1456a357d16c2fd0239f734937caef658363b04e1e6889410b4d1773325c120545a7537c640c66e6ae2 SHA512 b4e39297c42a51cf7ab52c8022191434bcd583a1ee3b56a6e5dcce9e0c9d3dfd6f12cb09efb1562efb9b29770af7fe930d850eb31a551e7bf41507cec7757167
+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

diff --git a/www-client/chromium/chromium-102.0.4972.0.ebuild b/www-client/chromium/chromium-102.0.4987.0.ebuild
similarity index 99%
rename from www-client/chromium/chromium-102.0.4972.0.ebuild
rename to www-client/chromium/chromium-102.0.4987.0.ebuild
index 504055107716..b24042a4eb88 100644
--- a/www-client/chromium/chromium-102.0.4972.0.ebuild
+++ b/www-client/chromium/chromium-102.0.4987.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"
@@ -247,6 +247,7 @@ 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"
@@ -468,7 +469,6 @@ src_prepare() {
 		third_party/six
 		third_party/ukey2
 		third_party/unrar
-		third_party/usrsctp
 		third_party/utf
 		third_party/vulkan
 		third_party/web-animations-js

diff --git a/www-client/chromium/files/chromium-102-dawn-revert.patch b/www-client/chromium/files/chromium-102-dawn-revert.patch
new file mode 100644
index 000000000000..6e77207b4813
--- /dev/null
+++ b/www-client/chromium/files/chromium-102-dawn-revert.patch
@@ -0,0 +1,268 @@
+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::