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

[Stephan Hartmann]

commit:     0a8328a55c49a608d7ca3da61c1b50445ad47dbf
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 12:12:55 2021 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 12:13:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a8328a5

www-client/chromium: dev channel bump to 90.0.4412.3

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

 www-client/chromium/Manifest                       |  4 ++--
 ...0.4408.0.ebuild => chromium-90.0.4412.3.ebuild} |  3 ++-
 .../chromium/files/chromium-90-unbundle-zlib.patch | 27 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 61d06d19da4..dd09275593e 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,6 +2,6 @@ DIST chromium-88-patchset-3.tar.xz 8396 BLAKE2B 4c978f1a6efef3f71e3dd6340c392b74
 DIST chromium-88.0.4324.150.tar.xz 857377456 BLAKE2B 65f3d4a0f930743d04786a21c10561a93a2eb27c2c06d260495ead6ebf9344b2938f28c083a4077c9d2413f47cb083a83633b571ab1f54b25823fc8db18f504b SHA512 5e0419ce26e58b6ba30586c806fa3001f6c3c094e09c82fb08ed828a199c582308ce9bc0ea445aa0214d29710a586bf5a972553fbef5eab574fb0dc3ebe6280b
 DIST chromium-89-patchset-6.tar.xz 4308 BLAKE2B 22e2db8b5e287925f8b550075e48ad381ccf7ef54e23d8f4e4aedff7fd6cfee8f9e70eff1edb8c867c256ee5ec881ef9379e18278b84b47ff08dcc00f5801667 SHA512 aa5d902c1959f50eb9a0d773a77bf12e5a955d796ee8b18f6e2143573dd73beec62109940e55a858fd9927753dba1d3bf9c1bd940b18a616e7b70b801e93f041
 DIST chromium-89.0.4389.40.tar.xz 890752920 BLAKE2B a4db55ac0621ad2e59c51b80c557c601c48bfd8b4d126195d61c650b8cf3204ed21b5fc65b11708b95d95cfabf48b29e2d5403316bc0523e3355f60e384b251f SHA512 9c31ea969d23197dd4a749648ca404293ee12d14e025c103db8df9e826b7661902ea8edb8a07a8d216026597b058b4efaf4b73afa032a41ad82b8c108dd44c11
-DIST chromium-90-patchset-2.tar.xz 6772 BLAKE2B 1eeca3ee11e6bb8dcafd262c92ba42f58e04ae152ae557de9bd2c0245703093d6e555bed618532542fba4a2080a3c5b49cdaf0973643e5636115b3a7b016759d SHA512 489d07237f2ed1886d06484cdefa2503a080b41659f67a4fa2c313366ddeb359c66e9e256324d362bbeedb0a2919ead198f9da94cd6c8b598590fe8a529387d3
-DIST chromium-90.0.4408.0.tar.xz 914704444 BLAKE2B f48303f95122886e8326f5d584ad7652bced1d149795b0920aebfcaa5b00ed000aee9187c95b676cb7c848f4f821bcd6ef0f2b15df35bf5c4d053b9ce5a5cc6f SHA512 8562f04aa393c7daa1a5053d2b417f5e61e18024bd61081fedb2f9ae7b44fd0331957560907960fde008f38058b42cd8a26bf8a93bec2170091f79e5f833bf1a
+DIST chromium-90-patchset-3.tar.xz 5344 BLAKE2B 19b9d69d5d4aecc18e1a3867fd0c53d01dd873fd533b83fbd8c25d435976dd2176975ccf5d4ebb04f84b6c1c0a009315ef4344fbf575b8ae6942ddfb12d1e1e1 SHA512 97d756b4b4270c7631ca42792e869815c22a786ebba36c2668b99298bcd60f24fd89b52d2491ade07341c20f2bdac933b46b299e52bfe9e45cb57bf056ee050c
+DIST chromium-90.0.4412.3.tar.xz 920864492 BLAKE2B a0d5e6ddc552611231c7ba8fd81da4d2e01e59695eccce33c040ffdd37fa360008cf8c8095f10622902a5e25297db4c10b5c463fdca5e5c46d390db4268f3d17 SHA512 bf168dd2a817823bd9ec7b7c925cddd783366460011782884f02ef15952546d6edef6bb2f08813bfd8be2e64c787e80c2cd449032b9eaf19d2ea7a6eb2294da8
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf

diff --git a/www-client/chromium/chromium-90.0.4408.0.ebuild b/www-client/chromium/chromium-90.0.4412.3.ebuild
similarity index 99%
rename from www-client/chromium/chromium-90.0.4408.0.ebuild
rename to www-client/chromium/chromium-90.0.4412.3.ebuild
index 24b31ce0b6a..613e64db8a5 100644
--- a/www-client/chromium/chromium-90.0.4408.0.ebuild
+++ b/www-client/chromium/chromium-90.0.4412.3.ebuild
@@ -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="2"
+PATCHSET="3"
 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-90-unbundle-zlib.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 	)
 

diff --git a/www-client/chromium/files/chromium-90-unbundle-zlib.patch b/www-client/chromium/files/chromium-90-unbundle-zlib.patch
new file mode 100644
index 00000000000..ad3847515ad
--- /dev/null
+++ b/www-client/chromium/files/chromium-90-unbundle-zlib.patch
@@ -0,0 +1,27 @@
+From 9b04353f502d3fa371231742817b07cb0c41f80c Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@××××××××××.com>
+Date: Mon, 8 Feb 2021 11:15:39 +0000
+Subject: [PATCH] profiling_host: depend on zlib instead of headers only
+
+There is no zlib_common_headers target for unbundled zlib
+and in the end code links against zlib static library anyways.
+---
+ chrome/browser/profiling_host/BUILD.gn | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/browser/profiling_host/BUILD.gn b/chrome/browser/profiling_host/BUILD.gn
+index a68ac82..1ec9d66 100644
+--- a/chrome/browser/profiling_host/BUILD.gn
++++ b/chrome/browser/profiling_host/BUILD.gn
+@@ -24,7 +24,7 @@ static_library("profiling_host") {
+     "//components/version_info",
+     "//content/public/browser",
+     "//content/public/common",
+-    "//third_party/zlib:zlib_common_headers",
++    "//third_party/zlib:zlib",
+ 
+     # Added to support the dependency on //chrome/browser/metrics
+     # TODO(darin): We should instead have a way to express that dependency here.
+-- 
+2.26.2
+