git: 459baf8a44da - 2024Q3 - textproc/zxing-cpp: fix build with libc++ 19
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 16 Aug 2024 15:44:49 UTC
The branch 2024Q3 has been updated by dim:
URL: https://cgit.FreeBSD.org/ports/commit/?id=459baf8a44da4f346e7e9a2160f82fe4ccf6631e
commit 459baf8a44da4f346e7e9a2160f82fe4ccf6631e
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-08-13 10:01:40 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-08-16 15:44:18 +0000
textproc/zxing-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 textproc/zxing-cpp to fail to compile with clang 19 and
libc++ 19, resulting in errors similar to:
/usr/include/c++/v1/string_view:300:42: error: implicit instantiation of undefined template 'std::char_traits<unsigned char>'
300 | static_assert(is_same<_CharT, typename traits_type::char_type>::value,
| ^
/wrkdirs/usr/ports/textproc/zxing-cpp/work/zxing-cpp-2.2.1/core/src/Utf.cpp:72:42: note: in instantiation of template class 'std::basic_string_view<unsigned char>' requested here
72 | static size_t Utf8CountCodePoints(utf8_t utf8)
| ^
/usr/include/c++/v1/__string/char_traits.h:45:8: note: template is declared here
45 | struct char_traits;
| ^
`utf8_t` is effectively defined as `std::basic_string<uint8_t>`, which
is no longer possible. So redefine it as a `std::vector<uint8_t>`
instead.
This requires only a small adjustment in one other place: replacing the
initializer list in the `AppendFromUtf8` call in `FromUtf8`.
[1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals
PR: 280791
Approved by: tcberner (maintainer)
MFH: 2024Q3
(cherry picked from commit 43d0c7131e80e98445045b1d17a6054db1c6369d)
---
textproc/zxing-cpp/files/patch-core_src_Utf.cpp | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/textproc/zxing-cpp/files/patch-core_src_Utf.cpp b/textproc/zxing-cpp/files/patch-core_src_Utf.cpp
new file mode 100644
index 000000000000..cf8e04839b92
--- /dev/null
+++ b/textproc/zxing-cpp/files/patch-core_src_Utf.cpp
@@ -0,0 +1,21 @@
+--- core/src/Utf.cpp.orig 2023-12-10 23:43:27 UTC
++++ core/src/Utf.cpp
+@@ -20,7 +20,7 @@ using char8_t = uint8_t;
+ #if __cplusplus <= 201703L
+ using char8_t = uint8_t;
+ #endif
+-using utf8_t = std::basic_string_view<char8_t>;
++using utf8_t = std::vector<char8_t>;
+
+ using state_t = uint8_t;
+ constexpr state_t kAccepted = 0;
+@@ -118,7 +118,8 @@ std::wstring FromUtf8(std::string_view utf8)
+ std::wstring FromUtf8(std::string_view utf8)
+ {
+ std::wstring str;
+- AppendFromUtf8({reinterpret_cast<const char8_t*>(utf8.data()), utf8.size()}, str);
++ const char8_t* data = reinterpret_cast<const char8_t*>(utf8.data());
++ AppendFromUtf8({data, data + utf8.size()}, str);
+ return str;
+ }
+