From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 88FDE1396D9 for ; Sun, 12 Nov 2017 17:49:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B3D4E0F63; Sun, 12 Nov 2017 17:49:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 65DA8E0F63 for ; Sun, 12 Nov 2017 17:49:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4D0D33BE19 for ; Sun, 12 Nov 2017 17:49:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A51F19A97 for ; Sun, 12 Nov 2017 17:49:14 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1510508897.86b59bfc2ab0a53a9b3cc59704bccb1e92964c4e.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/, www-client/chromium/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/chromium-63.0.3239.30.ebuild www-client/chromium/chromium-64.0.3253.3.ebuild www-client/chromium/files/chromium-gcc5-r5.patch X-VCS-Directories: www-client/chromium/ www-client/chromium/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 86b59bfc2ab0a53a9b3cc59704bccb1e92964c4e X-VCS-Branch: master Date: Sun, 12 Nov 2017 17:49:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 43431e1c-aa18-4d03-b5c0-441bc918a0c1 X-Archives-Hash: 25ebd414803a148bbf9a161893da34d3 commit: 86b59bfc2ab0a53a9b3cc59704bccb1e92964c4e Author: Mike Gilbert gentoo org> AuthorDate: Sun Nov 12 17:48:17 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Nov 12 17:48:17 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b59bfc www-client/chromium: fix build failure with gcc5 Closes: https://bugs.gentoo.org/637186 Package-Manager: Portage-2.3.13_p7, Repoman-2.3.3_p87 www-client/chromium/chromium-63.0.3239.30.ebuild | 1 + www-client/chromium/chromium-64.0.3253.3.ebuild | 1 + www-client/chromium/files/chromium-gcc5-r5.patch | 11 +++++++++++ 3 files changed, 13 insertions(+) diff --git a/www-client/chromium/chromium-63.0.3239.30.ebuild b/www-client/chromium/chromium-63.0.3239.30.ebuild index 7cfd3eaf32b..82207820db5 100644 --- a/www-client/chromium/chromium-63.0.3239.30.ebuild +++ b/www-client/chromium/chromium-63.0.3239.30.ebuild @@ -147,6 +147,7 @@ PATCHES=( "${FILESDIR}/${PN}-gcc5-r4.patch" "${FILESDIR}/${PN}-clang-r1.patch" "${FILESDIR}/${PN}-webrtc-r0.patch" + "${FILESDIR}/${PN}-gcc5-r5.patch" ) pre_build_checks() { diff --git a/www-client/chromium/chromium-64.0.3253.3.ebuild b/www-client/chromium/chromium-64.0.3253.3.ebuild index 2018f07b04e..3961a106c12 100644 --- a/www-client/chromium/chromium-64.0.3253.3.ebuild +++ b/www-client/chromium/chromium-64.0.3253.3.ebuild @@ -147,6 +147,7 @@ PATCHES=( "${FILESDIR}/chromium-webrtc-r0.patch" "${FILESDIR}/chromium-math-includes-r0.patch" "${FILESDIR}/chromium-${PV}-gpu_lists_version.h.patch" + "${FILESDIR}/chromium-gcc5-r5.patch" ) pre_build_checks() { diff --git a/www-client/chromium/files/chromium-gcc5-r5.patch b/www-client/chromium/files/chromium-gcc5-r5.patch new file mode 100644 index 00000000000..a07b973d8c0 --- /dev/null +++ b/www-client/chromium/files/chromium-gcc5-r5.patch @@ -0,0 +1,11 @@ +--- a/third_party/WebKit/public/web/WebFrameClient.h ++++ b/third_party/WebKit/public/web/WebFrameClient.h +@@ -507,7 +507,7 @@ + // Returns string to be used as a frame id in the devtools protocol. + // It is derived from the content's devtools_frame_token, is + // defined by the browser and passed into Blink upon frame creation. +- virtual WebString GetInstrumentationToken() { return ""; } ++ virtual WebString GetInstrumentationToken() { return WebString(); } + + // PlzNavigate + // Called to abort a navigation that is being handled by the browser process.