mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00
Code Issues Releases Activity

textproc/zxing-cpp: fix build with libc++ 19

Browse Source 
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
This commit is contained in:
Dimitry Andric 2024-08-13 12:01:40 +02:00
parent 51c043a810
commit 43d0c7131e
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
textproc/zxing-cpp/files/patch-core_src_Utf.cpp Normal file
View File

@ -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;
}