From nobody Mon Nov 04 07:38:01 2024 X-Original-To: dev-commits-ports-all@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 4XhjxQ1kgzz5cNd5; Mon, 04 Nov 2024 07:38:02 +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 4XhjxP6hgfz4s69; Mon, 4 Nov 2024 07:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730705881; 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=f2Flg0FiG/Zn7L7LU5FfivtuBehCsM5Z6uyxLVm5wWc=; b=iFi/jHQf/7HpPEE3RVnv95VwQ7xzcl3BE1FP2EZI3+prZ5IbvAG/fVdjURCfe3Hm1BdewB Os3UpuX46HdgqrrojIi25If0djXtSEwOWWrD892cPF/7fgCkWFkaZJnGjfHxZEnt5fozdJ ATh2YIF9uVw0uhdxKep0JUPaHzRsijRpBSw6lQbv9cZX/ctYR7ncZ9IeOt40rUwS51POwc /WNHipySt6jgIyiYbep79tFNvxzFD4IK1wqKoJNkg6+ixH812tgbP0hjPqhGDK96aoTndR 1qxH7ziN0nrOi4RaHG0MoyS35j9MGRVk11M6lRmgHAkIIN7MXc/xUtoKL3m3WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730705881; 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=f2Flg0FiG/Zn7L7LU5FfivtuBehCsM5Z6uyxLVm5wWc=; b=keZGuEmIpLVl6iNhhTKfwzRZX+FtXwNSv1dLuLgevjV4PIEZXzBAWwajAgDKmRlxxTNsIB x8PA+S4RRhSwtn5pCIYXwj3dbw4tVdsgexF88jS2TUGf+OSGk9Xsc+qJ2m5mF7Va0HZoax zM/N84ViGwLwSoIopAB+9B/SNslDO0u0AxTWyjjJNb3VyhuAJvLuHuHnfMdVyDqP91kQYG 44aUVt2i9UJYDgLrwP2m9i+ygL88LuWyI9WqChSTgUGd75/ZIjF4doidO1ti+kP0IEqwtb mG+74z+1w3IXTSOLWMBUo+YBNrts52oRtHFWLcHYg7poOcfY8iXvTQAFpZnNJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730705881; a=rsa-sha256; cv=none; b=U68hHyybIlPyyP2o4xqQxMgDs81tYPLVafGlMyJwA8oJc0DFPC+g6KYpChGcduFymLIYZR 8OwU4/SnU4HQnUt+oreRZqORnQiM5SuR8twgp1cJMUzLfovMScyoOrvHqA6MW5foy9U1qE LIKDumsHRtggn2+fnsfFbCYT3cqSy6jCO8vq8r+sUWogqJhrXKGWrEwxCku/hYkzzH2VJu m9LHToQJMWu7NXsJh187kyc2M3J/JknewYzZ+Yn528ijShkXDOhuBj5+V8p6sOin4FNwQe lGm34V3E8v8sIPSa6jXVsb0KRoTBlWmJ1On86yATlEQPUFU943fqx/WGhZ+nqg== 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 4XhjxP6J1yzPPg; Mon, 4 Nov 2024 07:38:01 +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 4A47c1oP044500; Mon, 4 Nov 2024 07:38:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A47c1nM044497; Mon, 4 Nov 2024 07:38:01 GMT (envelope-from git) Date: Mon, 4 Nov 2024 07:38:01 GMT Message-Id: <202411040738.4A47c1nM044497@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: e494e799b8f4 - main - science/py-dlib: fix build with libc++ 19 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: e494e799b8f4976ab09b60d606f5e9ee6e3747c2 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=e494e799b8f4976ab09b60d606f5e9ee6e3747c2 commit e494e799b8f4976ab09b60d606f5e9ee6e3747c2 Author: Dimitry Andric AuthorDate: 2024-11-03 20:33:53 +0000 Commit: Dimitry Andric CommitDate: 2024-11-04 07:37:27 +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 --- 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; + + // ----------------------------------------------------------------------------------------