git: 6133473e4227 - main - graphics/povray37: fix build with libc++ 19

The branch main has been updated by dim:

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

commit 6133473e4227abbfcf023bea6ab5eeed9c17e55b
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-11-09 12:04:23 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-11-21 23:06:15 +0000

    graphics/povray37: 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 graphics/povray37 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 short>'
        820 |   static_assert(is_same<_CharT, typename traits_type::char_type>::value,
            |                                          ^
      ./base/configbase.h:159:19: note: in instantiation of template class 'std::basic_string<unsigned short>' requested here
        159 | inline UCS2String ASCIItoUCS2String(const char *s)
            |                   ^
      /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 `POVMSUCS2` as `char16_t` instead of
    `unsigned short`, `UCS2` as `char16_t` instead of `unsigned short`, and
    `UCS4` as `char32_t` instead of `unsigned int` in the passed-in
    `CPPFLAGS` variable.
    
    Also, patch up `vfe.cpp` and `vfeconf.h` to use `char16_t` and
    `u16string` instead of the non-standard types.
    
    [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals
    
    PR:             282645
    Approved by:    bsd@philippost.de (maintainer)
    MFH:            2024Q4
---
 graphics/povray37/Makefile                  |  3 +++
 graphics/povray37/files/patch-vfe_vfe.cpp   | 26 ++++++++++++++++++++++++++
 graphics/povray37/files/patch-vfe_vfeconf.h | 19 +++++++++++++++++++
 3 files changed, 48 insertions(+)

diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index ca49e21b35de..dd49d7396768 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -24,6 +24,9 @@ GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	COMPILED_BY=${HOSTARCH}-portbld-${OPSYS:tl}-${OSREL:R} \
 		--program-transform-name='s/povray/${PKGBASE}/' \
 		--disable-optimiz
+CPPFLAGS+=	-D POVMSUCS2="char16_t"
+CPPFLAGS+=	-D UCS2="char16_t"
+CPPFLAGS+=	-D UCS4="char32_t"
 
 VERSION_BASE=	${PORTVERSION:C/([0-9]+\.[0-9]+).*/\1/}
 ETCDIR=		${PREFIX}/etc/${PORTNAME}/${VERSION_BASE}
diff --git a/graphics/povray37/files/patch-vfe_vfe.cpp b/graphics/povray37/files/patch-vfe_vfe.cpp
new file mode 100644
index 000000000000..f4c8e56714ef
--- /dev/null
+++ b/graphics/povray37/files/patch-vfe_vfe.cpp
@@ -0,0 +1,26 @@
+--- vfe/vfe.cpp.orig	2021-07-08 09:56:01 UTC
++++ vfe/vfe.cpp
+@@ -1372,7 +1372,7 @@ int Allow_File_Write (const char *Filename, const unsi
+   return (vfeSession::GetSessionFromThreadID()->TestAccessAllowed(Filename, true));
+ }
+ 
+-int Allow_File_Write (const unsigned short *Filename, const unsigned int FileType)
++int Allow_File_Write (const char16_t *Filename, const unsigned int FileType)
+ {
+   if (strcmp(UCS2toASCIIString(Filename).c_str(), "stdout") == 0 || strcmp(UCS2toASCIIString(Filename).c_str(), "stderr") == 0)
+     return true;
+@@ -1384,12 +1384,12 @@ int Allow_File_Read (const char *Filename, const unsig
+   return (vfeSession::GetSessionFromThreadID()->TestAccessAllowed(Filename, false));
+ }
+ 
+-int Allow_File_Read (const unsigned short *Filename, const unsigned int FileType)
++int Allow_File_Read (const char16_t *Filename, const unsigned int FileType)
+ {
+   return (vfeSession::GetSessionFromThreadID()->TestAccessAllowed(Filename, false));
+ }
+ 
+-FILE *vfeFOpen (const std::basic_string<unsigned short>& name, const char *mode)
++FILE *vfeFOpen (const UCS2String& name, const char *mode)
+ {
+   return (fopen (UCS2toASCIIString (name).c_str(), mode)) ;
+ }
diff --git a/graphics/povray37/files/patch-vfe_vfeconf.h b/graphics/povray37/files/patch-vfe_vfeconf.h
new file mode 100644
index 000000000000..e0761680ed1f
--- /dev/null
+++ b/graphics/povray37/files/patch-vfe_vfeconf.h
@@ -0,0 +1,19 @@
+--- vfe/vfeconf.h.orig	2021-07-08 09:56:01 UTC
++++ vfe/vfeconf.h
+@@ -61,12 +61,12 @@ namespace vfe
+   int vfe_POVMS_Sys_QueueSend(POVMS_Sys_QueueNode *q, void *p, int l) ;
+   int Allow_File_Write (const char *Filename, const unsigned int FileType);
+   int Allow_File_Read (const char *Filename, const unsigned int FileType);
+-  int Allow_File_Read (const unsigned short *Filename, const unsigned int FileType);
+-  int Allow_File_Write (const unsigned short *Filename, const unsigned int FileType);
++  int Allow_File_Read (const char16_t *Filename, const unsigned int FileType);
++  int Allow_File_Write (const char16_t *Filename, const unsigned int FileType);
+   POVMS_Sys_Thread_Type POVMS_GetCurrentThread();
+   void vfeAssert (const char *message, const char *filename, int line) ;
+-  FILE *vfeFOpen (const std::basic_string<unsigned short>& name, const char *mode);
+-  bool vfeRemove (const std::basic_string<unsigned short>& name);
++  FILE *vfeFOpen (const std::u16string& name, const char *mode);
++  bool vfeRemove (const std::u16string& name);
+ 
+ #if defined _DEBUG
+   void *vfe_POVMS_Sys_Malloc(size_t size, const char *func, const char *file, int line) ;