From nobody Wed Nov 22 00:53:35 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SZjRM47c7z51QDB; Wed, 22 Nov 2023 00:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SZjRM3Hhjz4fs4; Wed, 22 Nov 2023 00:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700614415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gWaVE+4HlwFnpgw+Zr1wZcMd3dL4vHP7aW589FlZYjI=; b=Ip01VrrAqG18F03wMq9jwHp9cs0FEKH1HOujn04NTUd5V43Cgd/KZ+JMjCTxhN4j7bbKWu BzJ6IjgA9QpIH/lGR38lmEeu14kYWAPRo9vAbJ3yTX+GMFIuBJSyMmOhCZA3ClRoJiX3XC OF/eLa+iZMv8s4ddlmkY+90TG97lXjWq0jrVBifXb9e8SQWN7YjFd3D0bzmR6mcjwzj+HF J2h5DhImRUOz10w2DXvsNmJUq+fgJSeS3mtf7iwzzqAjKNYaRt1ebfyQIGcgaTKu+tLS/N xNFDhjcHZFK3T8aSZgctJXB7PdRb+XDFDQpmp1NLffidjZznLuBUU6rNlykAcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700614415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gWaVE+4HlwFnpgw+Zr1wZcMd3dL4vHP7aW589FlZYjI=; b=c6OuYaBWU9Yaamoe65bwG2IqyitAUln22DSkhlMY1T2sGkMJpyVmBysm5q8oY6q0DpKiMo IKi+/kbz2CAiMZw3/l3+KFVbgS3X47WAAmViRlTcWeYgoDBC+rKJuDK+Nl/LFZkTspAh1h 3fbdZRHasUdbS4hOLISfunQ3ZZQ85Pco3P6CCLuPY28Xae0dPw+NMmTwIkWOcIOX9koYag kBZcDM5AVlg3TFh7x7OuYH924WsIBekQv0IrVSvRBGZeoFXG615h1irrCKiZ5+T1b7a81+ nwIQPYHn79/CNhGmsCJSFvKyBQF8knYTHz5a2WYMgOGokgF6r9QBT32DVLGM+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700614415; a=rsa-sha256; cv=none; b=va4MwU0/5MVCwYMsbL+db7mh0WuqNhbz0iJZoqCtrbKhzCH4RD/2r0gUrEERDTm2SDS9RZ ZxapVrKjtqEXJSZpsGWlp82Kau3ZD/3tTAsv9HbqLJdXZO3Sk0nSLWhaekJzBhP7QU99Fl LpJQV1LzItHFB6N+/xi8VSx8jg43coinIlvRMGvEdfqxxQa2SEJRUOs8XXpH2OoQKnvrdT a9umv3aF8R1CCONQnV2N7RJp43W8DTvfAXmSzApd/9B9DQD8NDkpkl6K1SYgcyC0Ai84Oq BDSt4iIiUdeqgSu33wYibJJsNma6/SN+01jTkNupV0/MhcYcuQ1Ywn/WFoQxQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SZjRM2LBjzy1G; Wed, 22 Nov 2023 00:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AM0rZJB080344; Wed, 22 Nov 2023 00:53:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AM0rZkU080341; Wed, 22 Nov 2023 00:53:35 GMT (envelope-from git) Date: Wed, 22 Nov 2023 00:53:35 GMT Message-Id: <202311220053.3AM0rZkU080341@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Jason E. Hale" Subject: git: 000f07df1131 - 2023Q4 - www/qt5-webengine: fix build with libc++ 17 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 000f07df113165b4126a0108b51e4e2956d1fbfb Auto-Submitted: auto-generated The branch 2023Q4 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=000f07df113165b4126a0108b51e4e2956d1fbfb commit 000f07df113165b4126a0108b51e4e2956d1fbfb Author: Dimitry Andric AuthorDate: 2023-10-26 10:45:00 +0000 Commit: Jason E. Hale 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::Iterator, std::__less &>' 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 &, perfetto::base::CircularQueue::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::Iterator, std::__less>' 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::Iterator, std::__less>' 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::Iterator, std::__less>' 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::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::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::Iterator&>(*this)[i]; +- } + + Iterator& operator++() { + Add(1);