git: a734ca4bddfd - 2024Q4 - x11-wm/blackbox: fix build with libc++ 19

From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Mon, 04 Nov 2024 07:38:45 UTC
The branch 2024Q4 has been updated by dim:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a734ca4bddfd20b086b5a89a4ceedf8078ba9cc1

commit a734ca4bddfd20b086b5a89a4ceedf8078ba9cc1
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-11-03 21:51:48 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-11-04 07:38:26 +0000

    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
    
    (cherry picked from commit dcc7cc48114b3730934be4236f63b5cdc0fa9821)
---
 x11-wm/blackbox/files/patch-lib_Unicode.hh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/x11-wm/blackbox/files/patch-lib_Unicode.hh b/x11-wm/blackbox/files/patch-lib_Unicode.hh
new file mode 100644
index 000000000000..9308811909f9
--- /dev/null
+++ b/x11-wm/blackbox/files/patch-lib_Unicode.hh
@@ -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.