freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

graphics/libemf: 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 graphics/libemf 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,
        |                                          ^
  libemf.cpp:982:30: note: in instantiation of template class 'std::basic_string<unsigned short>' requested here
    982 |     std::basic_string<WCHAR> filename_w( filename, filename + filename_count );
        |                              ^
  /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here
     23 | struct _LIBCPP_TEMPLATE_VIS char_traits;
        |                             ^

libemf should really use char16_t for its 16-bit character type, but the
code is full of Windows assumptions that WCHAR is unsigned short. Since
std::basic_string<unsigned short> is no longer available, use
std::basic_string<char16_t> instead, and cast the result to the
appropriate type for GetEnhMetaFileW().

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

PR:		281516
Approved by:	maintainer timeout (~2 weeks)
MFH:		2024Q3
This commit is contained in:
Dimitry Andric 2024-09-15 13:55:03 +02:00
parent c42de78032
commit 2b65317363
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
graphics/libemf/files/patch-libemf_libemf.cpp
View File

@ -1,4 +1,4 @@
--- libemf/libemf.cpp.orig 2021-11-01 12:21:53 UTC
--- libemf/libemf.cpp.orig 2020-06-07 13:10:20 UTC
+++ libemf/libemf.cpp
@@ -72,8 +72,7 @@ namespace EMF {
if ( not bigEndian() ) {
@ -10,3 +10,15 @@
}
/*!
@@ -980,9 +979,9 @@ extern "C" {
int filename_count = ::strlen( filename );
- std::basic_string<WCHAR> filename_w( filename, filename + filename_count );
+ std::basic_string<char16_t> filename_w( filename, filename + filename_count );
- HENHMETAFILE handle = GetEnhMetaFileW( filename_w.c_str() );
+ HENHMETAFILE handle = GetEnhMetaFileW( reinterpret_cast<LPCWSTR>(filename_w.c_str()) );
return handle;
}