Date: Sat, 28 Sep 2024 10:01:33 GMT From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 5b9dda30c763 - 2024Q3 - graphics/libemf: fix build with libc++ 19 Message-ID: <202409281001.48SA1Xcm045072@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b9dda30c763cfaf81e0abcdeee4f6b2ac02ff45 commit 5b9dda30c763cfaf81e0abcdeee4f6b2ac02ff45 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2024-09-15 11:55:03 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2024-09-28 10:01:20 +0000 graphics/libemf: 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/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 (cherry picked from commit 2b65317363f625eceb125cad5864fd873a66562f) --- graphics/libemf/files/patch-libemf_libemf.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/graphics/libemf/files/patch-libemf_libemf.cpp b/graphics/libemf/files/patch-libemf_libemf.cpp index b0da3b4bbe53..e0368f114e08 100644 --- a/graphics/libemf/files/patch-libemf_libemf.cpp +++ b/graphics/libemf/files/patch-libemf_libemf.cpp @@ -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; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409281001.48SA1Xcm045072>