mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-18 00:10:04 +00:00
cad/kicad-devel: 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 cad/kicad-devel to fail to compile with clang 19 and libc++
19, resulting in errors similar to:
/wrkdirs/usr/ports/cad/kicad-devel/work/kicad-6ebd8f46fe24533214b9ed43f1f7e5a4b80dcc71/thirdparty/nanodbc/nanodbc/nanodbc.cpp:261:25: error: implicit instantiation of undefined template 'std::char_traits<unsigned short>'
261 | auto const n = std::char_traits<NANODBC_SQLCHAR>::length(array);
| ^
/usr/include/c++/v1/__string/char_traits.h:45:8: note: template is declared here
45 | struct char_traits;
| ^
/wrkdirs/usr/ports/cad/kicad-devel/work/kicad-6ebd8f46fe24533214b9ed43f1f7e5a4b80dcc71/thirdparty/nanodbc/nanodbc/nanodbc.cpp:3576:52: error: implicit instantiation of undefined template 'std::char_traits<unsigned short>'
3576 | dsn.name = string(&name[0], &name[std::char_traits<NANODBC_SQLCHAR>::length(name)]);
| ^
/usr/include/c++/v1/__string/char_traits.h:45:8: note: template is declared here
45 | struct char_traits;
| ^
/wrkdirs/usr/ports/cad/kicad-devel/work/kicad-6ebd8f46fe24533214b9ed43f1f7e5a4b80dcc71/thirdparty/nanodbc/nanodbc/nanodbc.cpp:3578:49: error: implicit instantiation of undefined template 'std::char_traits<unsigned short>'
3578 | string(&driver[0], &driver[std::char_traits<NANODBC_SQLCHAR>::length(driver)]);
| ^
/usr/include/c++/v1/__string/char_traits.h:45:8: note: template is declared here
45 | struct char_traits;
| ^
/wrkdirs/usr/ports/cad/kicad-devel/work/kicad-6ebd8f46fe24533214b9ed43f1f7e5a4b80dcc71/thirdparty/nanodbc/nanodbc/nanodbc.cpp:3629:54: error: implicit instantiation of undefined template 'std::char_traits<unsigned short>'
3629 | drv.name = string(&descr[0], &descr[std::char_traits<NANODBC_SQLCHAR>::length(descr)]);
| ^
/usr/include/c++/v1/__string/char_traits.h:45:8: note: template is declared here
45 | struct char_traits;
| ^
and:
/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,
| ^
/wrkdirs/usr/ports/cad/kicad-devel/work/kicad-6ebd8f46fe24533214b9ed43f1f7e5a4b80dcc71/thirdparty/compoundfilereader/compoundfilereader.h:226:21: note: in instantiation of template class 'std::basic_string<unsigned short>' requested here
226 | utf16string dir;
| ^
/usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here
23 | struct _LIBCPP_TEMPLATE_VIS char_traits;
| ^
and:
/wrkdirs/usr/ports/cad/kicad-devel/work/kicad-6ebd8f46fe24533214b9ed43f1f7e5a4b80dcc71/thirdparty/nlohmann_json/nlohmann/json.hpp:3604:22: error: implicit instantiation of undefined template 'std::char_traits<wxUniChar>'
3604 | struct char_traits : std::char_traits<T>
| ^
/wrkdirs/usr/ports/cad/kicad-devel/work/kicad-6ebd8f46fe24533214b9ed43f1f7e5a4b80dcc71/thirdparty/nlohmann_json/nlohmann/json.hpp:6289:14: note: in instantiation of template class 'nlohmann::detail::char_traits<wxUniChar>' requested here
6289 | typename char_traits<char_type>::int_type get_character()
| ^
/wrkdirs/usr/ports/cad/kicad-devel/work/kicad-6ebd8f46fe24533214b9ed43f1f7e5a4b80dcc71/thirdparty/nlohmann_json/nlohmann/json.hpp:6465:22: note: in instantiation of template class 'nlohmann::detail::iterator_input_adapter<wxString::const_iterator>' requested here
6465 | BaseInputAdapter base_adapter;
| ^
/wrkdirs/usr/ports/cad/kicad-devel/work/kicad-6ebd8f46fe24533214b9ed43f1f7e5a4b80dcc71/thirdparty/nlohmann_json/nlohmann/json.hpp:23323:16: note: in instantiation of template class 'nlohmann::detail::wide_string_input_adapter<nlohmann::detail::iterator_input_adapter<wxString::const_iterator>, wxUniChar>' requested here
23323 | parser(detail::input_adapter(std::forward<InputType>(i)), cb, allow_exceptions, ignore_comments).parse(true, result);
| ^
/wrkdirs/usr/ports/cad/kicad-devel/work/kicad-6ebd8f46fe24533214b9ed43f1f7e5a4b80dcc71/eeschema/sch_io/easyedapro/sch_io_easyedapro.cpp:209:53: note: in instantiation of function template specialization 'nlohmann::basic_json<>::parse<wxString>' requested here
209 | nlohmann::json js = nlohmann::json::parse( txt.ReadLine() );
| ^
/usr/include/c++/v1/__string/char_traits.h:45:8: note: template is declared here
45 | struct char_traits;
| ^
The first batch of errors can be fixed by providing a simple `length()`
function for the `NANODBC_SQLCHAR const*` type. The second batch can be
fixed by using `std::basic_string<char16_t>` for `utf16string`, and
adjusting the call to `std::basic_string<char16_t>::append`. The third
batch can be fixed by adding a `char_traits` definition specifically for
the `wxUniChar` type.
[1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals
PR: 282512
Approved by: maintainer timeout (2 weeks)
MFH: 2024Q4
This commit is contained in:
Dimitry Andric
parent
96997562fb
commit
1b22fed46c
@ -0,0 +1,34 @@
|
|||||||
|
--- eeschema/sch_io/easyedapro/sch_io_easyedapro.cpp.orig 2024-10-11 09:03:05 UTC
|
||||||
|
+++ eeschema/sch_io/easyedapro/sch_io_easyedapro.cpp
|
||||||
|
@@ -105,6 +105,31 @@ int SCH_IO_EASYEDAPRO::GetModifyHash() const
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
+// Explicitly define char traits for wxUniChar since it is not standard
|
||||||
|
+template<>
|
||||||
|
+struct nlohmann::detail::char_traits<wxUniChar> : std::char_traits<char32_t>
|
||||||
|
+{
|
||||||
|
+ using char_type = wxUniChar;
|
||||||
|
+ using int_type = uint32_t;
|
||||||
|
+
|
||||||
|
+ // Redefine to_int_type function
|
||||||
|
+ static int_type to_int_type(char_type c) noexcept
|
||||||
|
+ {
|
||||||
|
+ return static_cast<int_type>(c);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ static char_type to_char_type(int_type i) noexcept
|
||||||
|
+ {
|
||||||
|
+ return static_cast<char_type>(i);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ static constexpr int_type eof() noexcept
|
||||||
|
+ {
|
||||||
|
+ return ~0U;
|
||||||
|
+ }
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+
|
||||||
|
static LIB_SYMBOL* loadSymbol( nlohmann::json project, const wxString& aLibraryPath,
|
||||||
|
const wxString& aAliasName, const std::map<std::string, UTF8>* aProperties )
|
||||||
|
{
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
--- thirdparty/compoundfilereader/compoundfilereader.h.orig 2024-10-11 09:03:05 UTC
|
||||||
|
+++ thirdparty/compoundfilereader/compoundfilereader.h
|
||||||
|
@@ -131,7 +131,7 @@ struct helper
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
-typedef std::basic_string<uint16_t> utf16string;
|
||||||
|
+typedef std::basic_string<char16_t> utf16string;
|
||||||
|
typedef std::function<int(const COMPOUND_FILE_ENTRY*, const utf16string& dir, int level)>
|
||||||
|
EnumFilesCallback;
|
||||||
|
|
||||||
|
@@ -249,7 +249,7 @@ class CompoundFileReader (private)
|
||||||
|
utf16string newDir = dir;
|
||||||
|
if (dir.length() != 0)
|
||||||
|
newDir.append(1, '\n');
|
||||||
|
- newDir.append(entry->name, entry->nameLen / 2);
|
||||||
|
+ newDir.append(reinterpret_cast<const char16_t*>(entry->name), entry->nameLen / 2);
|
||||||
|
EnumNodes(GetEntry(entry->childID), currentLevel + 1, maxLevel, newDir, callback);
|
||||||
|
}
|
||||||
|
|
||||||
@ -0,0 +1,44 @@
|
|||||||
|
--- thirdparty/nanodbc/nanodbc/nanodbc.cpp.orig 2024-10-11 09:03:05 UTC
|
||||||
|
+++ thirdparty/nanodbc/nanodbc/nanodbc.cpp
|
||||||
|
@@ -255,10 +255,19 @@ constexpr std::size_t size(const T (&array)[N]) noexce
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+inline std::size_t length(NANODBC_SQLCHAR const* s)
|
||||||
|
+{
|
||||||
|
+ std::size_t len = 0;
|
||||||
|
+ for (; *s != 0; ++s)
|
||||||
|
+ ++len;
|
||||||
|
+ return len;
|
||||||
|
+
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
template <std::size_t N>
|
||||||
|
inline std::size_t size(NANODBC_SQLCHAR const (&array)[N]) noexcept
|
||||||
|
{
|
||||||
|
- auto const n = std::char_traits<NANODBC_SQLCHAR>::length(array);
|
||||||
|
+ auto const n = length(array);
|
||||||
|
NANODBC_ASSERT(n < N);
|
||||||
|
return n < N ? n : N - 1;
|
||||||
|
}
|
||||||
|
@@ -3589,9 +3598,9 @@ std::list<datasource> list_datasources()
|
||||||
|
"incompatible SQLCHAR and string::value_type");
|
||||||
|
|
||||||
|
datasource dsn;
|
||||||
|
- dsn.name = string(&name[0], &name[std::char_traits<NANODBC_SQLCHAR>::length(name)]);
|
||||||
|
+ dsn.name = string(&name[0], &name[length(name)]);
|
||||||
|
dsn.driver =
|
||||||
|
- string(&driver[0], &driver[std::char_traits<NANODBC_SQLCHAR>::length(driver)]);
|
||||||
|
+ string(&driver[0], &driver[length(driver)]);
|
||||||
|
|
||||||
|
dsns.push_back(std::move(dsn));
|
||||||
|
direction = SQL_FETCH_NEXT;
|
||||||
|
@@ -3642,7 +3651,7 @@ std::list<driver> list_drivers()
|
||||||
|
"incompatible SQLCHAR and string::value_type");
|
||||||
|
|
||||||
|
driver drv;
|
||||||
|
- drv.name = string(&descr[0], &descr[std::char_traits<NANODBC_SQLCHAR>::length(descr)]);
|
||||||
|
+ drv.name = string(&descr[0], &descr[length(descr)]);
|
||||||
|
|
||||||
|
// Split "Key1=Value1\0Key2=Value2\0\0" into list of key-value pairs
|
||||||
|
auto beg = &attrs[0];
|
||||||
Loading…
Reference in New Issue
Block a user