commit: 9d39fafe437f2d7a060e41144c21d29a1b9ec85e Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> AuthorDate: Sun Jan 10 21:35:54 2021 +0000 Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> CommitDate: Sun Jan 10 21:36:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d39fafe
www-client/chromium: dev channel bump to 89.0.4381.6 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> www-client/chromium/Manifest | 4 +- ...0.4356.6.ebuild => chromium-89.0.4381.6.ebuild} | 16 ++------ .../chromium/files/chromium-shim_headers.patch | 48 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 15 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 80d764350bf..d36b0a79770 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -2,6 +2,6 @@ DIST chromium-87-patchset-9.tar.xz 6036 BLAKE2B 4dd9aa0e88f11a9104cb13e73607c3b4 DIST chromium-87.0.4280.141.tar.xz 856467564 BLAKE2B 9c0a43b3326bcfba911e5d19e984c9722d31559664b30398da9f0067106957b154c04968f9376d9b3709e34edb248ca55abe8050f33622152cbe837c95e55c08 SHA512 402a8ff60512b855925cefa862093b70629376d99bc465e3255aeecea29d79a04e5f9bf72c7a497d768b7987b855bc8e8819ebaa5226ca3f5c9d6602e9cd62d6 DIST chromium-88-patchset-3.tar.xz 8396 BLAKE2B 4c978f1a6efef3f71e3dd6340c392b74bc6a734b49a9ca43343d03903159dafc66159939f9a6c4b55665ddbe7bd97a26d8d86c285ec02cf76cad5f5cc7410570 SHA512 c39afa26f5b0b9930f6f67ce0c42eefd74c09d528b26bc0db57129b150f75ff83c8b1cb97bd9c5d75f288fb4767cc68c9c5ce89231b4a59f8ca02493e4dd281a DIST chromium-88.0.4324.79.tar.xz 857135416 BLAKE2B 10264e9fb97a605216fc199564336d5542ef5234fe36bf59f46b22e8ccd44ce73ddb0b093a11f48c5168682ebb9ddbade85da8f8e4c668db15f96e6277076a20 SHA512 6ba9a051d56aa326e700a7f3442c62b401d7adde892be0f8bb7d083e0e4577eae91b593796f2458b677f2956af55bec9f0ee01bab406171b699ddaed2392fbee -DIST chromium-89-patchset-3.tar.xz 5276 BLAKE2B c5001450e876c4be85d1ecfa9219c9d5d59d95d7c7a783470357e4a34fb60a72c20a138d652e3d587fd893e230d8e729ad5887915f1d39fdc940e726cb965341 SHA512 5157265a5d712bbf5a456cc5e0b798ee358d03f571dc91e2bff4b53eab71aae013d40a0140c1adf5aea9d791bbd543883cd5a133a2d3eb971baababb0acd54b7 -DIST chromium-89.0.4356.6.tar.xz 885537076 BLAKE2B 75c8f977b62bb73f5b0c8223561d1bd868270f3fdb01ca86a7e9355d442352fa17d7c7db3d67a20f273b8caeda06a03ce57b1f04017d73d6d4bc195356e39d1b SHA512 f83ce11fd9957a794c6dfdd5e128016f55140936af94daf1b7f09156b04b28d77f924bd9c9f92e062c75aae14d11508cb532deda23732acfa85d987de28cbad3 +DIST chromium-89-patchset-4.tar.xz 6048 BLAKE2B f7549ad64ef51d1c3a6d47ac817cc21f1e09f4ec7516385dec87324dc8b0228ea0b03cae894b411d6574499673a185b0908b4ef420455a004238ac9c94b6c7cf SHA512 7797ccf198483c9bbe5257a1321984075c982ce5f5bf14f578dd9ac8a8aa85b82ef6ae35492738bf7994aed85cf65c825be123aedf9a10aa7b35a289a3f855ce +DIST chromium-89.0.4381.6.tar.xz 890366840 BLAKE2B 45c49669140e84c3ab19cd0bf643a87903a1da7dcd001c0f6ba0d9ffc61db004d471bab6e32d84262d6e4e1692abbfc411c4be46a71ba535c0fa6907521c27ad SHA512 ce0b63fb08cb123c9d8e07b22956467ac1f625cdf75a06308af42aa846d3b75070797b9f5675349c7aed562b8a2811932b77fe80e7a21cfea7467ce08a8046fd DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf diff --git a/www-client/chromium/chromium-89.0.4356.6.ebuild b/www-client/chromium/chromium-89.0.4381.6.ebuild similarity index 98% rename from www-client/chromium/chromium-89.0.4356.6.ebuild rename to www-client/chromium/chromium-89.0.4381.6.ebuild index 9a4725ffc82..f23d0f62c75 100644 --- a/www-client/chromium/chromium-89.0.4356.6.ebuild +++ b/www-client/chromium/chromium-89.0.4381.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 2009-2020 Gentoo Authors +# Copyright 2009-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util DESCRIPTION="Open-source version of Google Chrome web browser" HOMEPAGE="https://chromium.org/"; -PATCHSET="3" +PATCHSET="4" PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}" SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip @@ -231,6 +231,7 @@ src_prepare() { local PATCHES=( "${WORKDIR}/patches" + "${FILESDIR}/chromium-shim_headers.patch" ) default @@ -266,13 +267,6 @@ src_prepare() { third_party/angle/src/third_party/libXNVCtrl third_party/angle/src/third_party/trace_event third_party/angle/src/third_party/volk - third_party/angle/third_party/glslang - third_party/angle/third_party/spirv-headers - third_party/angle/third_party/spirv-tools - third_party/angle/third_party/vulkan-headers - third_party/angle/third_party/vulkan-loader - third_party/angle/third_party/vulkan-tools - third_party/angle/third_party/vulkan-validation-layers third_party/apple_apsl third_party/axe-core third_party/blink @@ -330,7 +324,6 @@ src_prepare() { third_party/fusejs third_party/libgifcodec third_party/liburlpattern - third_party/glslang third_party/google_input_tools third_party/google_input_tools/third_party/closure_library third_party/google_input_tools/third_party/closure_library/third_party/closure @@ -416,9 +409,6 @@ src_prepare() { third_party/skia/third_party/skcms third_party/skia/third_party/vulkan third_party/smhasher - third_party/spirv-cross/spirv-cross - third_party/spirv-headers - third_party/SPIRV-Tools third_party/sqlite third_party/swiftshader third_party/swiftshader/third_party/astc-encoder diff --git a/www-client/chromium/files/chromium-shim_headers.patch b/www-client/chromium/files/chromium-shim_headers.patch new file mode 100644 index 00000000000..9372632a3cc --- /dev/null +++ b/www-client/chromium/files/chromium-shim_headers.patch @@ -0,0 +1,48 @@ +From e273172bbafedca36984fc40f4aa6c44b79ac2ef Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <sth...@googlemail.com> +Date: Fri, 25 Dec 2020 09:10:32 +0000 +Subject: [PATCH] shim_headers: fix outputs generation + +--- + build/shim_headers.gni | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/build/shim_headers.gni b/build/shim_headers.gni +index 0900cba..5138647 100644 +--- a/build/shim_headers.gni ++++ b/build/shim_headers.gni +@@ -6,6 +6,8 @@ template("shim_headers") { + action_name = "gen_${target_name}" + config_name = "${target_name}_config" + shim_headers_path = "${root_gen_dir}/shim_headers/${target_name}" ++ shim_root_path = rebase_path(invoker.root_path) ++ shim_rel_path = rebase_path("${shim_root_path}", rebase_path("//")) + + config(config_name) { + include_dirs = [ shim_headers_path ] +@@ -16,7 +18,7 @@ template("shim_headers") { + args = [ + "--generate", + "--headers-root", +- rebase_path(invoker.root_path), ++ "${shim_root_path}", + "--output-directory", + rebase_path(shim_headers_path), + ] +@@ -27,9 +29,10 @@ template("shim_headers") { + ] + } + args += invoker.headers +- +- outputs = process_file_template(invoker.headers, +- "${shim_headers_path}/{{source_file_part}}") ++ outputs = [] ++ foreach(shim_header, invoker.headers) { ++ outputs += [ "${shim_headers_path}/${shim_rel_path}/" + shim_header ] ++ } + } + + group(target_name) { +-- +2.26.2 +
