1 |
commit: 689090f1ec53b7b958a903f6ed01f38b71e1b819 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 9 14:04:25 2017 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 9 14:04:25 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689090f1 |
7 |
|
8 |
www-client/chromium: backport build fix |
9 |
|
10 |
Bug: https://bugs.gentoo.org/626684 |
11 |
Package-Manager: Portage-2.3.6_p23, Repoman-2.3.3_p1 |
12 |
|
13 |
www-client/chromium/chromium-61.0.3163.31.ebuild | 1 + |
14 |
www-client/chromium/files/chromium-mojo-dep.patch | 54 +++++++++++++++++++++++ |
15 |
2 files changed, 55 insertions(+) |
16 |
|
17 |
diff --git a/www-client/chromium/chromium-61.0.3163.31.ebuild b/www-client/chromium/chromium-61.0.3163.31.ebuild |
18 |
index 600995b990b..c55fd86c15d 100644 |
19 |
--- a/www-client/chromium/chromium-61.0.3163.31.ebuild |
20 |
+++ b/www-client/chromium/chromium-61.0.3163.31.ebuild |
21 |
@@ -146,6 +146,7 @@ PATCHES=( |
22 |
"${FILESDIR}/${PN}-gcc-r1.patch" |
23 |
"${FILESDIR}/${PN}-gn-bootstrap-r14.patch" |
24 |
"${FILESDIR}/${PN}-atk-r1.patch" |
25 |
+ "${FILESDIR}/${PN}-mojo-dep.patch" |
26 |
) |
27 |
|
28 |
pre_build_checks() { |
29 |
|
30 |
diff --git a/www-client/chromium/files/chromium-mojo-dep.patch b/www-client/chromium/files/chromium-mojo-dep.patch |
31 |
new file mode 100644 |
32 |
index 00000000000..bf618540d17 |
33 |
--- /dev/null |
34 |
+++ b/www-client/chromium/files/chromium-mojo-dep.patch |
35 |
@@ -0,0 +1,54 @@ |
36 |
+From f8e2c057ec6123b0a1d08294f41e78c427636b49 Mon Sep 17 00:00:00 2001 |
37 |
+From: Mike Bjorge <mbjorge@××××××××.org> |
38 |
+Date: Mon, 7 Aug 2017 18:41:58 +0000 |
39 |
+Subject: [PATCH] Add mojo_blink dep from WebKit loader/. |
40 |
+ |
41 |
+Now that loader has a direct dependency on the generated mojom-blink |
42 |
+headers (https://chromium-review.googlesource.com/c/577488), the loader/ |
43 |
+target should have a dep on the mojo target that generates the headers, |
44 |
+otherwise the build may fail depending on build order. |
45 |
+ |
46 |
+All the other platform/ targets that depend on the mojom-blink headers |
47 |
+are directly included in the platform target, which has the necessary |
48 |
+dependency already. |
49 |
+ |
50 |
+Bug: 746197 |
51 |
+Bug: 750883 |
52 |
+Change-Id: Ife1429ec649605aae3f7920560cec37f3a218154 |
53 |
+Reviewed-on: https://chromium-review.googlesource.com/602869 |
54 |
+Reviewed-by: Yutaka Hirano <yhirano@××××××××.org> |
55 |
+Reviewed-by: Matt Falkenhagen <falken@××××××××.org> |
56 |
+Commit-Queue: Mike Bjorge <mbjorge@××××××××.org> |
57 |
+Cr-Commit-Position: refs/heads/master@{#492369} |
58 |
+--- |
59 |
+ third_party/WebKit/Source/platform/loader/BUILD.gn | 1 + |
60 |
+ third_party/WebKit/public/BUILD.gn | 1 + |
61 |
+ 2 files changed, 2 insertions(+) |
62 |
+ |
63 |
+diff --git a/third_party/WebKit/Source/platform/loader/BUILD.gn b/third_party/WebKit/Source/platform/loader/BUILD.gn |
64 |
+index d483734b21cf..409befe884a8 100644 |
65 |
+--- a/third_party/WebKit/Source/platform/loader/BUILD.gn |
66 |
++++ b/third_party/WebKit/Source/platform/loader/BUILD.gn |
67 |
+@@ -99,6 +99,7 @@ source_set("loader") { |
68 |
+ "//components/link_header_util:link_header_util", |
69 |
+ "//mojo/public/cpp/system:system", |
70 |
+ "//storage/public/interfaces:interfaces_blink__generator", |
71 |
++ "//third_party/WebKit/public:mojo_bindings_blink", |
72 |
+ ] |
73 |
+ |
74 |
+ public_deps = [ |
75 |
+diff --git a/third_party/WebKit/public/BUILD.gn b/third_party/WebKit/public/BUILD.gn |
76 |
+index 84ee3ca9136d..cc847663efc6 100644 |
77 |
+--- a/third_party/WebKit/public/BUILD.gn |
78 |
++++ b/third_party/WebKit/public/BUILD.gn |
79 |
+@@ -755,6 +755,7 @@ mojom("mojo_bindings") { |
80 |
+ visibility_blink = [ |
81 |
+ "//content/common:mojo_bindings_blink", |
82 |
+ "//third_party/WebKit/Source/platform", |
83 |
++ "//third_party/WebKit/Source/platform/loader", |
84 |
+ ] |
85 |
+ sources = [ |
86 |
+ "platform/display_mode.mojom", |
87 |
+-- |
88 |
+2.14.0 |
89 |
+ |