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

[Mike Gilbert]

commit:     ce201e2e6931f3499c5b05911681fbf994530832
Author:     Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Thu Aug 15 06:53:32 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 14:50:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce201e2e

www-client/chromium: dev channel bump to 78.0.3880.4

Closes: https://bugs.gentoo.org/684550
Closes: https://github.com/gentoo/gentoo/pull/12712
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 www-client/chromium/Manifest                       |  2 +-
 ...0.3876.0.ebuild => chromium-78.0.3880.4.ebuild} | 13 ++++++++++-
 .../files/chromium-78-const-std-string.patch       | 26 ++++++++++++++++++++++
 .../chromium/files/chromium-78-include.patch       | 13 +++++++++++
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 1dbf913705b..0d8d5bc4929 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,3 +1,3 @@
 DIST chromium-76.0.3809.100.tar.xz 728852892 BLAKE2B 1bd80f7fd50f82843f9367bd8d5648bcbe4b763594679cc7f57084390da840cc89d7771ffd844e3d0a3c3248d8f98a1babecabaf4c3104fa7a89efed88eae608 SHA512 63cfb45dc6bb0b1662ba4ffebc6313c24d65dae10a61752575e34a24d8d3d6f80e0422a984b560b259c299d6e493dfa177907201a1c1f785a7e294c9a03bd8a1
 DIST chromium-77.0.3865.19.tar.xz 733147416 BLAKE2B 6dc8827876c25ad43a97d1297a2a93681a5895c32f31605896eb7ca2cad22e1b192958330167a74243a61a4ce88dd21dfb21e820d717a8c44baaf084fe73f0a2 SHA512 7f4413c4a63351fc44efaae1a5803be3019dcf59541ef306bcc13b22436dc1dc7b968d4f2eb6906bc1ec5db8dd669fa5fd45da2d4240ee6029e337e63d3f25ed
-DIST chromium-78.0.3876.0.tar.xz 734181968 BLAKE2B 8f9d368718dec697f8e1d5fb850739395247c65fd1cfe9a420c46ea2254a97c54893a0fec9a3366b3b0a62720ea20d5f090f7edde3503cca1d2fd725aae6bbd1 SHA512 9b0b71a4084db3e5ceedea5eaa1173e168e73ace3215ca2cc37309b6cd7150ed6dc63d2ec43387d305a4340036988493f1644db354c620bc80a02b97ec3e0315
+DIST chromium-78.0.3880.4.tar.xz 734959036 BLAKE2B e93497cdc00c123f31b98be87c2b4c7e4e7ac18fdddf15e9c4ba6c08c89386c38f9451e432a8365cc6e1a47af244ba8d10da94acca3f108c0993f993b47a18b6 SHA512 4adf66caca7565c17571b2c9056acac3b1edbcf29ad9f8937cde241406242f4e30ac361047dddf2a60f4319245698d6872a24eae0374a142d13e3fea0c5b12ea

diff --git a/www-client/chromium/chromium-78.0.3876.0.ebuild b/www-client/chromium/chromium-78.0.3880.4.ebuild
similarity index 98%
rename from www-client/chromium/chromium-78.0.3876.0.ebuild
rename to www-client/chromium/chromium-78.0.3880.4.ebuild
index afcf4ae1816..72de8e0f371 100644
--- a/www-client/chromium/chromium-78.0.3876.0.ebuild
+++ b/www-client/chromium/chromium-78.0.3880.4.ebuild
@@ -148,8 +148,9 @@ PATCHES=(
 	"${FILESDIR}/chromium-77-fix-gn-gen.patch"
 	"${FILESDIR}/chromium-77-system-icu.patch"
 	"${FILESDIR}/chromium-77-clang.patch"
-	"${FILESDIR}/chromium-77-std-string.patch"
 	"${FILESDIR}/chromium-77-blink-include.patch"
+	"${FILESDIR}/chromium-78-const-std-string.patch"
+	"${FILESDIR}/chromium-78-include.patch"
 )
 
 pre_build_checks() {
@@ -322,6 +323,7 @@ src_prepare() {
 		third_party/pffft
 		third_party/ply
 		third_party/polymer
+		third_party/private-join-and-compute
 		third_party/protobuf
 		third_party/protobuf/third_party/six
 		third_party/pyjson5
@@ -622,6 +624,12 @@ src_compile() {
 	use suid && eninja -C out/Release chrome_sandbox
 
 	pax-mark m out/Release/chrome
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
 }
 
 src_install() {
@@ -700,6 +708,9 @@ src_install() {
 	insinto /usr/share/gnome-control-center/default-apps
 	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
 
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+
 	readme.gentoo_create_doc
 }
 

diff --git a/www-client/chromium/files/chromium-78-const-std-string.patch b/www-client/chromium/files/chromium-78-const-std-string.patch
new file mode 100644
index 00000000000..e16377aff41
--- /dev/null
+++ b/www-client/chromium/files/chromium-78-const-std-string.patch
@@ -0,0 +1,26 @@
+diff --git a/chrome/test/chromedriver/webauthn_commands.cc b/chrome/test/chromedriver/webauthn_commands.cc
+index b0d4d62..6369d74 100644
+--- a/chrome/test/chromedriver/webauthn_commands.cc
++++ b/chrome/test/chromedriver/webauthn_commands.cc
+@@ -36,8 +36,8 @@ base::DictionaryValue MapParams(
+ // Converts the string |keys| in |params| from base64url to base64. Returns a
+ // status error if conversion of one of the keys failed.
+ Status ConvertBase64UrlToBase64(base::Value* params,
+-                                const std::vector<const std::string> keys) {
+-  for (const std::string key : keys) {
++                                const std::vector<std::string> keys) {
++  for (std::string key : keys) {
+     base::Value* maybe_value = params->FindKey(key);
+     if (!maybe_value)
+       continue;
+@@ -60,8 +60,8 @@ Status ConvertBase64UrlToBase64(base::Value* params,
+ 
+ // Converts the string |keys| in |params| from base64 to base64url.
+ void ConvertBase64ToBase64Url(base::Value* params,
+-                              const std::vector<const std::string> keys) {
+-  for (const std::string key : keys) {
++                              const std::vector<std::string> keys) {
++  for (std::string key : keys) {
+     std::string* maybe_value = params->FindStringKey(key);
+     if (!maybe_value)
+       continue;

diff --git a/www-client/chromium/files/chromium-78-include.patch b/www-client/chromium/files/chromium-78-include.patch
new file mode 100644
index 00000000000..a0b77c4fb9d
--- /dev/null
+++ b/www-client/chromium/files/chromium-78-include.patch
@@ -0,0 +1,13 @@
+diff --git a/components/password_manager/core/browser/leak_detection/encryption_utils.cc b/components/password_manager/core/browser/leak_detection/encryption_utils.cc
+index 31a7116..53eb464 100644
+--- a/components/password_manager/core/browser/leak_detection/encryption_utils.cc
++++ b/components/password_manager/core/browser/leak_detection/encryption_utils.cc
+@@ -13,6 +13,8 @@
+ #include "crypto/sha2.h"
+ #include "third_party/boringssl/src/include/openssl/evp.h"
+ 
++#include <climits>
++
+ namespace password_manager {
+ 
+ namespace {