www-client/chromium: beta channel bump to 78.0.3904.50

Closes: https://github.com/gentoo/gentoo/pull/13313
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Stephan Hartmann <stha09@googlemail.com>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 6c9db417742e4ff1e381a62bc1d09847ba0cac2f..8b6fc91ab22fff8475cacd1a4bff5cf967435907 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 DIST chromium-77.0.3865.120.tar.xz 729636120 BLAKE2B 7ff2467b5dd421c3962dd86503975fe042ced4a44e9d3705106ee9c9a7ceaa94c38fea2aefe4913bfe4af40775cb37b175d9a6c70b67d807c227f7e363ba5783 SHA512 4c72c9e9cd9a5d7f89e33c52d117018418ce0f5d23a57341b26ce47c8f90fa55f52a0c976b6959026dc273d5b37aa57306253a9b533172cd133a815edc7bccb4
 DIST chromium-77.0.3865.90.tar.xz 729551228 BLAKE2B 865a40a7fa7d6a0b2de137249f7f14dad32b30cb0099fccc0d21570a2488834c5ab6504ef7c63f334e5d798de5391d6e96beaa49009caecb178d898e27317d89 SHA512 8b343c6ccc798c74cca8d5d41285153ace917da28360192afb21925c103ba425a4045f75c589f73a8c5c75bd1bbca44bfae1a4b96e9b7a97636d9929c7961bbc
-DIST chromium-78-revert-noexcept.patch 69206 BLAKE2B c0cbcd9cf4ca1d22afb0deb90ca0e208abc4853ec0430ded105c76488af38df7fba696531a1b597efb8ffe3f8c9352bf47bfc364db3ffff0f6ccb726bb7e1f94 SHA512 13ab086b40f246fd7397c3f44663e69dd3c996beb657d7c06d1af0730be90135c1097ec555e384a76add4034f69e8bfe23de4d69900df4c67dc6b383d6c3708d
+DIST chromium-78-revert-noexcept-r1.patch.gz 12094 BLAKE2B 1fd0c939af773ed398c9ab14fa80b042b4237cabdbcb06425e4d1c72200ec49c3c1383cfc95013cce4df411b0a2397b79030d41a0379ae80a0c60bae1fbb5ffa SHA512 dcb62b82b34d5d6982762cacfe3ab7d3538d908b3befe7666f5d70d98ba4f979b5bf056e5c5343ed76aa744a643318fc5a75ddedfcb1b7de3e7c28eb2587439f
 DIST chromium-78-revert-pm-observer.patch 22149 BLAKE2B d0169db31948a0a11930d23dbb1fd6573525218a795fe57702cdc6bfef87ce3ab856f8429f5bc9751bf6c96750ad3ed16ce22a4e8be1c57a183da30ca4b56d84 SHA512 68b4558226264aa04af265f7fd42c7319f1cd483d249ad53244efa9d640d99bfb97d39aa8a3e395e1ece4384092b21f7c27d635bc0f3a9f0ba6ddd2f38f4dbae
-DIST chromium-78.0.3904.34.tar.xz 741873348 BLAKE2B 4cf6d35548a41c44dca3dbf9275ac1fe09e6ce3108b7b4bc3b90034e4780456ae399ea368ed67ef3cce9cd3b00265ddfd765da837214a51437d333c288ba1e7e SHA512 d1c7b75fc2b4e5acbb89f9044a87e678db4ad99e805448716daf0227d8760b02d08b090ff3dbbb2f3aad5f7a1c488a59345cf209cb609cca6781b8e3353e1f32
+DIST chromium-78.0.3904.50.tar.xz 741967532 BLAKE2B 01f544b61209ee4778642a8cd7b55f36425ec61b4a59751f10f93fafb898dde8c15a374c4ede4197974c7b382646277188507ecc04bc92e69f235a4846c78de6 SHA512 699d1880d81343fb81db407adc5b257b44761fe921f352c69d3c41dc4b21b1eb61875f49fdcc060d6a6133c7542609f93f03088609ed0f589f52b41dec72d484

diff --git a/www-client/chromium/chromium-78.0.3904.34.ebuild b/www-client/chromium/chromium-78.0.3904.50.ebuild
similarity index 99%
rename from www-client/chromium/chromium-78.0.3904.34.ebuild
rename to www-client/chromium/chromium-78.0.3904.50.ebuild
index 525ed7e65b692bf2b04030a4c955adb5bf922d57..da61abdb04751a1f38b6d2dca4b31f005bc3300f 100644 (file)
--- a/www-client/chromium/chromium-78.0.3904.34.ebuild
+++ b/www-client/chromium/chromium-78.0.3904.50.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="http://chromium.org/"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-       https://dev.gentoo.org/~floppym/dist/chromium-78-revert-noexcept.patch
+       https://dev.gentoo.org/~floppym/dist/chromium-78-revert-noexcept-r1.patch.gz
        https://dev.gentoo.org/~floppym/dist/chromium-78-revert-pm-observer.patch
 "
 
@@ -151,8 +151,9 @@ PATCHES=(
        "${FILESDIR}/chromium-77-clang.patch"
        "${FILESDIR}/chromium-77-pulseaudio-13.patch"
        "${FILESDIR}/chromium-78-include.patch"
+       "${FILESDIR}/chromium-78-icon.patch"
        "${FILESDIR}/chromium-78-protobuf-export.patch"
-       "${DISTDIR}/chromium-78-revert-noexcept.patch"
+       "${WORKDIR}/chromium-78-revert-noexcept-r1.patch"
        "${DISTDIR}/chromium-78-revert-pm-observer.patch"
        "${FILESDIR}/chromium-78-gcc-enum-range.patch"
        "${FILESDIR}/chromium-78-gcc-std-vector.patch"

diff --git a/www-client/chromium/files/chromium-78-icon.patch b/www-client/chromium/files/chromium-78-icon.patch
new file mode 100644 (file)
index 0000000..2cca7f1
--- /dev/null
+++ b/www-client/chromium/files/chromium-78-icon.patch
@@ -0,0 +1,12 @@
+diff --git a/ui/platform_window/x11/x11_window.cc b/ui/platform_window/x11/x11_window.cc
+index 7a3a6eb..7c01534 100644
+--- a/ui/platform_window/x11/x11_window.cc
++++ b/ui/platform_window/x11/x11_window.cc
+@@ -67,6 +67,7 @@ ui::XWindow::Configuration ConvertInitPropertiesToXWindowConfig(
+   config.wm_role_name = properties.wm_role_name;
+   config.activatable = properties.activatable;
+   config.visual_id = properties.x_visual_id;
++  config.icon = properties.icon;
+   return config;
+ }
+ 

diff --git a/www-client/chromium/files/chromium-78-include.patch b/www-client/chromium/files/chromium-78-include.patch
index 224aa3b3519316c6696a4943748f09b1850c4ad7..3db38eac1c96b467989e640d81e2805616f0d2a1 100644 (file)
--- a/www-client/chromium/files/chromium-78-include.patch
+++ b/www-client/chromium/files/chromium-78-include.patch
@@ -23,3 +23,18 @@ index 959440f..c3fd542 100644
  #include "base/optional.h"
  #include "third_party/blink/public/platform/web_common.h"
  
+Missing include due to reverting ProfileManagerObserver
+---
+
+diff --git a/chrome/browser/web_applications/extensions/bookmark_app_util.cc b/chrome/browser/web_applications/extensions/bookmark_app_util.cc
+index ee4b70a..b31e5f5 100644
+--- a/chrome/browser/web_applications/extensions/bookmark_app_util.cc
++++ b/chrome/browser/web_applications/extensions/bookmark_app_util.cc
+@@ -7,6 +7,7 @@
+ #include "base/strings/string_piece.h"
+ #include "base/values.h"
+ #include "chrome/browser/extensions/extension_service.h"
++#include "chrome/browser/profiles/profile.h"
+ #include "chrome/browser/web_applications/components/app_registrar.h"
+ #include "chrome/browser/web_applications/components/web_app_provider_base.h"
+ #include "chrome/common/chrome_features.h"