From nobody Sun Aug 25 11:38:15 2024 X-Original-To: dev-commits-ports-all@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 4WsBdN1fQCz5S7Jt; Sun, 25 Aug 2024 11:38:16 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WsBdN0Zrbz4T5r; Sun, 25 Aug 2024 11:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724585896; 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=U+PxRcandrTWsgb8RR5g3ckgqwxdA1LeSjTvTZ8Xijo=; b=L7mu5jy+S7yGat44huOSH5JqqozxHRkysbfuEICbr0njtO0R//uPMTWz1ZhVDm9gVxyhpW PhvWcEgfDBCjV9Hsl0FKa9tyf74ejCVU+aKhUhxOASbfgZfXgmLLrlGvfdgdmf33rr+edB QH8QLUaWYkSwNepyg825Cysvtx1V2KkO9PhqGtMcIENz3OUyz+f2+poE2FERaX2g6fuP1e sLtjIJ7QoXifvSWiA+RvBHEaZgeQyvVKHdWt7FdsP8mSSHH117dTzgIOjDhnYWELQixusv OQcmdxxC4BHJRAatBFeNlj4uERwFMIdz2uSRkwt4yKre27pcS3eofIlwnTp3QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724585896; a=rsa-sha256; cv=none; b=Qx9zyakpMMYuZGvqTLJ+XqssG4j3uRLIrruy2G/2O9xbFDUr+FL3bSQyWsUMheCNMhEgNP fucdDVij9K6Jl9ta+Z/dkM3LRdONeB2txYq89OzDCj5m4LkBPFeNnq2thDlYTYAjEorrQ8 v+NmIyXpR9tjSp3xy9TisrI2lGwU+hf5Px9Hn12W5sZMpx/Dymwy6cKd4cIOFfrDiqVI7C 53ifPKnc+FKnKyyJOsOLRErjxbvQVcN8wo+k8knZzAF39rN3wlv0E8NRLfcQM1+p5TbtET 3h5vy1EUUIQdEEilMNTfdRkkaFj4BEnvmHQpUvvn1tLRRZxE79a83VsV2FvacQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724585896; 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=U+PxRcandrTWsgb8RR5g3ckgqwxdA1LeSjTvTZ8Xijo=; b=K/hAtjxAopn6Y9XTbsk92PPjoIWuX1evuoBqMTvbJjVONKjJcBF4Q/CNlNZiaUHG6NMwvW ijm/IRL1uem6tFqwUo4FrE01xjr3MrzRV5cOE3EtX8GpHKCF5gkhdBNGFcYSVuFQl5e5cL +HjCu2oV9WOAiB9Qa2HVgc4W15Fh1cqgJJcgf2u4uQ442I+sx6L6cg7DmT+3lDE5SRd4Xn jAYHRrwznTRU5WuAIAqj6tFJTe8wBLa7PteOnvz1RS/QbQnbJ9vgGnL2y5mQ02LFJJp1Mc 13iMbAw+v5vMGy+TN4q0ByLrm2WRvG+XGf+At6EJSmH9drMdjtUI9KrxUyZlIg== 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 4WsBdM750RzLys; Sun, 25 Aug 2024 11:38:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47PBcFhN037917; Sun, 25 Aug 2024 11:38:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47PBcFQw037914; Sun, 25 Aug 2024 11:38:15 GMT (envelope-from git) Date: Sun, 25 Aug 2024 11:38:15 GMT Message-Id: <202408251138.47PBcFQw037914@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 53fba75278f3 - 2024Q3 - math/vtk9: fix build with clang and libc++ 19 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/2024Q3 X-Git-Reftype: branch X-Git-Commit: 53fba75278f3ff92091e9709d3d464daafb7c9d9 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=53fba75278f3ff92091e9709d3d464daafb7c9d9 commit 53fba75278f3ff92091e9709d3d464daafb7c9d9 Author: Dimitry Andric AuthorDate: 2024-08-17 22:19:32 +0000 Commit: Dimitry Andric CommitDate: 2024-08-25 11:37:59 +0000 math/vtk9: fix build with clang and libc++ 19 As noted in the libc++ 19 release notes [1], std::char_traits<> is now only provided for char, char8_t, char16_t, char32_t and wchar_t, and any instantiation for other types will fail. This causes math/vtk9 to fail to compile with clang 19 and libc++ 19, resulting in errors similar to: /wrkdirs/usr/ports/math/vtk9/work/VTK-9.2.6/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/fmt/core.h:272:30: error: implicit instantiation of undefined template 'std::char_traits' 272 | : data_(s), size_(std::char_traits::length(s)) {} | ^ /wrkdirs/usr/ports/math/vtk9/work/VTK-9.2.6/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/fmt/format.h:487:9: note: in instantiation of member function 'fmt::basic_string_view::basic_string_view' requested here 487 | : basic_string_view(reinterpret_cast(s)) {} | ^ /usr/include/c++/v1/__string/char_traits.h:45:8: note: template is declared here 45 | struct char_traits; | ^ This is actually a problem in the vendored version of Victor Zverovich's fmt library [2]. More recent versions of this library have completely rewritten this part of the header, so work around the issue by making the basic_string_view part conditional on char8_t being actually available. (This is only in C++20 and later.) Clang 19 now also diagnoses incorrect member accesses, which causes errors similar to: /wrkdirs/usr/ports/math/vtk9/work/VTK-9.2.6/Utilities/octree/octree/octree_node.txx:210:16: error: no member named '_M_chilren' in 'octree_node'; did you mean 'm_children'? 210 | return this->_M_chilren[child]; | ^~~~~~~~~~ | m_children /wrkdirs/usr/ports/math/vtk9/work/VTK-9.2.6/Utilities/octree/octree/octree_node.h:37:23: note: 'm_children' declared here 37 | octree_node_pointer m_children; | ^ This was apparently a typo, and upstream vtk fixed this in . Apply that as a small patch. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals [2] https://fmt.dev/ PR: 280893 Approved by: yuri (maintainer) MFH: 2024Q3 (cherry picked from commit ddd57b6891e71d29dc4a471978df9c27fa8cd0a4) --- ...hirdParty_diy2_vtkdiy2_include_vtkdiy2_fmt_format.h | 18 ++++++++++++++++++ .../patch-Utilities_octree_octree_octree__node.txx | 11 +++++++++++ 2 files changed, 29 insertions(+) diff --git a/math/vtk9/files/patch-ThirdParty_diy2_vtkdiy2_include_vtkdiy2_fmt_format.h b/math/vtk9/files/patch-ThirdParty_diy2_vtkdiy2_include_vtkdiy2_fmt_format.h new file mode 100644 index 000000000000..eb9c13efbe2f --- /dev/null +++ b/math/vtk9/files/patch-ThirdParty_diy2_vtkdiy2_include_vtkdiy2_fmt_format.h @@ -0,0 +1,18 @@ +--- ThirdParty/diy2/vtkdiy2/include/vtkdiy2/fmt/format.h.orig 2023-02-15 04:03:53 UTC ++++ ThirdParty/diy2/vtkdiy2/include/vtkdiy2/fmt/format.h +@@ -480,6 +480,7 @@ void buffer::append(const U* begin, const U* end) { + } + } // namespace internal + ++#ifdef __cpp_char8_t + // A UTF-8 string view. + class u8string_view : public basic_string_view { + public: +@@ -497,6 +498,7 @@ inline u8string_view operator"" _u(const char* s, std: + } + } // namespace literals + #endif ++#endif // __cpp_char8_t + + // The number of characters to store in the basic_memory_buffer object itself + // to avoid dynamic memory allocation. diff --git a/math/vtk9/files/patch-Utilities_octree_octree_octree__node.txx b/math/vtk9/files/patch-Utilities_octree_octree_octree__node.txx new file mode 100644 index 000000000000..de91955442bb --- /dev/null +++ b/math/vtk9/files/patch-Utilities_octree_octree_octree__node.txx @@ -0,0 +1,11 @@ +--- Utilities/octree/octree/octree_node.txx.orig 2023-02-15 04:03:53 UTC ++++ Utilities/octree/octree/octree_node.txx +@@ -207,7 +207,7 @@ const octree_node& octree_node + { + throw std::domain_error("Attempt to access children of an octree leaf node."); + } +- return this->_M_chilren[child]; ++ return this->m_children[child]; + } + + /**\brief Return a reference to a child node.