summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Hartmann <stha09@googlemail.com>2019-10-15 22:17:58 +0200
committerMike Gilbert <floppym@gentoo.org>2019-10-15 16:38:08 -0400
commit4cec086c40b5228ffcd36a277ec8a869e2046e63 (patch)
treec27a4acd72aaececc57b5d66423f7a032906aa60 /www-client/chromium/files
parentdev-lang/duktape: Version bump (diff)
downloadgentoo-4cec086c40b5228ffcd36a277ec8a869e2046e63.tar.gz
gentoo-4cec086c40b5228ffcd36a277ec8a869e2046e63.tar.bz2
gentoo-4cec086c40b5228ffcd36a277ec8a869e2046e63.zip
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>
Diffstat (limited to 'www-client/chromium/files')
-rw-r--r--www-client/chromium/files/chromium-78-icon.patch12
-rw-r--r--www-client/chromium/files/chromium-78-include.patch15
2 files changed, 27 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-78-icon.patch b/www-client/chromium/files/chromium-78-icon.patch
new file mode 100644
index 000000000000..2cca7f10d19c
--- /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 224aa3b35193..3db38eac1c96 100644
--- 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"