1 |
commit: a8cee29e8bfb76d27b97f5059fe51f70aefc6c85 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 29 02:20:33 2018 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 5 00:20:19 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8cee29e |
7 |
|
8 |
www-client/chromium: allow gcc for M70 |
9 |
|
10 |
Thanks to Garry Filakhtov. |
11 |
|
12 |
Bug: https://bugs.gentoo.org/669542 |
13 |
Package-Manager: Portage-2.3.51_p2, Repoman-2.3.11_p27 |
14 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
15 |
|
16 |
.../chromium/chromium-70.0.3538.67-r1.ebuild | 8 +- |
17 |
www-client/chromium/files/chromium-70-gcc-0.patch | 70 ++++++++++++++++ |
18 |
www-client/chromium/files/chromium-70-gcc-1.patch | 98 ++++++++++++++++++++++ |
19 |
www-client/chromium/files/chromium-70-gcc-2.patch | 37 ++++++++ |
20 |
4 files changed, 212 insertions(+), 1 deletion(-) |
21 |
|
22 |
diff --git a/www-client/chromium/chromium-70.0.3538.67-r1.ebuild b/www-client/chromium/chromium-70.0.3538.67-r1.ebuild |
23 |
index 6d86b451b47..45613e9b729 100644 |
24 |
--- a/www-client/chromium/chromium-70.0.3538.67-r1.ebuild |
25 |
+++ b/www-client/chromium/chromium-70.0.3538.67-r1.ebuild |
26 |
@@ -105,7 +105,7 @@ DEPEND="${COMMON_DEPEND} |
27 |
dev-vcs/git |
28 |
" |
29 |
|
30 |
-: ${CHROMIUM_FORCE_CLANG=yes} |
31 |
+: ${CHROMIUM_FORCE_CLANG=no} |
32 |
|
33 |
if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then |
34 |
DEPEND+=" >=sys-devel/clang-5" |
35 |
@@ -143,6 +143,9 @@ PATCHES=( |
36 |
"${FILESDIR}/chromium-stdint.patch" |
37 |
"${FILESDIR}/chromium-pdfium-stdlib-r0.patch" |
38 |
"${FILESDIR}/chromium-harfbuzz-r0.patch" |
39 |
+ "${FILESDIR}/chromium-70-gcc-0.patch" |
40 |
+ "${FILESDIR}/chromium-70-gcc-1.patch" |
41 |
+ "${FILESDIR}/chromium-70-gcc-2.patch" |
42 |
) |
43 |
|
44 |
pre_build_checks() { |
45 |
@@ -577,6 +580,9 @@ src_configure() { |
46 |
} |
47 |
|
48 |
src_compile() { |
49 |
+ # Final link uses lots of file descriptors. |
50 |
+ ulimit -n 2048 || die |
51 |
+ |
52 |
# Calling this here supports resumption via FEATURES=keepwork |
53 |
python_setup |
54 |
|
55 |
|
56 |
diff --git a/www-client/chromium/files/chromium-70-gcc-0.patch b/www-client/chromium/files/chromium-70-gcc-0.patch |
57 |
new file mode 100644 |
58 |
index 00000000000..7005d373254 |
59 |
--- /dev/null |
60 |
+++ b/www-client/chromium/files/chromium-70-gcc-0.patch |
61 |
@@ -0,0 +1,70 @@ |
62 |
+From e98f8ef8b2f236ecbb01df8c39e6ee1c8fbe8d7d Mon Sep 17 00:00:00 2001 |
63 |
+From: Maksim Sisov <msisov@××××××.com> |
64 |
+Date: Thu, 13 Sep 2018 15:17:29 +0000 |
65 |
+Subject: [PATCH] ScrollPaintPropertyNode: Rename SnapContainerData() to |
66 |
+ GetSnapContainerData() |
67 |
+ |
68 |
+GCC is stricter than clang when it comes to class members' names and how |
69 |
+they can change the meaning of a previously existing symbol with the same |
70 |
+name. |
71 |
+ |
72 |
+Here is a short error message: |
73 |
+ |
74 |
+error: changes meaning of 'SnapContainerData' from 'using SnapContainerData = |
75 |
+class cc::SnapContainerData' [-fpermissive] using SnapContainerData = |
76 |
+cc::SnapContainerData; |
77 |
+ |
78 |
+Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel |
79 |
+Change-Id: I0de5460f17b13484253e1ff0538b111c9a3b0d13 |
80 |
+Reviewed-on: https://chromium-review.googlesource.com/1213180 |
81 |
+Commit-Queue: Maksim Sisov <msisov@××××××.com> |
82 |
+Reviewed-by: Philip Rogers <pdr@××××××××.org> |
83 |
+Cr-Commit-Position: refs/heads/master@{#591015} |
84 |
+--- |
85 |
+ .../renderer/core/paint/paint_property_tree_update_tests.cc | 2 +- |
86 |
+ .../platform/graphics/compositing/property_tree_manager.cc | 2 +- |
87 |
+ .../platform/graphics/paint/scroll_paint_property_node.h | 2 +- |
88 |
+ 3 files changed, 3 insertions(+), 3 deletions(-) |
89 |
+ |
90 |
+diff --git a/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc b/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc |
91 |
+index 0d999d45076f..1fe1815a5659 100644 |
92 |
+--- a/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc |
93 |
++++ b/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc |
94 |
+@@ -1310,7 +1310,7 @@ TEST_P(PaintPropertyTreeUpdateTest, EnsureSnapContainerData) { |
95 |
+ GetDocument().View()->Resize(300, 300); |
96 |
+ GetDocument().View()->UpdateAllLifecyclePhases(); |
97 |
+ |
98 |
+- auto doc_snap_container_data = DocScroll()->SnapContainerData(); |
99 |
++ auto doc_snap_container_data = DocScroll()->GetSnapContainerData(); |
100 |
+ ASSERT_TRUE(doc_snap_container_data); |
101 |
+ EXPECT_EQ(doc_snap_container_data->scroll_snap_type().axis, SnapAxis::kBoth); |
102 |
+ EXPECT_EQ(doc_snap_container_data->scroll_snap_type().strictness, |
103 |
+diff --git a/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc b/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc |
104 |
+index 745b8c8b387e..5f87eeea9435 100644 |
105 |
+--- a/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc |
106 |
++++ b/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc |
107 |
+@@ -333,7 +333,7 @@ void PropertyTreeManager::CreateCompositorScrollNode( |
108 |
+ scroll_node->OverscrollBehaviorX()), |
109 |
+ static_cast<cc::OverscrollBehavior::OverscrollBehaviorType>( |
110 |
+ scroll_node->OverscrollBehaviorY())); |
111 |
+- compositor_node.snap_container_data = scroll_node->SnapContainerData(); |
112 |
++ compositor_node.snap_container_data = scroll_node->GetSnapContainerData(); |
113 |
+ |
114 |
+ auto compositor_element_id = scroll_node->GetCompositorElementId(); |
115 |
+ if (compositor_element_id) { |
116 |
+diff --git a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h |
117 |
+index e1479269ccc3..5bd7f65f10ba 100644 |
118 |
+--- a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h |
119 |
++++ b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h |
120 |
+@@ -99,7 +99,7 @@ class PLATFORM_EXPORT ScrollPaintPropertyNode |
121 |
+ return state_.overscroll_behavior.y; |
122 |
+ } |
123 |
+ |
124 |
+- base::Optional<SnapContainerData> SnapContainerData() const { |
125 |
++ base::Optional<SnapContainerData> GetSnapContainerData() const { |
126 |
+ return state_.snap_container_data; |
127 |
+ } |
128 |
+ |
129 |
+-- |
130 |
+2.19.1 |
131 |
+ |
132 |
|
133 |
diff --git a/www-client/chromium/files/chromium-70-gcc-1.patch b/www-client/chromium/files/chromium-70-gcc-1.patch |
134 |
new file mode 100644 |
135 |
index 00000000000..bca2a1f8e80 |
136 |
--- /dev/null |
137 |
+++ b/www-client/chromium/files/chromium-70-gcc-1.patch |
138 |
@@ -0,0 +1,98 @@ |
139 |
+From 87902b3202f81d689dd314c17006ffc907fe12a1 Mon Sep 17 00:00:00 2001 |
140 |
+From: Wang Qing <wangqing-hf@××××××××.cn> |
141 |
+Date: Mon, 3 Sep 2018 02:41:08 +0000 |
142 |
+Subject: [PATCH] Fix build error for blink. |
143 |
+MIME-Version: 1.0 |
144 |
+Content-Type: text/plain; charset=UTF-8 |
145 |
+Content-Transfer-Encoding: 8bit |
146 |
+ |
147 |
+This CLs fixed the error of constexpr function call to non-constexpr function. |
148 |
+ |
149 |
+Bug: 878202 |
150 |
+Change-Id: I6ad217a687e62a9a384980d852743a56479de3a9 |
151 |
+Reviewed-on: https://chromium-review.googlesource.com/1192467 |
152 |
+Commit-Queue: 汪 清 <wangqing-hf@××××××××.cn> |
153 |
+Reviewed-by: Eric Willigers <ericwilligers@××××××××.org> |
154 |
+Cr-Commit-Position: refs/heads/master@{#588316} |
155 |
+--- |
156 |
+ .../core/animation/animation_time_delta.cc | 22 ++++++++++++++ |
157 |
+ .../core/animation/animation_time_delta.h | 30 +++++++------------ |
158 |
+ 2 files changed, 32 insertions(+), 20 deletions(-) |
159 |
+ |
160 |
+diff --git a/third_party/blink/renderer/core/animation/animation_time_delta.cc b/third_party/blink/renderer/core/animation/animation_time_delta.cc |
161 |
+index 1b25469c7f2f..2e30a18890da 100644 |
162 |
+--- a/third_party/blink/renderer/core/animation/animation_time_delta.cc |
163 |
++++ b/third_party/blink/renderer/core/animation/animation_time_delta.cc |
164 |
+@@ -7,6 +7,28 @@ |
165 |
+ namespace blink { |
166 |
+ |
167 |
+ #if !defined(BLINK_ANIMATION_USE_TIME_DELTA) |
168 |
++// Comparison operators on AnimationTimeDelta. |
169 |
++bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs, |
170 |
++ const AnimationTimeDelta& rhs) { |
171 |
++ return lhs.InSecondsF() == rhs.InSecondsF(); |
172 |
++} |
173 |
++bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs, |
174 |
++ const AnimationTimeDelta& rhs) { |
175 |
++ return lhs.InSecondsF() != rhs.InSecondsF(); |
176 |
++} |
177 |
++bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs, |
178 |
++ const AnimationTimeDelta& rhs) { |
179 |
++ return lhs.InSecondsF() > rhs.InSecondsF(); |
180 |
++} |
181 |
++bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs, |
182 |
++ const AnimationTimeDelta& rhs) { |
183 |
++ return lhs.InSecondsF() >= rhs.InSecondsF(); |
184 |
++} |
185 |
++bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs, |
186 |
++ const AnimationTimeDelta& rhs) { |
187 |
++ return lhs.InSecondsF() <= rhs.InSecondsF(); |
188 |
++} |
189 |
++ |
190 |
+ std::ostream& operator<<(std::ostream& os, AnimationTimeDelta time) { |
191 |
+ return os << time.InSecondsF() << " s"; |
192 |
+ } |
193 |
+diff --git a/third_party/blink/renderer/core/animation/animation_time_delta.h b/third_party/blink/renderer/core/animation/animation_time_delta.h |
194 |
+index 1903c1150d3e..95d218466d90 100644 |
195 |
+--- a/third_party/blink/renderer/core/animation/animation_time_delta.h |
196 |
++++ b/third_party/blink/renderer/core/animation/animation_time_delta.h |
197 |
+@@ -90,26 +90,16 @@ AnimationTimeDelta operator*(T a, AnimationTimeDelta td) { |
198 |
+ } |
199 |
+ |
200 |
+ // Comparison operators on AnimationTimeDelta. |
201 |
+-constexpr bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs, |
202 |
+- const AnimationTimeDelta& rhs) { |
203 |
+- return lhs.InSecondsF() == rhs.InSecondsF(); |
204 |
+-} |
205 |
+-constexpr bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs, |
206 |
+- const AnimationTimeDelta& rhs) { |
207 |
+- return lhs.InSecondsF() != rhs.InSecondsF(); |
208 |
+-} |
209 |
+-constexpr bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs, |
210 |
+- const AnimationTimeDelta& rhs) { |
211 |
+- return lhs.InSecondsF() > rhs.InSecondsF(); |
212 |
+-} |
213 |
+-constexpr bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs, |
214 |
+- const AnimationTimeDelta& rhs) { |
215 |
+- return lhs.InSecondsF() >= rhs.InSecondsF(); |
216 |
+-} |
217 |
+-constexpr bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs, |
218 |
+- const AnimationTimeDelta& rhs) { |
219 |
+- return lhs.InSecondsF() <= rhs.InSecondsF(); |
220 |
+-} |
221 |
++bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs, |
222 |
++ const AnimationTimeDelta& rhs); |
223 |
++bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs, |
224 |
++ const AnimationTimeDelta& rhs); |
225 |
++bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs, |
226 |
++ const AnimationTimeDelta& rhs); |
227 |
++bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs, |
228 |
++ const AnimationTimeDelta& rhs); |
229 |
++bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs, |
230 |
++ const AnimationTimeDelta& rhs); |
231 |
+ |
232 |
+ // Defined to allow DCHECK_EQ/etc to work with the class. |
233 |
+ CORE_EXPORT std::ostream& operator<<(std::ostream& os, AnimationTimeDelta time); |
234 |
+-- |
235 |
+2.19.1 |
236 |
+ |
237 |
|
238 |
diff --git a/www-client/chromium/files/chromium-70-gcc-2.patch b/www-client/chromium/files/chromium-70-gcc-2.patch |
239 |
new file mode 100644 |
240 |
index 00000000000..33041454c52 |
241 |
--- /dev/null |
242 |
+++ b/www-client/chromium/files/chromium-70-gcc-2.patch |
243 |
@@ -0,0 +1,37 @@ |
244 |
+From cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4 Mon Sep 17 00:00:00 2001 |
245 |
+From: Maksim Sisov <msisov@××××××.com> |
246 |
+Date: Fri, 7 Sep 2018 18:57:42 +0000 |
247 |
+Subject: [PATCH] OmniboxTextView: fix gcc error for structure initialization |
248 |
+ |
249 |
+It looks like there is bug in GCC 6, which cannot go through |
250 |
+structure initialization normally. |
251 |
+ |
252 |
+Thus, instead of a default initialization of one of the members, |
253 |
+explicitly initialize it to a default value. |
254 |
+ |
255 |
+Change-Id: Ia55cc6658e6b6b2f8a80c2582dd28f001c9e648c |
256 |
+Reviewed-on: https://chromium-review.googlesource.com/1213181 |
257 |
+Reviewed-by: Scott Violet <sky@××××××××.org> |
258 |
+Commit-Queue: Maksim Sisov <msisov@××××××.com> |
259 |
+Cr-Commit-Position: refs/heads/master@{#589614} |
260 |
+--- |
261 |
+ chrome/browser/ui/views/omnibox/omnibox_text_view.cc | 3 ++- |
262 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
263 |
+ |
264 |
+diff --git a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc |
265 |
+index f0a8083dc930..9021284f166d 100644 |
266 |
+--- a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc |
267 |
++++ b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc |
268 |
+@@ -175,7 +175,8 @@ void ApplyTextStyleForType(SuggestionAnswer::TextStyle text_style, |
269 |
+ style = {part_color, .baseline = gfx::SUPERIOR}; |
270 |
+ break; |
271 |
+ case SuggestionAnswer::TextStyle::BOLD: |
272 |
+- style = {part_color, .weight = gfx::Font::Weight::BOLD}; |
273 |
++ style = {part_color, .baseline = gfx::NORMAL_BASELINE, |
274 |
++ .weight = gfx::Font::Weight::BOLD}; |
275 |
+ break; |
276 |
+ case SuggestionAnswer::TextStyle::NORMAL: |
277 |
+ case SuggestionAnswer::TextStyle::NORMAL_DIM: |
278 |
+-- |
279 |
+2.19.1 |
280 |
+ |