1 |
commit: 8a4db4358f52de35b083dd97ef11b735fafa6158 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 17 17:46:53 2019 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 17 17:53:25 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a4db435 |
7 |
|
8 |
www-client/chromium: backport another gcc fix |
9 |
|
10 |
Closes: https://bugs.gentoo.org/678158 |
11 |
Package-Manager: Portage-2.3.59_p2, Repoman-2.3.12_p67 |
12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
13 |
|
14 |
www-client/chromium/chromium-73.0.3683.27.ebuild | 1 + |
15 |
www-client/chromium/files/chromium-73-gcc-6.patch | 88 +++++++++++++++++++++++ |
16 |
2 files changed, 89 insertions(+) |
17 |
|
18 |
diff --git a/www-client/chromium/chromium-73.0.3683.27.ebuild b/www-client/chromium/chromium-73.0.3683.27.ebuild |
19 |
index 551c1a943fd..2c9e1dc2113 100644 |
20 |
--- a/www-client/chromium/chromium-73.0.3683.27.ebuild |
21 |
+++ b/www-client/chromium/chromium-73.0.3683.27.ebuild |
22 |
@@ -146,6 +146,7 @@ PATCHES=( |
23 |
"${FILESDIR}/chromium-73-gcc-3.patch" |
24 |
"${FILESDIR}/chromium-73-gcc-4.patch" |
25 |
"${FILESDIR}/chromium-73-gcc-5.patch" |
26 |
+ "${FILESDIR}/chromium-73-gcc-6.patch" |
27 |
) |
28 |
|
29 |
pre_build_checks() { |
30 |
|
31 |
diff --git a/www-client/chromium/files/chromium-73-gcc-6.patch b/www-client/chromium/files/chromium-73-gcc-6.patch |
32 |
new file mode 100644 |
33 |
index 00000000000..3cd72ab318d |
34 |
--- /dev/null |
35 |
+++ b/www-client/chromium/files/chromium-73-gcc-6.patch |
36 |
@@ -0,0 +1,88 @@ |
37 |
+From cf4c534f04c223f8a9d65407852e2a531a6d7fb6 Mon Sep 17 00:00:00 2001 |
38 |
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
39 |
+Date: Thu, 14 Feb 2019 22:22:21 +0000 |
40 |
+Subject: [PATCH] chrome/browser: Replace some forward declarations with actual |
41 |
+ includes |
42 |
+MIME-Version: 1.0 |
43 |
+Content-Type: text/plain; charset=UTF-8 |
44 |
+Content-Transfer-Encoding: 8bit |
45 |
+ |
46 |
+This fixes the GCC build which was failing like this: |
47 |
+ |
48 |
+ ../../base/scoped_observer.h: In instantiation of ‘void ScopedObserver<Source, Observer>::RemoveAll() [with Source = TabStripModel; Observer = TabStripModelObserver]’: |
49 |
+ ../../base/scoped_observer.h:26:5: required from ‘ScopedObserver<Source, Observer>::~ScopedObserver() [with Source = TabStripModel; Observer = TabStripModelObserver]’ |
50 |
+ ../../chrome/browser/ui/views/extensions/extension_popup.h:115:70: required from here |
51 |
+ ../../base/scoped_observer.h:45:20: error: invalid use of incomplete type ‘class TabStripModel’ |
52 |
+ sources_[i]->RemoveObserver(observer_); |
53 |
+ ~~~~~~~~~~~~~^~~~~~~~~~~~~~ |
54 |
+ |
55 |
+This is caused by https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89311 ("Brace |
56 |
+initialization needlessly invokes destructor"), i.e. having something like |
57 |
+ |
58 |
+ ScopedObserver<T, U> observer_{this}; |
59 |
+ |
60 |
+in a header declaration requires T and U to be fully declared because |
61 |
+ScopedObserver's destructor references them. In a few cases, T was only |
62 |
+forward-declared. |
63 |
+ |
64 |
+Bug: 819294 |
65 |
+Change-Id: Ie5b9dc2745e27d4532c5539e3845a8c9147a0595 |
66 |
+Reviewed-on: https://chromium-review.googlesource.com/c/1472576 |
67 |
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
68 |
+Commit-Queue: Alan Cutter <alancutter@××××××××.org> |
69 |
+Reviewed-by: Finnur Thorarinsson <finnur@××××××××.org> |
70 |
+Reviewed-by: Alan Cutter <alancutter@××××××××.org> |
71 |
+Cr-Commit-Position: refs/heads/master@{#632385} |
72 |
+--- |
73 |
+ chrome/browser/ui/views/extensions/extension_popup.cc | 1 - |
74 |
+ chrome/browser/ui/views/extensions/extension_popup.h | 1 + |
75 |
+ chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc | 1 - |
76 |
+ chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h | 2 +- |
77 |
+ .../web_applications/extensions/bookmark_app_tab_helper.cc | 1 - |
78 |
+ .../web_applications/extensions/bookmark_app_tab_helper.h | 2 +- |
79 |
+ 6 files changed, 3 insertions(+), 5 deletions(-) |
80 |
+ |
81 |
+diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc |
82 |
+index 3f0985d383dd..57d16aba9e9f 100644 |
83 |
+--- a/chrome/browser/ui/views/extensions/extension_popup.cc |
84 |
++++ b/chrome/browser/ui/views/extensions/extension_popup.cc |
85 |
+@@ -8,7 +8,6 @@ |
86 |
+ #include "chrome/browser/devtools/devtools_window.h" |
87 |
+ #include "chrome/browser/extensions/extension_view_host.h" |
88 |
+ #include "chrome/browser/ui/browser.h" |
89 |
+-#include "chrome/browser/ui/tabs/tab_strip_model.h" |
90 |
+ #include "content/public/browser/devtools_agent_host.h" |
91 |
+ #include "content/public/browser/notification_details.h" |
92 |
+ #include "content/public/browser/notification_source.h" |
93 |
+diff --git a/chrome/browser/ui/views/extensions/extension_popup.h b/chrome/browser/ui/views/extensions/extension_popup.h |
94 |
+index 3661b5bda950..9018efa0fea5 100644 |
95 |
+--- a/chrome/browser/ui/views/extensions/extension_popup.h |
96 |
++++ b/chrome/browser/ui/views/extensions/extension_popup.h |
97 |
+@@ -9,6 +9,7 @@ |
98 |
+ #include "base/compiler_specific.h" |
99 |
+ #include "base/macros.h" |
100 |
+ #include "base/scoped_observer.h" |
101 |
++#include "chrome/browser/ui/tabs/tab_strip_model.h" |
102 |
+ #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
103 |
+ #include "chrome/browser/ui/views/extensions/extension_view_views.h" |
104 |
+ #include "content/public/browser/devtools_agent_host_observer.h" |
105 |
+diff --git a/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h b/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h |
106 |
+index 2a3ea8e4f91f..ac44a4f05dec 100644 |
107 |
+--- a/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h |
108 |
++++ b/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h |
109 |
+@@ -8,6 +8,7 @@ |
110 |
+ #include "base/macros.h" |
111 |
+ #include "base/memory/weak_ptr.h" |
112 |
+ #include "base/scoped_observer.h" |
113 |
++#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" |
114 |
+ #include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h" |
115 |
+ #include "chrome/browser/ui/views/frame/app_menu_button_observer.h" |
116 |
+ #include "ui/views/controls/scroll_view.h" |
117 |
+@@ -16,7 +17,6 @@ class AppMenu; |
118 |
+ class AppMenuButton; |
119 |
+ class Browser; |
120 |
+ class BrowserActionsContainer; |
121 |
+-class ToolbarActionsBar; |
122 |
+ |
123 |
+ namespace views { |
124 |
+ class MenuItemView; |