From nobody Wed Oct 09 19:17:02 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 4XP2gz0FrCz5YtS4; Wed, 09 Oct 2024 19:17:03 +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 4XP2gy6Q6hz4N2V; Wed, 9 Oct 2024 19:17:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728501422; 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=G/I9+JGJwMBHk037YzDIT+E2Sazn5/vzyKb1il2RztI=; b=xvykBOnmxaphNPm9xSJjW2hh4v8IAsAZPSrD7IfhsSjZxX8tfJB3B2WGpANO3XDNSfksuG 0Mj9DicV1t2rSp0bICeEdgTn0drMQ9RVZeg0MqGBrvpaz85heSAWAygagU5QcMv+1neIVe WN6cF3OnOXzoJZXrnKpzRKcTIiz35gra+MP35N8S/lOWp6TzBo2+q5AYQ/NZdqNUV4ZaX7 ZgwGO+bnljG7x7fNb8bxrqYwLxFGjcuN/9IoiiwBm9kg/TlPTzulebXiwi2tkvbPEcpefn iRTmQ9UulqgdQWofeS4LPkHfCsqTzaIMtb7htzV8Xvc/RBcDUu+vy8EqFf85fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728501422; 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=G/I9+JGJwMBHk037YzDIT+E2Sazn5/vzyKb1il2RztI=; b=K1d8KLO4JhMeiqeGTWjxbDVE5ttyEqivUbXS5X6GTg3Ev2p6X216VmZ//9dqHOwwa5E1qe Q/mWpX40tdNGSUPhnTZ5sYR7MEeEbpLXFgPUyIgdaqGAfvh3RmmUEJw2E2Pz7Yq7jfSMe1 kQeMt2Uni9JiXfD/cANR7t0dzScp/wFcdvspePho6xPtf38oecrMXChFllAJhrJQhY8f0k YPaAEvWMJJbZYqHfpDw95BefdtRBuWaFi+aX6bN9O7kYnsAF460/MVsIG1guv/AgJmecbQ 9fqTXO14s4fTpG248vP13LXo+XbP1zJXmwdDlfPF3InoDJTkz4KyHJSNPmZ0Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728501422; a=rsa-sha256; cv=none; b=tHS+M1WxYZkGOKWqQ0cAVzC7leVqf0iVq/Nn8wDtlR6BA0MnaH5tep3CpY+JBL4vNMH/Hm 84M/+PZVjrHtp4l2fKQSqfDv3aWVGDPI6oW8AduFNaTo6Dy3XpofTo7WskLmpc6xYhXdif AlW4WIJxVJKDB37EUXBhDOiXqMR9DMSXUTMEUVjtcn7icfNIkY2ceGfkMtXvBPVGwntn0w RJhCdgDXOEDsIMkE/6DmoJ+0y9wVcIKW+MqUYKHQkyKz4rkNhDHmKtyPuYUcfX01RVwwKH sx/RoOX7CIoXoWE1T8AlBAhvsbxyYmKKx2TrvjxJ1OOJRDpRwovS/PnDoveWHg== 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 4XP2gy5vrHzR4S; Wed, 9 Oct 2024 19:17:02 +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 499JH2dg038307; Wed, 9 Oct 2024 19:17:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 499JH2oZ038304; Wed, 9 Oct 2024 19:17:02 GMT (envelope-from git) Date: Wed, 9 Oct 2024 19:17:02 GMT Message-Id: <202410091917.499JH2oZ038304@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: b67619a7aa9c - 2024Q4 - science/dlib-cpp: fix build with clang and 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: b67619a7aa9c10ff28ba0ff7067c4737509c872f Auto-Submitted: auto-generated The branch 2024Q4 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=b67619a7aa9c10ff28ba0ff7067c4737509c872f commit b67619a7aa9c10ff28ba0ff7067c4737509c872f Author: Dimitry Andric AuthorDate: 2024-10-08 10:28:32 +0000 Commit: Dimitry Andric CommitDate: 2024-10-09 19:16:48 +0000 science/dlib-cpp: fix build with clang and 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/dlib/bigint/../unicode/unicode.h:496:26: note: in instantiation of template class 'std::basic_string' requested here 496 | inline const ustring convert_utf8_to_utf32 ( | ^ /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; | ^ These can be fixed by using `char32_t` instead of `uint32_t` for the `unichar` type. Also, clang 19 now implements CWG 96 [1], which requires a template argument list after a 'template' keyword, resulting in errors similar to: /wrkdirs/usr/ports/science/dlib-cpp/work/dlib-19.24/dlib/filtering/../global_optimization/find_max_global.h:61:130: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw] 61 | static auto go(T&& f, const matrix& a) -> decltype(call_function_and_expand_args::template go(std::forward(f),a)) | ^ This can be fixed by adding `<>` after the `go` identifier. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals PR: 281975 Approved by: arrowd (maintainer) MFH: 2024Q3 (cherry picked from commit e8b1dca33760dc680dcc732dcd3e9c7be1d79e76) --- .../files/patch-dlib_global__optimization_find__max__global.h | 11 +++++++++++ science/dlib-cpp/files/patch-dlib_serialize.h | 10 ++++++++++ science/dlib-cpp/files/patch-dlib_unicode_unicode.h | 11 +++++++++++ 3 files changed, 32 insertions(+) diff --git a/science/dlib-cpp/files/patch-dlib_global__optimization_find__max__global.h b/science/dlib-cpp/files/patch-dlib_global__optimization_find__max__global.h new file mode 100644 index 000000000000..5c15321b552f --- /dev/null +++ b/science/dlib-cpp/files/patch-dlib_global__optimization_find__max__global.h @@ -0,0 +1,11 @@ +--- dlib/global_optimization/find_max_global.h.orig 2022-05-08 14:35:36 UTC ++++ dlib/global_optimization/find_max_global.h +@@ -58,7 +58,7 @@ namespace dlib + } + + template +- static auto go(T&& f, const matrix& a) -> decltype(call_function_and_expand_args::template go(std::forward(f),a)) ++ static auto go(T&& f, const matrix& a) -> decltype(call_function_and_expand_args::template go<>(std::forward(f),a)) + { + return call_function_and_expand_args::go(std::forward(f),a); + } 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..dffe293a1797 --- /dev/null +++ b/science/dlib-cpp/files/patch-dlib_serialize.h @@ -0,0 +1,10 @@ +--- dlib/serialize.h.orig 2022-05-08 14:35:36 UTC ++++ dlib/serialize.h +@@ -626,6 +626,7 @@ namespace dlib + USE_DEFAULT_INT_SERIALIZATION_FOR(unsigned long) + USE_DEFAULT_INT_SERIALIZATION_FOR(uint64) + USE_DEFAULT_INT_SERIALIZATION_FOR(int64) ++ USE_DEFAULT_INT_SERIALIZATION_FOR(char32_t) + + USE_DEFAULT_BYTE_SERIALIZATION_FOR(char) + USE_DEFAULT_BYTE_SERIALIZATION_FOR(signed char) 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..2262f242258d --- /dev/null +++ b/science/dlib-cpp/files/patch-dlib_unicode_unicode.h @@ -0,0 +1,11 @@ +--- dlib/unicode/unicode.h.orig 2022-05-08 14:35:36 UTC ++++ dlib/unicode/unicode.h +@@ -16,7 +16,7 @@ namespace dlib + + // ---------------------------------------------------------------------------------------- + +- typedef uint32 unichar; ++ typedef char32_t unichar; + + #if defined(__GNUC__) && __GNUC__ < 4 && __GNUC_MINOR__ < 4 + struct unichar_traits