1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00

x11-wm/blackbox: 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 x11-wm/blackbox 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,
        |                                          ^
  ./Menu.hh:82:13: note: in instantiation of template class 'std::basic_string<unsigned int>' requested here
     82 |     ustring lbl;
        |             ^
  /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 `Uchar` as `char32_t` instead of `unsigned
int` in `Unicode.hh`.

[1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals

PR:		282525
Approved by:	A.J.Caines@halplant.com (maintainer)
MFH:		2024Q4
This commit is contained in:
Dimitry Andric 2024-11-03 22:51:48 +01:00
parent ed636668a3
commit dcc7cc4811

View File

@ -0,0 +1,11 @@
--- lib/Unicode.hh.orig 2005-01-03 09:42:53 UTC
+++ lib/Unicode.hh
@@ -37,7 +37,7 @@ namespace bt
/*
* Unicode character type.
*/
- typedef unsigned int Uchar;
+ typedef char32_t Uchar;
/*
* Unicode string type.