diff options
| author |   Pawel Hajdan, Jr <phajdan.jr@gentoo.org> | 2017-08-16 21:35:01 +0200 |
|---|---|---|
| committer | Pawel Hajdan, Jr <phajdan.jr@gentoo.org> | 2017-08-16 21:35:01 +0200 |
| commit | 8cc188a0e7c219f6d0deeb2268142a2d6ae91682 (patch) | |
| tree | 806388a3e4b10353ffc6a0f1f7a9d0d979ac6c1b /www-client/chromium | |
| parent | sys-apps/qdirstat: remove old versions (diff) | |
| download | gentoo-8cc188a0e7c219f6d0deeb2268142a2d6ae91682.tar.gz gentoo-8cc188a0e7c219f6d0deeb2268142a2d6ae91682.tar.bz2 gentoo-8cc188a0e7c219f6d0deeb2268142a2d6ae91682.zip | |
www-client/chromium: fix build with gcc-5
Bug: https://bugs.gentoo.org/627414
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'www-client/chromium')
| -rw-r--r-- | www-client/chromium/chromium-61.0.3163.39.ebuild | 1 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-gcc5-r1.patch | 66 |
2 files changed, 67 insertions, 0 deletions
diff --git a/www-client/chromium/chromium-61.0.3163.39.ebuild b/www-client/chromium/chromium-61.0.3163.39.ebuild index 6d7c9fefa05c..4c89199ef92f 100644 --- a/www-client/chromium/chromium-61.0.3163.39.ebuild +++ b/www-client/chromium/chromium-61.0.3163.39.ebuild @@ -147,6 +147,7 @@ PATCHES=( "${FILESDIR}/${PN}-gn-bootstrap-r14.patch" "${FILESDIR}/${PN}-atk-r1.patch" "${FILESDIR}/${PN}-mojo-dep.patch" + "${FILESDIR}/${PN}-gcc5-r1.patch" ) pre_build_checks() { diff --git a/www-client/chromium/files/chromium-gcc5-r1.patch b/www-client/chromium/files/chromium-gcc5-r1.patch new file mode 100644 index 000000000000..ec3e3e663436 --- /dev/null +++ b/www-client/chromium/files/chromium-gcc5-r1.patch @@ -0,0 +1,66 @@ +--- a/chrome/browser/devtools/devtools_file_system_indexer.cc ++++ b/chrome/browser/devtools/devtools_file_system_indexer.cc +@@ -34,7 +34,6 @@ using base::TimeDelta; + using base::TimeTicks; + using content::BrowserThread; + using std::map; +-using std::set; + using std::string; + using std::vector; + +@@ -191,7 +190,7 @@ vector<FilePath> Index::Search(const string& query) { + if (trigram != kUndefinedTrigram) + trigrams.push_back(trigram); + } +- set<FileId> file_ids; ++ std::set<FileId> file_ids; + bool first = true; + vector<Trigram>::const_iterator it = trigrams.begin(); + for (; it != trigrams.end(); ++it) { +@@ -203,7 +202,7 @@ vector<FilePath> Index::Search(const string& query) { + first = false; + continue; + } +- set<FileId> intersection = base::STLSetIntersection<set<FileId> >( ++ std::set<FileId> intersection = base::STLSetIntersection<std::set<FileId> >( + file_ids, index_[trigram]); + file_ids.swap(intersection); + } +diff --git a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h +index 94bb9161ec85..e40c6387f72e 100644 +--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h ++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h +@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { + allocation_length_(0), + data_(data), + data_length_(0), +- kind_(AllocationKind::kNormal), ++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), + deleter_(deleter) {} + DataHandle(void* allocation_base, + size_t allocation_length, +@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { + reinterpret_cast<uintptr_t>(allocation_base_) + + allocation_length_); + switch (kind_) { +- case AllocationKind::kNormal: ++ case WTF::ArrayBufferContents::AllocationKind::kNormal: + DCHECK(deleter_); + deleter_(data_); + return; +- case AllocationKind::kReservation: ++ case WTF::ArrayBufferContents::AllocationKind::kReservation: + ReleaseReservedMemory(allocation_base_, allocation_length_); + return; + } +--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 ++++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 +@@ -10,7 +10,7 @@ + + #include "webrtc/modules/audio_processing/aec3/aec_state.h" + +-#include <math.h> ++#include <cmath> + #include <numeric> + #include <vector> + |