mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 09:36:41 -04:00
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 ports using devel/py-Levenshtein 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 int>' 820 | static_assert(is_same<_CharT, typename traits_type::char_type>::value, | ^ /wrkdirs/usr/ports/devel/py-Levenshtein/work-py311/Levenshtein-0.22.0/src/Levenshtein/Levenshtein-c/_levenshtein.hpp:144:43: note: in instantiation of template class 'std::basic_string<unsigned int>' requested here 144 | static inline std::basic_string<uint32_t> lev_greedy_median(const std::vector<RF_String>& strings, | ^ /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; | ^ Unfortunately py-Levenshtein and its embedded copy of rapidfuzz-cpp make heavy use of the no-longer-existing `std::basic_string<uint8_t>`, so I had to do quite a lots of search and replace operations, replacing these with equivalent `std::vector` types. This is similar to the fixes for devel/rapidfuzz-cpp in bug 281193, and for devel/py-rapidfuzz in bug 281194. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals PR: 281534 Approved by: maintainer timeout (2 weeks) MFH: 2024Q3
11 lines
402 B
C++
11 lines
402 B
C++
--- extern/rapidfuzz-cpp/rapidfuzz/distance/Prefix.hpp.orig 2023-09-26 11:15:29 UTC
|
|
+++ extern/rapidfuzz-cpp/rapidfuzz/distance/Prefix.hpp
|
|
@@ -91,7 +91,7 @@ struct CachedPrefix : public detail::CachedSimilarityB
|
|
return detail::Prefix::similarity(s1, s2, score_cutoff, score_cutoff);
|
|
}
|
|
|
|
- std::basic_string<CharT1> s1;
|
|
+ std::vector<CharT1> s1;
|
|
};
|
|
|
|
template <typename Sentence1>
|