mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 17:46:38 -04:00
849cc48702
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
30 lines
1.9 KiB
Cython
30 lines
1.9 KiB
Cython
--- src/Levenshtein/levenshtein_cpp.pyx.orig 2023-09-26 11:15:28 UTC
|
|
+++ src/Levenshtein/levenshtein_cpp.pyx
|
|
@@ -12,10 +12,10 @@ cdef extern from "<string>" namespace "std" nogil:
|
|
object PyUnicode_FromKindAndData(int kind, const void *buffer, Py_ssize_t size)
|
|
|
|
cdef extern from "<string>" namespace "std" nogil:
|
|
- cdef cppclass basic_string[T]:
|
|
+ cdef cppclass vector[T]:
|
|
ctypedef size_t size_type
|
|
|
|
- basic_string() except +
|
|
+ vector() except +
|
|
|
|
void resize(size_type) except +
|
|
|
|
@@ -25,10 +25,10 @@ cdef extern from "_levenshtein.hpp":
|
|
size_type size()
|
|
|
|
cdef extern from "_levenshtein.hpp":
|
|
- cdef basic_string[uint32_t] lev_greedy_median(const vector[RF_String]& strings, const vector[double]& weights) except +
|
|
- cdef basic_string[uint32_t] lev_median_improve(const RF_String& string, const vector[RF_String]& strings, const vector[double]& weights) except +
|
|
- cdef basic_string[uint32_t] lev_quick_median(const vector[RF_String]& strings, const vector[double]& weights) except +
|
|
- cdef basic_string[uint32_t] lev_set_median(const vector[RF_String]& strings, const vector[double]& weights) except +
|
|
+ cdef vector[uint32_t] lev_greedy_median(const vector[RF_String]& strings, const vector[double]& weights) except +
|
|
+ cdef vector[uint32_t] lev_median_improve(const RF_String& string, const vector[RF_String]& strings, const vector[double]& weights) except +
|
|
+ cdef vector[uint32_t] lev_quick_median(const vector[RF_String]& strings, const vector[double]& weights) except +
|
|
+ cdef vector[uint32_t] lev_set_median(const vector[RF_String]& strings, const vector[double]& weights) except +
|
|
|
|
cdef double lev_set_distance(const vector[RF_String]& strings1, const vector[RF_String]& strings2) except +
|
|
cdef double lev_edit_seq_distance(const vector[RF_String]& strings1, const vector[RF_String]& strings2) except +
|