From nobody Fri Jan 6 18:05:00 2023 X-Original-To: dev-commits-ports-main@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 4NpWT90TBMz2p5bh; Fri, 6 Jan 2023 18:05:01 +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 4NpWT902dDz3Jj5; Fri, 6 Jan 2023 18:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673028301; 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=B8D5bO2pNqDWCJEkJNnQW4NKk/WtgT2GNeo5Ye/BZa8=; b=XhNenqESDnzgukuvuOUhohpGlNO5fj6z9q4MXc/pdLY5RRJQlNaChy8/VDMA60f96uo6Tz yw1ZHLaoVXOtVtOZRsfaRMUeY6CEHivszW7ktUzjYv8t5to0AWCy2wZCSqOf624ywbFZ99 rSUk14F1v2SZj0I6PD1V4dX4dwmQnCWDnWv89Ecex91eS2VNlzxhu5btLgqMWB5WmLTyNX dD1Br9H1qw8UQdt/s0Y1Q2wKpdwyYS0VdnaaQbMlU3vNjUbcIU8vFCnTnXyXbOe5xghJ0v JLz+ESOf7YvX+xDfVU0illKEE7YXcq0Hlo3wrYQYzvd6/nwjaqk/JMWFLF7FwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673028301; 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=B8D5bO2pNqDWCJEkJNnQW4NKk/WtgT2GNeo5Ye/BZa8=; b=ESuXX12uBC6R5SXoofObYX2iPun+VKrhvHIlppUmoWpZujRd3zoho2U8N3aPEtuBFf1RUa Jjga186QCj61tpF0enxuAXrfy8c5Jcr9Qc9CI+GWqbMXyICHDaIihz7pqcH2hVF+mURKXL LlvpR0Kybe+2ibCu4dxWnBrSRM1RsIZ7c1Tu1c3BaxyR53QYHbF34oqWiBv5n4jcnOydeC HA9Xl1qCpi4mUN32HaHv9sMusLZ/ab4jEd6HDBgQwzcq17urgjOjv9EzviwPlAqBWAkSVm W4/gJRtaUo4biyb4Qu7Xoeddz8ZUpGfM1NWLWFcynJFxQV4mA+L9MCBagF11Jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673028301; a=rsa-sha256; cv=none; b=frPr7myy6oQA0Dq9XhCejgzxzKloa2XO0PWO3DP7WNGZkD5oitnokTmVq3D5Im2qnq5/5j G7/onjpPJr8i+FSUniNlJXSm+zgczbrULgweDDZRwUFIqNzY/Mhei/CikU4rOzmv2S2m/l XlXusuuKi7rofBQiwl4RCHi2sAhBc0M39RBAJOk0+l2SHVdASU0tiulAqy0zBThUFdWUfc CBn00ETHSRvM00pGZD06+CYx0mnth9zl9CtjevKgMG1T0QCni8KsD3FKvzCOTlVP4HujUP qEQbT+XqRpnVLYcs41I+PLNdXhK2FS91a1mmfpnHQSRsxmVOyf4M6lG0iMWo0Q== 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 4NpWT85X1rzfj3; Fri, 6 Jan 2023 18:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 306I50nq009860; Fri, 6 Jan 2023 18:05:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 306I50Gd009859; Fri, 6 Jan 2023 18:05:00 GMT (envelope-from git) Date: Fri, 6 Jan 2023 18:05:00 GMT Message-Id: <202301061805.306I50Gd009859@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: a6ea23b32706 - main - www/qt5-webengine: fix build with clang/libc++ 15 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6ea23b32706da00c72f645cc57c7e26ce419668 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=a6ea23b32706da00c72f645cc57c7e26ce419668 commit a6ea23b32706da00c72f645cc57c7e26ce419668 Author: Dimitry Andric AuthorDate: 2023-01-06 11:42:21 +0000 Commit: Dimitry Andric CommitDate: 2023-01-06 18:03:41 +0000 www/qt5-webengine: fix build with clang/libc++ 15 During an exp-run for llvm 15 (see bug 265425), it turned out that www/qt5-webengine failed to build with clang and libc++ 15: In file included from ../../../../qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/trace_sorter.cc:17: In file included from /usr/include/c++/v1/algorithm:1712: In file included from /usr/include/c++/v1/memory:842: In file included from /usr/include/c++/v1/__algorithm/move.h:12: /usr/include/c++/v1/__algorithm/iterator_operations.h:100:5: error: static assertion failed due to requirement 'is_same::value': It looks like your iterator's `iterator_traits::reference` does not match the return type of dereferencing the iterator, i.e., calling `*it`. This is undefined behavior according to [input.iterators] and can lead to dangling reference issues at runtime, so we are flagging this. static_assert(is_same<__deref_t<_Iter>, typename iterator_traits<__uncvref_t<_Iter> >::reference>::value, ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/c++/v1/__algorithm/iterator_operations.h:115:5: note: in instantiation of function template specialization 'std::_IterOps::__validate_iter_reference::Iterator &>' requested here __validate_iter_reference<_Iter>(); ^ /usr/include/c++/v1/__algorithm/sift_down.h:55:28: note: in instantiation of function template specialization 'std::_IterOps::__iter_move::Iterator &>' requested here value_type __top(_Ops::__iter_move(__start)); ^ /usr/include/c++/v1/__algorithm/make_heap.h:37:14: note: in instantiation of function template specialization 'std::__sift_down &, perfetto::base::CircularQueue::Iterator>' requested here std::__sift_down<_AlgPolicy>(__first, __comp_ref, __n, __first + __start); ^ /usr/include/c++/v1/__algorithm/partial_sort.h:39:8: note: in instantiation of function template specialization 'std::__make_heap &, perfetto::base::CircularQueue::Iterator>' requested here std::__make_heap<_AlgPolicy>(__first, __middle, __comp); ^ /usr/include/c++/v1/__algorithm/partial_sort.h:67:27: note: in instantiation of function template specialization 'std::__partial_sort_impl &, perfetto::base::CircularQueue::Iterator, perfetto::base::CircularQueue::Iterator>' requested here auto __last_iter = std::__partial_sort_impl<_AlgPolicy>(__first, __middle, __last, static_cast<_Comp_ref>(__comp)); ^ /usr/include/c++/v1/__algorithm/sort.h:681:10: note: in instantiation of function template specialization 'std::__partial_sort, perfetto::base::CircularQueue::Iterator, perfetto::base::CircularQueue::Iterator>' requested here std::__partial_sort<_AlgPolicy>(__first, __last, __last, __comp); ^ /usr/include/c++/v1/__algorithm/sort.h:694:8: note: in instantiation of function template specialization 'std::__sort_impl::Iterator, std::__less>' requested here std::__sort_impl<_ClassicAlgPolicy>(std::move(__first), std::move(__last), __comp); ^ /usr/include/c++/v1/__algorithm/sort.h:700:8: note: in instantiation of function template specialization 'std::sort::Iterator, std::__less>' requested here std::sort(__first, __last, __less::value_type>()); ^ ../../../../qtwebengine-everywhere-src-5.15.2/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 std::sort(sort_begin, events_.end()); ^ This turns out to be a problem with the iterator type in perfetto's CircularQueue class: its pointer and reference types are const, while they should not be. Upstream fixed this in https://github.com/google/perfetto/commit/c81e804f8, so apply a minimalistic version of it. PR: 268784 Approved by: tcberner (maintainer) MFH: 2023Q1 --- ...tto_include_perfetto_ext_base_circular__queue.h | 22 ++++++++++++++++++++++ 1 file changed, 22 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..140d969a385f --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_circular__queue.h @@ -0,0 +1,22 @@ +commit c81e804f8d37823aac9cf9d6d4ca92363284bf3b +Author: Lalit Maganti +Date: Tue Apr 7 21:13:02 2020 +0100 + + base: attempt to fix compile on vs2019 + + Bug: 153189621 + Change-Id: Ie93cd0d6e4e128c5402539dac15507d4aed22edd + +--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h.orig 2020-11-07 01:22:36 UTC ++++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h +@@ -52,8 +52,8 @@ class CircularQueue { + public: + using difference_type = ptrdiff_t; + using value_type = T; +- using pointer = const T*; +- using reference = const T&; ++ using pointer = T*; ++ using reference = T&; + using iterator_category = std::random_access_iterator_tag; + + Iterator(CircularQueue* queue, uint64_t pos, uint32_t generation)