From nobody Mon Nov 4 07:38:46 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 4XhjyG5rzNz5cNhR; Mon, 04 Nov 2024 07:38:46 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhjyG4WHvz4sQQ; Mon, 4 Nov 2024 07:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730705926; 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=zoRocUjep1wJmU3SVZmJlClXm6Xs05vsPI78XxrFNKU=; b=NVUbXQaxRRARn8Gg61i8Otsq6ydu7p4nHL7cgp1gPZhkSuqa++puNFT4Ff4/WiE+jcv35Q kdITHtBI5Ubi1uAB351Zdlv9/4YCPefLJ6It4Qw5yNo1v5pNcAXmlDi4NiupzEeAtZmEq+ j/Id18PdODmEC8DFXrroBp8gGHB9ulsZP9HxT8/xwIUEoR5NDrHyvG7JuZdv8C7P1EqFkq VHSq3uKovRPT5emkVgFDIIzl+ya9vEY/mTafwA9KVY1Ef3FwCAOiCURhneZggbJyTdyw8y 6qDooow8OhwSKPyzy3jVe974LvL5KRavHeIdmSmsQUwKQNZgFf4yq3pJPWN+TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730705926; 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=zoRocUjep1wJmU3SVZmJlClXm6Xs05vsPI78XxrFNKU=; b=DTLZiq7yciRXUM0vHYf5rJ5rLqU63XnmXdIhJTYde9hynAcwOwGmVQn/5blsM/WrZJpi8G ygsg++IGzkjFP7n3AgzqY9amGtCmfPZE8wtQHeGzOZIkt2vh/H/atSRD/82bKJ2S/li7pm FJAA3+qfxACPRTDoxoN9RopekBKUNdb30WfRBk9AOuO4f+meXX2SHCMdXrm9pxCb1DEPJ1 TP4/Je/mOXCuPOJLq6q+Z4kHjOlu3TjJ3y7tlC8U2UT23Li6h6oPW69o8QVStsENxYJCdb v/LTYF08hrqxBdC+21zPIx8/31x0gzDwcy4quwV36OAx1g4NDRl/Xo7Gj5wUfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730705926; a=rsa-sha256; cv=none; b=WHPCkr46GXHmRHxR8VALva64AuUpIa5Jdim6Zw1usX7E7mjFLhrz5NhT4dZTzWGXCHAOas nSrdpqfW60fcq8QO6NZd9aZPURoO3X9TmCxHUaY0QsOIwAKNqr/YN69XsdODjbbU/M5XNA R6fti8AHiQnMWNDJD8EhwxPWBFglJ1k8D8hjX5lqCp8O3jF/2K30ZMIHqZbQU2ynnKsmSF nAbPn7aPerS4mvU3pMFb6CUEpETnxCUTJeSw7iuBPA3YZCUtPCi9DwCr8S/662/odsLLD3 QQ0zg2pMNvBrPrGsL9qBXaBskqDjAAGlK6KltR6ncfIO05PC0zmv0y0OGgXSrA== 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 4XhjyG46pkzNVY; Mon, 4 Nov 2024 07:38:46 +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 4A47cke7044942; Mon, 4 Nov 2024 07:38:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A47ckCo044939; Mon, 4 Nov 2024 07:38:46 GMT (envelope-from git) Date: Mon, 4 Nov 2024 07:38:46 GMT Message-Id: <202411040738.4A47ckCo044939@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: 1ea91c341e2e - 2024Q4 - science/py-dlib: 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/2024Q4 X-Git-Reftype: branch X-Git-Commit: 1ea91c341e2e88a911f9fb07f608c11643c77938 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ea91c341e2e88a911f9fb07f608c11643c77938 commit 1ea91c341e2e88a911f9fb07f608c11643c77938 Author: Dimitry Andric AuthorDate: 2024-11-03 20:33:53 +0000 Commit: Dimitry Andric CommitDate: 2024-11-04 07:38:35 +0000 science/py-dlib: 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 science/py-dlib 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/science/py-dlib/work-py311/dlib-19.24.6/dlib/bigint/../unicode/unicode.h:718:19: note: in instantiation of template class 'std::basic_string' requested here 718 | const ustring convert_to_utf32 ( | ^ /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; | ^ This can be fixed by defining `unichar` as `char32_t` instead of `uint32` in `unicode.h`, and adding a serializer for `char32_t` to `serialize.h`. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals PR: 282524 Approved by: arrowd (maintainer) MFH: 2024Q4 (cherry picked from commit e494e799b8f4976ab09b60d606f5e9ee6e3747c2) --- science/py-dlib/files/patch-dlib_serialize.h | 11 +++++++++++ science/py-dlib/files/patch-dlib_unicode_unicode.h | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/science/py-dlib/files/patch-dlib_serialize.h b/science/py-dlib/files/patch-dlib_serialize.h new file mode 100644 index 000000000000..94306df64159 --- /dev/null +++ b/science/py-dlib/files/patch-dlib_serialize.h @@ -0,0 +1,11 @@ +--- dlib/serialize.h.orig 2024-02-17 21:44:22 UTC ++++ dlib/serialize.h +@@ -639,6 +639,8 @@ namespace dlib + USE_DEFAULT_INT_SERIALIZATION_FOR(wchar_t) + #endif + ++ USE_DEFAULT_INT_SERIALIZATION_FOR(char32_t) ++ + // ---------------------------------------------------------------------------------------- + + inline void serialize( diff --git a/science/py-dlib/files/patch-dlib_unicode_unicode.h b/science/py-dlib/files/patch-dlib_unicode_unicode.h new file mode 100644 index 000000000000..4527fdc054b0 --- /dev/null +++ b/science/py-dlib/files/patch-dlib_unicode_unicode.h @@ -0,0 +1,11 @@ +--- dlib/unicode/unicode.h.orig 2024-02-17 21:44:22 UTC ++++ dlib/unicode/unicode.h +@@ -16,7 +16,7 @@ namespace dlib + + // ---------------------------------------------------------------------------------------- + +- using unichar = uint32; ++ using unichar = char32_t; + using ustring = std::basic_string; + + // ----------------------------------------------------------------------------------------