Date: Wed, 22 Nov 2023 00:53:35 GMT From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 000f07df1131 - 2023Q4 - www/qt5-webengine: fix build with libc++ 17 Message-ID: <202311220053.3AM0rZkU080341@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q4 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=000f07df113165b4126a0108b51e4e2956d1fbfb commit 000f07df113165b4126a0108b51e4e2956d1fbfb Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2023-10-26 10:45:00 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2023-11-22 00:46:51 +0000 www/qt5-webengine: fix build with libc++ 17 Building www/qt5-webengine with libc++ 17 results in the following compile errors: In file included from ../../../../kde-qtwebengine-5.15.15p0/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/trace_sorter.cc:17: In file included from /usr/include/c++/v1/algorithm:1803: In file included from /usr/include/c++/v1/__algorithm/nth_element.h:15: /usr/include/c++/v1/__algorithm/sort.h:577:14: error: no viable overloaded '=' 577 | *__begin = _Ops::__iter_move(__pivot_pos); | ~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/c++/v1/__algorithm/sort.h:802:20: note: in instantiation of function template specialization 'std::__bitset_partition<std::_ClassicAlgPolicy, perfetto::base::CircularQueue<perfetto::trace_processor::TimestampedTracePiece>::Iterator, std::__less<void, void> &>' requested here 802 | ? std::__bitset_partition<_AlgPolicy, _RandomAccessIterator, _Compare>(__first, __last, __comp) | ^ /usr/include/c++/v1/__algorithm/sort.h:878:8: note: in instantiation of function template specialization 'std::__introsort<std::_ClassicAlgPolicy, std::__less<void, void> &, perfetto::base::CircularQueue<perfetto::trace_processor::TimestampedTracePiece>::Iterator, false>' requested here 878 | std::__introsort<_AlgPolicy, | ^ /usr/include/c++/v1/__algorithm/sort.h:946:10: note: in instantiation of function template specialization 'std::__sort_dispatch<std::_ClassicAlgPolicy, perfetto::base::CircularQueue<perfetto::trace_processor::TimestampedTracePiece>::Iterator, std::__less<void, void>>' requested here 946 | std::__sort_dispatch<_AlgPolicy>(std::__unwrap_iter(__first), std::__unwrap_iter(__last), __comp); | ^ /usr/include/c++/v1/__algorithm/sort.h:954:8: note: in instantiation of function template specialization 'std::__sort_impl<std::_ClassicAlgPolicy, perfetto::base::CircularQueue<perfetto::trace_processor::TimestampedTracePiece>::Iterator, std::__less<void, void>>' requested here 954 | std::__sort_impl<_ClassicAlgPolicy>(std::move(__first), std::move(__last), __comp); | ^ /usr/include/c++/v1/__algorithm/sort.h:960:8: note: in instantiation of function template specialization 'std::sort<perfetto::base::CircularQueue<perfetto::trace_processor::TimestampedTracePiece>::Iterator, std::__less<void, void>>' requested here 960 | std::sort(__first, __last, __less<>()); | ^ ../../../../kde-qtwebengine-5.15.15p0/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/trace_sorter.cc:51:8: note: in instantiation of function template specialization 'std::sort<perfetto::base::CircularQueue<perfetto::trace_processor::TimestampedTracePiece>::Iterator>' requested here 51 | std::sort(sort_begin, events_.end()); | ^ ../../../../kde-qtwebengine-5.15.15p0/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/timestamped_trace_piece.h:191:26: note: candidate function not viable: 'this' argument has type 'const perfetto::trace_processor::TimestampedTracePiece', but method is not marked const 191 | TimestampedTracePiece& operator=(TimestampedTracePiece&& ttp) { | ^ ../../../../kde-qtwebengine-5.15.15p0/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/timestamped_trace_piece.h:202:26: note: candidate function not viable: 'this' argument has type 'const perfetto::trace_processor::TimestampedTracePiece', but method is not marked const 202 | TimestampedTracePiece& operator=(const TimestampedTracePiece&) = delete; | ^ This is because perfetto's CircularQueue template is only half const-correct. Upstream fixed this in: https://github.com/google/perfetto/commit/b82a213bcf71dd8e68b53941375936c7905c0ff2 so apply that fix to qt5-webengine's older copy of perfetto. PR: 274740, 273753 MFH: 2023Q4 (cherry picked from commit bfcd2a9b6f168c590da52dfefa0aacf1b021d30f) --- ...tto_include_perfetto_ext_base_circular__queue.h | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_circular__queue.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_circular__queue.h new file mode 100644 index 000000000000..227cbf7dfcfd --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_circular__queue.h @@ -0,0 +1,35 @@ +--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h.orig 2023-07-14 13:25:01 UTC ++++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h +@@ -67,25 +67,21 @@ class CircularQueue { + ignore_result(generation); + } + +- T* operator->() { ++ Iterator(const Iterator&) noexcept = default; ++ Iterator& operator=(const Iterator&) noexcept = default; ++ Iterator(Iterator&&) noexcept = default; ++ Iterator& operator=(Iterator&&) noexcept = default; ++ ++ T* operator->() const { + #if PERFETTO_DCHECK_IS_ON() + PERFETTO_DCHECK(generation_ == queue_->generation()); + #endif + return queue_->Get(pos_); + } + +- const T* operator->() const { +- return const_cast<CircularQueue<T>::Iterator*>(this)->operator->(); +- } ++ T& operator*() const { return *(operator->()); } + +- T& operator*() { return *(operator->()); } +- const T& operator*() const { return *(operator->()); } +- + value_type& operator[](difference_type i) { return *(*this + i); } +- +- const value_type& operator[](difference_type i) const { +- return const_cast<CircularQueue<T>::Iterator&>(*this)[i]; +- } + + Iterator& operator++() { + Add(1);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311220053.3AM0rZkU080341>