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

[Mike Gilbert]

commit:     32078ebc5c7fd360d342e3a974af95f4c25fcf40
Author:     Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Fri Aug 23 07:59:48 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 14:05:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32078ebc

www-client/chromium: beta channel bump to 77.0.3865.42

Also add patch to fix a crash when cups is disabled.

Bug: https://bugs.gentoo.org/691354
Closes: https://github.com/gentoo/gentoo/pull/12770
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 +-
 ...3865.35.ebuild => chromium-77.0.3865.42.ebuild} |  1 +
 .../chromium/files/chromium-77-gcc-include.patch   | 30 ----------------
 .../chromium/files/chromium-77-no-cups.patch       | 42 ++++++++++++++++++++++
 4 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index a9c13c52880..99a63a6b936 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.35.tar.xz 733139780 BLAKE2B ac4040901efe6772e93dc30e371a1d63b4ea95e0a38632bcdd1aa5603674eb5696186f848916893b9138f0d1018c7b08293803afdf20e8c61e30af42c2ba26d0 SHA512 c2aa64f7153dc2992e35e8a2fa9c56fbc0684133a44e50b0986d6c423527f12cdb57f1ca503a9d4b4424003ab04eb33c270d2c4f3af6aeb23cb8506e92040f36
+DIST chromium-77.0.3865.42.tar.xz 733180328 BLAKE2B 6216edc93235ceda6fbe05fab935f028965ad9c363d80012f192d77462f7381f644809a23becc9850780c3a93e6863f8e3263631fe86e0334ecbe65d58008868 SHA512 2b6fa1b637d52d3ac8bc9fded568957332a7f0c7a2fac32c80385c2398ac1ee0546d399960bc5c8fe8df7fceefd2113c0f1be41107da0642294333064870f773
 DIST chromium-78.0.3887.7.tar.xz 737057024 BLAKE2B b4754f1fa9a243c29e83d6136494c6db1726a6d3f23013115a4a576428f7ca3c0fcd3f81cf7fe4037f2c3e6901b3fce015aeed7b7b945b4a3e368f2e6fb9afa1 SHA512 9b8eb33c6f19e5b247372e19a61ec1ae6c804bd7b9731222430e2e1b585146fc543a686ccfc9553d6d137999570c544cdb45696db6ce50c38dfead1b0760c1a4

diff --git a/www-client/chromium/chromium-77.0.3865.35.ebuild b/www-client/chromium/chromium-77.0.3865.42.ebuild
similarity index 99%
rename from www-client/chromium/chromium-77.0.3865.35.ebuild
rename to www-client/chromium/chromium-77.0.3865.42.ebuild
index 8dafa2ccfc0..8e372c62324 100644
--- a/www-client/chromium/chromium-77.0.3865.35.ebuild
+++ b/www-client/chromium/chromium-77.0.3865.42.ebuild
@@ -151,6 +151,7 @@ PATCHES=(
 	"${FILESDIR}/chromium-77-clang.patch"
 	"${FILESDIR}/chromium-77-blink-include.patch"
 	"${FILESDIR}/chromium-77-std-string.patch"
+	"${FILESDIR}/chromium-77-no-cups.patch"
 	"${FILESDIR}/chromium-77-gcc-abstract.patch"
 	"${FILESDIR}/chromium-77-gcc-include.patch"
 )

diff --git a/www-client/chromium/files/chromium-77-gcc-include.patch b/www-client/chromium/files/chromium-77-gcc-include.patch
index f46403992c1..391f48fd2d9 100644
--- a/www-client/chromium/files/chromium-77-gcc-include.patch
+++ b/www-client/chromium/files/chromium-77-gcc-include.patch
@@ -24,33 +24,3 @@ index 7f8d15b..a8cd0ab 100644
  #include "low_pass_filter.h"
  
  namespace one_euro_filter {
-
-From 258f5f182f8dd72f727af26e614794c67a5996e6 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@×××.com>
-Date: Fri, 26 Jul 2019 15:17:54 +0000
-Subject: [PATCH] IWYU: ScopedObserver of TabStripModel requires it to be included
-
-Build with GCC and libstdc++ is failing in files using tab_sharing_ui.h
-as it has a ScopedObserver of a TabStripModel without including it
-in advance.
-
-Bug: 819294
-Change-Id: I4b12073484f65ad2bb873119daa748245296d282
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1713526
-Reviewed-by: Guido Urdaneta <guidou@××××××××.org>
-Commit-Queue: José Dapena Paz <jose.dapena@×××.com>
-Cr-Commit-Position: refs/heads/master@{#681290}
----
-
-diff --git a/chrome/browser/ui/tab_sharing/tab_sharing_ui.h b/chrome/browser/ui/tab_sharing/tab_sharing_ui.h
-index 6d931129..147868f 100644
---- a/chrome/browser/ui/tab_sharing/tab_sharing_ui.h
-+++ b/chrome/browser/ui/tab_sharing/tab_sharing_ui.h
-@@ -14,6 +14,7 @@
- #include "base/strings/string16.h"
- #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"
- #include "chrome/browser/ui/browser_list_observer.h"
-+#include "chrome/browser/ui/tabs/tab_strip_model.h"
- #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
- #include "components/infobars/core/infobar_manager.h"
- #include "content/public/browser/desktop_media_id.h"

diff --git a/www-client/chromium/files/chromium-77-no-cups.patch b/www-client/chromium/files/chromium-77-no-cups.patch
new file mode 100644
index 00000000000..ac714178ed3
--- /dev/null
+++ b/www-client/chromium/files/chromium-77-no-cups.patch
@@ -0,0 +1,42 @@
+From f768afdd3104e7da663aa82e1e8f969aea3f85c3 Mon Sep 17 00:00:00 2001
+From: Lei Zhang <thestig@××××××××.org>
+Date: Thu, 22 Aug 2019 11:44:27 -0700
+Subject: [PATCH] Handle unsupported configs in CreatePrinterHandlerTaskRunner().
+
+CreatePrinterHandlerTaskRunner(), which was added in
+https://crrev.com/658397, used ifdefs to only handle the supported build
+configs. Add a #else case as a catch-all to conservatively handle the
+unsupported configs. Since it is only a couple lines of trivial code,
+doing this does not create much of a maintenance burden.
+
+(backported to chromium-77)
+
+Bug: 990727
+Change-Id: I07bd21abaeffc8223e88b519c3891185d5d2be12
+---
+
+diff --git a/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc b/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc
+index a1f3fd3..6e81f5e 100644
+--- a/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc
++++ b/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc
+@@ -33,12 +33,15 @@ scoped_refptr<base::TaskRunner> CreatePrinterHandlerTaskRunner() {
+   static constexpr base::TaskTraits kTraits = {
+       base::MayBlock(), base::TaskPriority::USER_VISIBLE};
+
+-#if defined(OS_WIN)
+-  // Windows drivers are likely not thread-safe.
+-  return base::CreateSingleThreadTaskRunnerWithTraits(kTraits);
+-#elif defined(USE_CUPS)
++#if defined(USE_CUPS)
+   // CUPS is thread safe.
+-  return base::CreateTaskRunnerWithTraits(kTraits);
++  return base::CreateTaskRunner(kTraits);
++#elif defined(OS_WIN)
++  // Windows drivers are likely not thread-safe.
++  return base::CreateSingleThreadTaskRunner(kTraits);
++#else
++  // Be conservative on unsupported platforms.
++  return base::CreateSingleThreadTaskRunner(kTraits);
+ #endif
+ }
+