From nobody Sun Nov 10 12:13:05 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 4XmWm122YNz5cggW; Sun, 10 Nov 2024 12:13:05 +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 4XmWm11Lmkz4m7L; Sun, 10 Nov 2024 12:13:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731240785; 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=rRCmqIpjUoPAsMzAIGZdPG2uoN3B/StjCM3HaqgX7Z8=; b=rmc2WeYHVE4NrBZmygAj44Na925YzV22HmQlPCgMH17A74lgtyJdehreqGSed0HJu/0SUo AQxO6LR770BK/BkTQvyN93BooXqIDm0wJXTib4bEg4Yy+w7eUMha0LozPdsnYPsF9vDTNE 9vL80BXsTM5TtXP6vk39qg6iZsbfNrfYd5THGYuHJd8LhpwliIYtQIhGEd55RwaxnyMIzF j6ThB4gle+NijPJ6Je0wUyI6q7eMNBydUDWM+AjmmeiPL5wYS05GgUtQpTTGUAOOlbIGWF QObFUrhTpqJHuygcY2QmzlGppI6Gyf64SWGQN4FdwhuiI6TwAA1R2pXCTnF1MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731240785; 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=rRCmqIpjUoPAsMzAIGZdPG2uoN3B/StjCM3HaqgX7Z8=; b=t3l922Ke8ugrjPAZDa4MZxHZ4hK5QKg+vWo/DP1SfiVkWQ3JJPuObye4gEdHVIKj90lDj7 v7GV//DDjmd32uOaAEqtDsOKLvTRwLcJqQkB8tE7L8nJaPhs7dSs/2X6h59bqNQ7N/Hajf MocWFw7BbDgCmOPzsXpa96N8mNKHY3TQI1CLDZwzkojY6he9D2LXArFBHqd5EiC0zGilXG t2ZLFx8IvLw2/7Add9djimmwcB+Sjny7ljdsJi53wJjJCkrv0p68Gf31ZLmq/CJJrl5xkm hMEF849ZBhyHIbyuvuD1hitQb8qI/hz5Z/jf53oVjwo7+hZmsS5TB4GaelCN/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731240785; a=rsa-sha256; cv=none; b=dr/fdJn/yGrBKgPxFHphwvI6XRlZPG8qVYQK03+H2podoK7pq/+sj+uMf4Ya1xroRfFTjY KB84Y0ALvmVCcXQXq+jUMnl+Qz6n8hDMVqc9HBc1sBGsPn8Hu1IDhVudY77tYLcciyZBOA reJlIKdGAeCCbwR7QieadKwFKXRWXe+CFHpaWwl/F8CXc0eFJWJB6ea9a6cnoHSgRzpEds q4S9p8A6L4bCwf5kFwuQ2SwY18DTHWsf7/4paNvGdt2ODrrOLyTPAdjs4jEagMPKm+i6uw 0ItIziqx1QTp817lr3Y+hv0cGmQULc7WdOv164OqNDPOfKM5iya2yHLALEbdxA== 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 4XmWm10whpzhWG; Sun, 10 Nov 2024 12:13:05 +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 4AACD5ZU012271; Sun, 10 Nov 2024 12:13:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AACD5wR012268; Sun, 10 Nov 2024 12:13:05 GMT (envelope-from git) Date: Sun, 10 Nov 2024 12:13:05 GMT Message-Id: <202411101213.4AACD5wR012268@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: 1c818faba725 - main - science/dlib-cpp: 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: 1c818faba7259c7176aa3f6717451a274bff7fc2 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c818faba7259c7176aa3f6717451a274bff7fc2 commit 1c818faba7259c7176aa3f6717451a274bff7fc2 Author: Dimitry Andric AuthorDate: 2024-11-10 11:49:55 +0000 Commit: Dimitry Andric CommitDate: 2024-11-10 12:08:40 +0000 science/dlib-cpp: 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/dlib-cpp 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/dlib-cpp/work/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: 282665 Approved by: arrowd (maintainer) MFH: 2024Q4 --- science/dlib-cpp/files/patch-dlib_serialize.h | 11 +++++++++++ science/dlib-cpp/files/patch-dlib_unicode_unicode.h | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/science/dlib-cpp/files/patch-dlib_serialize.h b/science/dlib-cpp/files/patch-dlib_serialize.h new file mode 100644 index 000000000000..94306df64159 --- /dev/null +++ b/science/dlib-cpp/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/dlib-cpp/files/patch-dlib_unicode_unicode.h b/science/dlib-cpp/files/patch-dlib_unicode_unicode.h new file mode 100644 index 000000000000..4527fdc054b0 --- /dev/null +++ b/science/dlib-cpp/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; + + // ----------------------------------------------------------------------------------------