Attachment 254315 Details for Bug 282165 – devel/librevisa: fix build with libc++ 19

[patch] devel/librevisa: fix build with libc++ 19

devel__librevisa-fix-libcxx19-build-1.diff (text/plain), 2.58 KB, created by Dimitry Andric on 2024-10-17 19:22:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2024-10-17 19:22:53 UTC

Size: 2.58 KB

patch

obsolete

>commit 35a07d8998080a0907f1a6e9b0891ab521f566c4
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   2024-10-17T16:28:46+02:00
>
>    devel/librevisa: 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 devel/librevisa 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 short>'
>        820 |   static_assert(is_same<_CharT, typename traits_type::char_type>::value,
>            |                                          ^
>      usb/usb_resource_creator.cpp:73:20: note: in instantiation of template class 'std::basic_string<unsigned short>' requested here
>         73 |         usb_string serial;
>            |                    ^
>      /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 `char16_t` instead of `uint16_t` for the
>    `usb_string` type.
>    
>    [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals
>    
>    PR:             282165
>    MFH:            2024Q4
>
>diff --git a/devel/librevisa/files/patch-src_usb_usb__resource__creator.cpp b/devel/librevisa/files/patch-src_usb_usb__resource__creator.cpp
>new file mode 100644
>index 000000000000..79a54c12a5d4
>--- /dev/null
>+++ b/devel/librevisa/files/patch-src_usb_usb__resource__creator.cpp
>@@ -0,0 +1,11 @@
>+--- src/usb/usb_resource_creator.cpp.orig	2013-04-08 15:47:56 UTC
>++++ src/usb/usb_resource_creator.cpp
>+@@ -293,7 +293,7 @@ bool usb_resource::creator::open_device_and_get_serial
>+         {
>+                 uint8_t bLength;
>+                 uint8_t bDescriptorType;
>+-                uint16_t bString[0];
>++                char16_t bString[0];
>+         };
>+ 
>+         /// @todo may not be portable everywhere
>diff --git a/devel/librevisa/files/patch-src_usb_usb__string.h b/devel/librevisa/files/patch-src_usb_usb__string.h
>new file mode 100644
>index 000000000000..d7bc6393e889
>--- /dev/null
>+++ b/devel/librevisa/files/patch-src_usb_usb__string.h
>@@ -0,0 +1,11 @@
>+--- src/usb/usb_string.h.orig	2013-01-07 10:35:29 UTC
>++++ src/usb/usb_string.h
>+@@ -25,7 +25,7 @@ namespace usb {
>+ namespace librevisa {
>+ namespace usb {
>+ 
>+-typedef std::basic_string<uint16_t> usb_string;
>++typedef std::basic_string<char16_t> usb_string;
>+ 
>+ }
>+ }

Actions: View | Diff

Attachments on bug 282165: 254315