Date: Sat, 28 Sep 2024 13:41:41 GMT From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 646153bbb019 - 2024Q3 - devel/poco: fix build with libc++ 19 Message-ID: <202409281341.48SDfffg016741@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=646153bbb0191367b737a03702d1baa3a0c5bfe3 commit 646153bbb0191367b737a03702d1baa3a0c5bfe3 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2024-09-17 08:21:22 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2024-09-28 13:38:31 +0000 devel/poco: fix build with 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 devel/poco to fail to compile with clang 19 and libc++ 19, resulting in errors similar to: /usr/include/c++/v1/string:820:42: error: implicit instantiation of undefined template 'std::char_traits<unsigned char>' 820 | static_assert(is_same<_CharT, typename traits_type::char_type>::value, | ^ /usr/include/c++/v1/__type_traits/is_constructible.h:42:62: note: in instantiation of template class 'std::basic_string<unsigned char>' requested here 42 | : public integral_constant<bool, __is_constructible(_Tp, __add_rvalue_reference_t<_Tp>)> {}; | ^ /usr/include/c++/v1/__type_traits/is_swappable.h:43:39: note: in instantiation of template class 'std::is_move_constructible<Poco::Data::LOB<unsigned char>>' requested here 43 | using __swap_result_t = __enable_if_t<is_move_constructible<_Tp>::value && is_move_assignable<_Tp>::value>; | ^ /usr/include/c++/v1/__type_traits/is_swappable.h:50:60: note: in instantiation of template type alias '__swap_result_t' requested here 50 | inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __swap_result_t<_Tp> swap(_Tp& __x, _Tp& __y) | ^ /wrkdirs/usr/ports/devel/poco/work/poco-1.12.4-all/Data/include/Poco/Data/LOB.h:243:14: note: while substituting explicitly-specified template arguments into function template 'swap' 243 | inline void swap<Poco::Data::BLOB>(Poco::Data::BLOB& b1, Poco::Data::BLOB& b2) noexcept | ^ In this case it is enough to only enable the LOB constructor from std::basic_string when the type is plain char. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals PR: 281553 MFH: 2024Q3 (cherry picked from commit c55157301f317ab8166349340d4cc0765deaac12) --- devel/poco/files/patch-Data_include_Poco_Data_LOB.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/devel/poco/files/patch-Data_include_Poco_Data_LOB.h b/devel/poco/files/patch-Data_include_Poco_Data_LOB.h new file mode 100644 index 000000000000..e893a18625b2 --- /dev/null +++ b/devel/poco/files/patch-Data_include_Poco_Data_LOB.h @@ -0,0 +1,14 @@ +--- Data/include/Poco/Data/LOB.h.orig 2022-10-31 17:44:34 UTC ++++ Data/include/Poco/Data/LOB.h +@@ -63,8 +63,9 @@ class LOB (public) + { + } + +- LOB(const std::basic_string<T>& content): +- _pContent(new std::vector<T>(content.begin(), content.end())) ++ template <typename TT, typename = std::enable_if_t<std::is_same<TT, char>::value>> ++ LOB(const std::basic_string<TT>& content): ++ _pContent(new std::vector<TT>(content.begin(), content.end())) + /// Creates a LOB from a string. + { + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409281341.48SDfffg016741>