Date: Mon, 2 Sep 2024 07:50:33 GMT From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3db7d7ff7deb - main - devel/py-rapidfuzz: fix build with libc++ 19 Message-ID: <202409020750.4827oXNc003452@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=3db7d7ff7deb3be6a0ddaf7e67c56c1940f34c13 commit 3db7d7ff7deb3be6a0ddaf7e67c56c1940f34c13 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2024-09-01 16:06:10 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2024-09-02 07:46:48 +0000 devel/py-rapidfuzz: 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/py-rapidfuzz 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, | ^ /wrkdirs/usr/ports/devel/rapidfuzz-cpp/work/rapidfuzz-cpp-3.0.5/test/distance/examples/ocr.cpp:3:28: note: in instantiation of template class 'std::basic_string<unsigned char>' requested here 3 | std::basic_string<uint8_t> ocr_example1 = { | ^ /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; | ^ Once the fix for devel/rapidfuzz-cpp is in, this port only needs a few replacements of `std::basic_string` with `std::vector`. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals PR: 281194 Approved by: yuri (maintainer) MFH: 2024Q3 --- .../files/patch-src_rapidfuzz_utils.hpp | 25 +++++++++++++++++++ .../files/patch-src_rapidfuzz_utils__cpp.hpp | 29 ++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/devel/py-rapidfuzz/files/patch-src_rapidfuzz_utils.hpp b/devel/py-rapidfuzz/files/patch-src_rapidfuzz_utils.hpp new file mode 100644 index 000000000000..6642b9dfc402 --- /dev/null +++ b/devel/py-rapidfuzz/files/patch-src_rapidfuzz_utils.hpp @@ -0,0 +1,25 @@ +--- src/rapidfuzz/utils.hpp.orig 2024-08-06 20:55:30 UTC ++++ src/rapidfuzz/utils.hpp +@@ -10,7 +10,7 @@ + #include <cwctype> + #include <limits> + #include <stdint.h> +-#include <string> ++#include <vector> + + uint32_t UnicodeDefaultProcess(uint32_t ch); + +@@ -80,11 +80,9 @@ template <typename CharT> + } + + template <typename CharT> +-std::basic_string<CharT> default_process(std::basic_string<CharT> s) ++std::vector<CharT> default_process(std::vector<CharT> str) + { +- std::basic_string<CharT> str(s); +- +- int64_t len = default_process(&str[0], str.size()); ++ int64_t len = default_process(str.data(), str.size()); + str.resize(len); + return str; + } diff --git a/devel/py-rapidfuzz/files/patch-src_rapidfuzz_utils__cpp.hpp b/devel/py-rapidfuzz/files/patch-src_rapidfuzz_utils__cpp.hpp new file mode 100644 index 000000000000..b7289a739904 --- /dev/null +++ b/devel/py-rapidfuzz/files/patch-src_rapidfuzz_utils__cpp.hpp @@ -0,0 +1,29 @@ +--- src/rapidfuzz/utils_cpp.hpp.orig 2024-08-06 20:55:30 UTC ++++ src/rapidfuzz/utils_cpp.hpp +@@ -9,20 +9,20 @@ static inline PyObject* default_process_impl(PyObject* + switch (c_sentence.kind) { + case RF_UINT8: + { +- auto proc_str = default_process( +- std::basic_string<uint8_t>(static_cast<uint8_t*>(c_sentence.data), c_sentence.length)); ++ auto data = static_cast<uint8_t*>(c_sentence.data); ++ auto proc_str = default_process(std::vector<uint8_t>(data, data + c_sentence.length)); + return PyUnicode_FromKindAndData(PyUnicode_1BYTE_KIND, proc_str.data(), (Py_ssize_t)proc_str.size()); + } + case RF_UINT16: + { +- auto proc_str = default_process( +- std::basic_string<uint16_t>(static_cast<uint16_t*>(c_sentence.data), c_sentence.length)); ++ auto data = static_cast<uint16_t*>(c_sentence.data); ++ auto proc_str = default_process(std::vector<uint16_t>(data, data + c_sentence.length)); + return PyUnicode_FromKindAndData(PyUnicode_2BYTE_KIND, proc_str.data(), (Py_ssize_t)proc_str.size()); + } + case RF_UINT32: + { +- auto proc_str = default_process( +- std::basic_string<uint32_t>(static_cast<uint32_t*>(c_sentence.data), c_sentence.length)); ++ auto data = static_cast<uint32_t*>(c_sentence.data); ++ auto proc_str = default_process(std::vector<uint32_t>(data, data + c_sentence.length)); + return PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, proc_str.data(), (Py_ssize_t)proc_str.size()); + } + // ToDo: for now do not process these elements should be done in some way in the future
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409020750.4827oXNc003452>