Attachment 253536 Details for Bug 281478 – devel/libxsd-frontend: fix build with libc++ 19

[patch] devel/libxsd-frontend: fix build with libc++ 19

devel__libxsd-frontend-fix-libcxx19-build-1.diff (text/plain), 3.54 KB, created by Dimitry Andric on 2024-09-13 10:36:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2024-09-13 10:36:42 UTC

Size: 3.54 KB

patch

obsolete

>commit 6cc2e8f14e3acd56a291c52a7fde4543df8f4d2a
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   2024-09-13T12:36:00+02:00
>
>    devel/libxsd-frontend: 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 www/qt5-webengine 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<XSDFrontend::Bits::None>'
>        820 |   static_assert(is_same<_CharT, typename traits_type::char_type>::value,
>            |                                          ^
>      /wrkdirs/usr/ports/devel/libxsd-frontend/work/libxsd-frontend-2.1.0/libxsd-frontend/xml.hxx:100:23: note: in instantiation of template class 'std::basic_string<XSDFrontend::Bits::None>' requested here
>        100 |       NarrowString r (s);
>            |                       ^
>      /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here
>         23 | struct _LIBCPP_TEMPLATE_VIS char_traits;
>            |                             ^
>    
>    The `Bits::None` construct used by libxsd-frontend is meant to disable
>    unwanted conversions, but it no longer works if `std::char_traits>` is
>    undefined for this type.
>    
>    Fix it by removing the `Bits` namespace and only enabling the converting
>    constructors if the first type of `StringTemplate` is `wchar_t`.
>    
>    [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals
>    
>    PR:             281478
>    MFH:            2024Q3
>
>diff --git a/devel/libxsd-frontend/files/patch-libxsd-frontend_types.hxx b/devel/libxsd-frontend/files/patch-libxsd-frontend_types.hxx
>new file mode 100644
>index 000000000000..6162dbf7fe56
>--- /dev/null
>+++ b/devel/libxsd-frontend/files/patch-libxsd-frontend_types.hxx
>@@ -0,0 +1,62 @@
>+--- libxsd-frontend/types.hxx.orig	2022-08-19 06:30:48 UTC
>++++ libxsd-frontend/types.hxx
>+@@ -13,38 +13,13 @@ namespace XSDFrontend
>+ {
>+   using std::size_t;
>+ 
>+-  namespace Bits
>+-  {
>+-    struct None {};
>+-
>+-    template <typename C>
>+-    struct NarrowerChar
>+-    {
>+-      typedef None Type;
>+-    };
>+-
>+-    template <>
>+-    struct NarrowerChar<wchar_t>
>+-    {
>+-      typedef char Type;
>+-    };
>+-  }
>+-
>+   struct LIBXSD_FRONTEND_SYMEXPORT NonRepresentable: std::exception
>+   {
>+     virtual char const*
>+     what () const throw ();
>+   };
>+ 
>+-  template <typename C, typename NC = typename Bits::NarrowerChar<C>::Type>
>+-  class StringTemplate;
>+-
>+-  template <>
>+-  class StringTemplate<Bits::None, Bits::None>
>+-  {
>+-  };
>+-
>+-  template <typename C, typename NC>
>++  template <typename C, typename NC = char>
>+   class StringTemplate : public std::basic_string<C>
>+   {
>+     typedef std::basic_string<C> Base;
>+@@ -114,16 +89,19 @@ namespace XSDFrontend
>+ 
>+     // Conversion from the Narrower type. Experimental.
>+     //
>++    template<typename WC = C, typename = std::enable_if_t<std::is_same_v<WC, wchar_t>>>
>+     StringTemplate (NC const* s)
>+     {
>+       from_narrow (s);
>+     }
>+ 
>++    template<typename WC = C, typename = std::enable_if_t<std::is_same_v<WC, wchar_t>>>
>+     StringTemplate (StringTemplate<NC> const& other)
>+     {
>+       from_narrow (other.c_str ());
>+     }
>+ 
>++    template<typename WC = C, typename = std::enable_if_t<std::is_same_v<WC, wchar_t>>>
>+     StringTemplate (NarrowerBase const& other)
>+     {
>+       from_narrow (other.c_str ());

Actions: View | Diff

Attachments on bug 281478: 253536