From 96708614ba46c42f87b23f2a957c510499d8811e Mon Sep 17 00:00:00 2001 From: John Turner Date: Sun, 21 Dec 2025 04:20:53 +0000 Subject: port to meson cargo Use the new unstable meson cargo support. This simplifies the meson.build script and allows to use crates such as clap that require picking up features from Cargo.toml. This also allows us to not embed thiserror in subprojects, and instead use a wrap file with a custom meson.build and some patches to make it compile without running its build.rs script. --- .../packagefiles/thiserror-impl-2.0.17-include.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 subprojects/packagefiles/thiserror-impl-2.0.17-include.patch (limited to 'subprojects/packagefiles/thiserror-impl-2.0.17-include.patch') diff --git a/subprojects/packagefiles/thiserror-impl-2.0.17-include.patch b/subprojects/packagefiles/thiserror-impl-2.0.17-include.patch new file mode 100644 index 0000000..372862d --- /dev/null +++ b/subprojects/packagefiles/thiserror-impl-2.0.17-include.patch @@ -0,0 +1,13 @@ +diff --git a/impl/src/lib.rs b/impl/src/lib.rs +index 25890f2..1559a41 100644 +--- a/src/lib.rs ++++ b/src/lib.rs +@@ -48,7 +48,7 @@ struct private; + impl ToTokens for private { + fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) { + tokens.append(Ident::new( +- concat!("__private", env!("CARGO_PKG_VERSION_PATCH")), ++ concat!("__private", "_MESON"), + Span::call_site(), + )); + } -- cgit v1.2.3