diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2017-03-11 19:53:54 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2017-03-11 19:55:02 -0500 |
| commit | 1ba9c56b090a44dd9b5163209e03d9267824531b (patch) | |
| tree | 2785f4c715a6a724056e1ccc288598a7a3b2f439 /www-client/chromium | |
| parent | net-libs/gnutls: run valgrind tests when full-tests (diff) | |
| download | gentoo-1ba9c56b090a44dd9b5163209e03d9267824531b.tar.gz gentoo-1ba9c56b090a44dd9b5163209e03d9267824531b.tar.bz2 gentoo-1ba9c56b090a44dd9b5163209e03d9267824531b.zip | |
www-client/chromium: fix build error with gcc 4.9
Package-Manager: Portage-2.3.3_p79, Repoman-2.3.1_p72
Diffstat (limited to 'www-client/chromium')
| -rw-r--r-- | www-client/chromium/chromium-57.0.2987.98.ebuild | 5 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-57-gcc4.patch | 22 |
2 files changed, 25 insertions, 2 deletions
diff --git a/www-client/chromium/chromium-57.0.2987.98.ebuild b/www-client/chromium/chromium-57.0.2987.98.ebuild index aa5f20b4328f..ab9cd4bf8421 100644 --- a/www-client/chromium/chromium-57.0.2987.98.ebuild +++ b/www-client/chromium/chromium-57.0.2987.98.ebuild @@ -161,9 +161,9 @@ pre_build_checks() { # bugs: #601654 die "At least clang 3.9.1 is required" fi - if tc-is-gcc && ! version_is_at_least 5 "$(gcc-major-version)"; then + if tc-is-gcc && ! version_is_at_least 4.9 "$(gcc-version)"; then # bugs: #535730, #525374, #518668, #600288 - die "At least gcc 5 is required" + die "At least gcc 4.9 is required" fi fi @@ -198,6 +198,7 @@ src_prepare() { local PATCHES=( "${FILESDIR}/${PN}-widevine-r1.patch" "${FILESDIR}/${PN}-FORTIFY_SOURCE.patch" + "${FILESDIR}/chromium-57-gcc4.patch" ) use system-ffmpeg && PATCHES+=( "${FILESDIR}/${PN}-system-ffmpeg-r4.patch" ) diff --git a/www-client/chromium/files/chromium-57-gcc4.patch b/www-client/chromium/files/chromium-57-gcc4.patch new file mode 100644 index 000000000000..044c8f41b9f7 --- /dev/null +++ b/www-client/chromium/files/chromium-57-gcc4.patch @@ -0,0 +1,22 @@ +--- a/chrome/browser/ui/libgtkui/gtk_ui.cc ++++ b/chrome/browser/ui/libgtkui/gtk_ui.cc +@@ -676,7 +676,7 @@ + : nullptr); + } + +- return gtk_border; ++ return std::move(gtk_border); + } + + void GtkUi::AddWindowButtonOrderObserver( +--- a/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc ++++ b/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc +@@ -412,7 +412,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer( + return nullptr; + } + +- return capturer; ++ return std::move(capturer); + } + + } // namespace webrtc |