| 1 |
commit: 86b59bfc2ab0a53a9b3cc59704bccb1e92964c4e |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 12 17:48:17 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 12 17:48:17 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b59bfc |
| 7 |
|
| 8 |
www-client/chromium: fix build failure with gcc5 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/637186 |
| 11 |
Package-Manager: Portage-2.3.13_p7, Repoman-2.3.3_p87 |
| 12 |
|
| 13 |
www-client/chromium/chromium-63.0.3239.30.ebuild | 1 + |
| 14 |
www-client/chromium/chromium-64.0.3253.3.ebuild | 1 + |
| 15 |
www-client/chromium/files/chromium-gcc5-r5.patch | 11 +++++++++++ |
| 16 |
3 files changed, 13 insertions(+) |
| 17 |
|
| 18 |
diff --git a/www-client/chromium/chromium-63.0.3239.30.ebuild b/www-client/chromium/chromium-63.0.3239.30.ebuild |
| 19 |
index 7cfd3eaf32b..82207820db5 100644 |
| 20 |
--- a/www-client/chromium/chromium-63.0.3239.30.ebuild |
| 21 |
+++ b/www-client/chromium/chromium-63.0.3239.30.ebuild |
| 22 |
@@ -147,6 +147,7 @@ PATCHES=( |
| 23 |
"${FILESDIR}/${PN}-gcc5-r4.patch" |
| 24 |
"${FILESDIR}/${PN}-clang-r1.patch" |
| 25 |
"${FILESDIR}/${PN}-webrtc-r0.patch" |
| 26 |
+ "${FILESDIR}/${PN}-gcc5-r5.patch" |
| 27 |
) |
| 28 |
|
| 29 |
pre_build_checks() { |
| 30 |
|
| 31 |
diff --git a/www-client/chromium/chromium-64.0.3253.3.ebuild b/www-client/chromium/chromium-64.0.3253.3.ebuild |
| 32 |
index 2018f07b04e..3961a106c12 100644 |
| 33 |
--- a/www-client/chromium/chromium-64.0.3253.3.ebuild |
| 34 |
+++ b/www-client/chromium/chromium-64.0.3253.3.ebuild |
| 35 |
@@ -147,6 +147,7 @@ PATCHES=( |
| 36 |
"${FILESDIR}/chromium-webrtc-r0.patch" |
| 37 |
"${FILESDIR}/chromium-math-includes-r0.patch" |
| 38 |
"${FILESDIR}/chromium-${PV}-gpu_lists_version.h.patch" |
| 39 |
+ "${FILESDIR}/chromium-gcc5-r5.patch" |
| 40 |
) |
| 41 |
|
| 42 |
pre_build_checks() { |
| 43 |
|
| 44 |
diff --git a/www-client/chromium/files/chromium-gcc5-r5.patch b/www-client/chromium/files/chromium-gcc5-r5.patch |
| 45 |
new file mode 100644 |
| 46 |
index 00000000000..a07b973d8c0 |
| 47 |
--- /dev/null |
| 48 |
+++ b/www-client/chromium/files/chromium-gcc5-r5.patch |
| 49 |
@@ -0,0 +1,11 @@ |
| 50 |
+--- a/third_party/WebKit/public/web/WebFrameClient.h |
| 51 |
++++ b/third_party/WebKit/public/web/WebFrameClient.h |
| 52 |
+@@ -507,7 +507,7 @@ |
| 53 |
+ // Returns string to be used as a frame id in the devtools protocol. |
| 54 |
+ // It is derived from the content's devtools_frame_token, is |
| 55 |
+ // defined by the browser and passed into Blink upon frame creation. |
| 56 |
+- virtual WebString GetInstrumentationToken() { return ""; } |
| 57 |
++ virtual WebString GetInstrumentationToken() { return WebString(); } |
| 58 |
+ |
| 59 |
+ // PlzNavigate |
| 60 |
+ // Called to abort a navigation that is being handled by the browser process. |
Archives