Attachment 255068 Details for Bug 282665 – science/dlib-cpp: fix build with libc++ 19

[patch] science/dlib-cpp: fix build with libc++ 19

science__dlib-cpp-fix-clang19-libcxx19-build-2.diff (text/plain), 2.75 KB, created by Dimitry Andric on 2024-11-10 11:53:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2024-11-10 11:53:16 UTC

Size: 2.75 KB

patch

obsolete

>commit 531f7954696d2fdee5abd331713d4e6619ef33ed
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   2024-11-10T12:49:55+01:00
>
>    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<unsigned int>'
>        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<unsigned int>' 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
>    MFH:            2024Q4
>
>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<unichar>;
>+ 
>+ // ----------------------------------------------------------------------------------------

Actions: View | Diff

Attachments on bug 282665: 255068