From nobody Mon Sep 2 07:51:20 2024 X-Original-To: dev-commits-ports-branches@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 4Wy1Cr5PSyz5MjFh; Mon, 02 Sep 2024 07:51:20 +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 4Wy1Cr44Tbz59BW; Mon, 2 Sep 2024 07:51:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725263480; 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=J6IJ5nLfCOk8QboodRpC5mkdUQFiC0jt7IyZqp4u3Og=; b=vfn6iIeaMRbI+bY7Z038lE+ghzRxsPGuKGg2VKOiDIjLe8p86T5MKuqWUIKPHXQlTNcDv6 CCKLbsVAQwdDZec/3YFXErZc7Pm/0FT8oye6NreyyPN52erdScGqqZTVNAEi7SDz0mcS+/ TlAfxpOySQDxanVBiarYb0lT9aH6MLmdsrcL+MgfTb7wGtyXXtpQ5BsA6O5KkGTMedx/Iv /NOWgvk2NqPoh2uebvSbjE+8oC1SD5oJEtTORWqxSVZCQHWP2n5Rjc8QPyXSt68TPrwDTS HHSlFs418xB9RGqmhSzDEDfcvcYavsmDd36D5E+owdMEqUoFyx24cgORWy8enw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725263480; a=rsa-sha256; cv=none; b=b/hu5ahKNJNNIm1Z667eGWGG7MQ21yvBphKNWeLccaDUjlKXHkSxAYfJ55sk3vX/HGBpEU F08ElykORe2WFaPd2hUGgUjqlxgGuM4Aq61jKkFCVgvXZ6ihbe3QVoS43n07bP9ucbuYYJ 9YFeAeMicuUxwKAAiFNAz2azJsYCix/sB7PGB6N510EwcNpc4AVPMWf3/ur87WiSMgaENH zsGUqBSOkx2OWs2jPv+eCyTLzDCP0b8FigUDUMnpABwlIpQW96ezGODwsc2TlE+3daKSDp 75FR1tLxHANikSTZRAZ37EeV+L2LqmN34BWLMv6d6L0uCYmydpp2V/9/6D7KIQ== 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=1725263480; 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=J6IJ5nLfCOk8QboodRpC5mkdUQFiC0jt7IyZqp4u3Og=; b=T1PxeTEtQvrIAsyrVTV9GC/mY9miCPTjl4vfW2ivjJN0EJDYEbNCAyu3nbaNocJIYgEWx9 lkZ5X1gH9ypGAFYOwTJz4G46QXH8gLBpVooLAhbBac9hL7fiJfgfZAO76Cy2WCNTQtxHEs BRraDTrNEk/Prn7uUJQRkSBTLhVU6+laJpWgDdnyHvwlxSw4rymsbOycrMowl/8EAI+uga c7G9aWLQFleG5P3F4pZ5koNqe+GvKOs8p0u/XBhVzKmDheirvObo0xMtxJK445lFRshSDu zXoJvk2c4YwP2rrBiUwJUztO8e9GRKw85zMhWZ6nwezoYTSFGU9rZK5lbENoLg== 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 4Wy1Cr3gwHz142p; Mon, 2 Sep 2024 07:51:20 +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 4827pKRZ004835; Mon, 2 Sep 2024 07:51:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4827pKH4004832; Mon, 2 Sep 2024 07:51:20 GMT (envelope-from git) Date: Mon, 2 Sep 2024 07:51:20 GMT Message-Id: <202409020751.4827pKH4004832@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: a0693fadd620 - 2024Q3 - devel/py-rapidfuzz: fix build with libc++ 19 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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: a0693fadd620db4d20a0654b8a86fbcd2b13554e Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0693fadd620db4d20a0654b8a86fbcd2b13554e commit a0693fadd620db4d20a0654b8a86fbcd2b13554e Author: Dimitry Andric AuthorDate: 2024-09-01 16:06:10 +0000 Commit: Dimitry Andric CommitDate: 2024-09-02 07:51:02 +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' 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' requested here 3 | std::basic_string 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 (cherry picked from commit 3db7d7ff7deb3be6a0ddaf7e67c56c1940f34c13) --- .../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 + #include + #include +-#include ++#include + + uint32_t UnicodeDefaultProcess(uint32_t ch); + +@@ -80,11 +80,9 @@ template + } + + template +-std::basic_string default_process(std::basic_string s) ++std::vector default_process(std::vector str) + { +- std::basic_string 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(static_cast(c_sentence.data), c_sentence.length)); ++ auto data = static_cast(c_sentence.data); ++ auto proc_str = default_process(std::vector(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(static_cast(c_sentence.data), c_sentence.length)); ++ auto data = static_cast(c_sentence.data); ++ auto proc_str = default_process(std::vector(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(static_cast(c_sentence.data), c_sentence.length)); ++ auto data = static_cast(c_sentence.data); ++ auto proc_str = default_process(std::vector(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