git: 00dce14954e1 - 2024Q4 - devel/librevisa: fix build with libc++ 19
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 30 Oct 2024 18:29:43 UTC
The branch 2024Q4 has been updated by dim:
URL: https://cgit.FreeBSD.org/ports/commit/?id=00dce14954e15cd7bf837456ab396b5d21da29b8
commit 00dce14954e15cd7bf837456ab396b5d21da29b8
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-10-17 14:28:46 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-10-30 18:29:00 +0000
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
(cherry picked from commit df7422d81ae570a17b48662af9f20f464f12b076)
---
.../librevisa/files/patch-src_usb_usb__resource__creator.cpp | 11 +++++++++++
devel/librevisa/files/patch-src_usb_usb__string.h | 11 +++++++++++
2 files changed, 22 insertions(+)
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;
+
+ }
+ }