From 8ea232a9aea2955d1a8fdef79eb8ad16cef4c46f Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 22 Jul 2025 08:43:52 +0200 Subject: [PATCH] meson: rename Rust subprojects to NAME-SEMVER-rs Use the convention for Rust subprojects that was adopted by Meson 1.5.0 and newer. Distros would prefer to avoid vendored crate sources, and instead use local sources from e.g. /usr/share/cargo/registry. While Meson does not support a local registry, it can be emulated with MESON_PACKAGE_CACHE_DIR. However, because the distro might not be using the exact version of the package, but only one that has the same semver, packagers need to add some hacks to rewrite the wrap files. For example, in Fedora: export MESON_PACKAGE_CACHE_DIR="%{cargo_registry}/" # So... Meson can't actually find them without tweaks %define inst_crate_nameversion() %(basename %{cargo_registry}/%{1}-*) %define rewrite_wrap_file() sed -e "/source.*/d" -e "s/%{1}-.*/%{inst_crate_nameversion %{1}}/" -i subprojects/%{1}.wrap %rewrite_wrap_file proc-macro2 %rewrite_wrap_file quote %rewrite_wrap_file syn %rewrite_wrap_file unicode-ident %rewrite_wrap_file paste Having a common convention for the name of Rust wraps makes it possible to perform this transformation with a script without listing the wraps one by one, and to share the script across multiple packages (which will be useful when QEMU starts using Rust in a similar way to Mesa). For an example of such a script, see https://lore.kernel.org/r/20250722083507.678542-1-pbonzini@redhat.com/. Acked-by: Faith Ekstrand Reviewed-by: Gurchetan Singh Tested-by: Gurchetan Singh Signed-off-by: Paolo Bonzini Part-of: --- .gitlab-ci/meson/build.sh | 18 +++++++++--------- src/compiler/rust/meson.build | 2 +- src/etnaviv/isa/meson.build | 10 +++++----- src/nouveau/compiler/meson.build | 4 ++-- src/nouveau/nil/meson.build | 2 +- src/util/rust/meson.build | 16 ++++++++-------- src/virtio/virtgpu_kumquat_ffi/meson.build | 2 +- .../{bitflags.wrap => bitflags-2-rs.wrap} | 2 +- subprojects/{cfg-if.wrap => cfg-if-1-rs.wrap} | 2 +- .../{equivalent.wrap => equivalent-1-rs.wrap} | 2 +- subprojects/{errno.wrap => errno-0.3-rs.wrap} | 2 +- .../{hashbrown.wrap => hashbrown-0.14-rs.wrap} | 2 +- .../{indexmap.wrap => indexmap-2-rs.wrap} | 2 +- subprojects/{libc.wrap => libc-0.2-rs.wrap} | 2 +- subprojects/{log.wrap => log-0.4-rs.wrap} | 2 +- .../{once_cell.wrap => once_cell-1-rs.wrap} | 2 +- .../{bitflags => bitflags-2-rs}/meson.build | 0 .../{cfg-if => cfg-if-1-rs}/meson.build | 0 .../meson.build | 0 .../{errno => errno-0.3-rs}/meson.build | 2 +- .../meson.build | 0 .../{indexmap => indexmap-2-rs}/meson.build | 4 ++-- .../{libc => libc-0.2-rs}/meson.build | 0 .../{log => log-0.4-rs}/meson.build | 0 .../{once_cell => once_cell-1-rs}/meson.build | 0 .../{paste => paste-1-rs}/meson.build | 0 .../{pest => pest-2-rs}/meson.build | 2 +- .../meson.build | 4 ++-- .../meson.build | 10 +++++----- .../{pest_meta => pest_meta-2-rs}/meson.build | 4 ++-- .../meson.build | 2 +- .../{quote => quote-1-rs}/meson.build | 4 ++-- .../{remain => remain-0.2-rs}/meson.build | 6 +++--- .../meson.build | 0 .../meson.build | 0 ...-on-Linux-support-a-build-without-lin.patch | 0 .../{rustix => rustix-1-rs}/meson.build | 6 +++--- .../packagefiles/{syn => syn-2-rs}/meson.build | 6 +++--- .../{thiserror => thiserror-2-rs}/meson.build | 8 ++++---- .../meson.build | 6 +++--- .../{ucd-trie => ucd-trie-0.1-rs}/meson.build | 0 .../meson.build | 0 ...zerocopy-work-around-Meson-limitation.patch | 0 .../{zerocopy => zerocopy-0.8-rs}/meson.build | 2 +- .../meson.build | 6 +++--- subprojects/{paste.wrap => paste-1-rs.wrap} | 2 +- subprojects/{pest.wrap => pest-2-rs.wrap} | 2 +- ...{pest_derive.wrap => pest_derive-2-rs.wrap} | 2 +- ...generator.wrap => pest_generator-2-rs.wrap} | 2 +- .../{pest_meta.wrap => pest_meta-2-rs.wrap} | 2 +- ...{proc-macro2.wrap => proc-macro2-1-rs.wrap} | 2 +- subprojects/{quote.wrap => quote-1-rs.wrap} | 2 +- .../{remain.wrap => remain-0.2-rs.wrap} | 2 +- .../{roxmltree.wrap => roxmltree-0.20-rs.wrap} | 2 +- .../{rustc-hash.wrap => rustc-hash-2-rs.wrap} | 2 +- subprojects/{rustix.wrap => rustix-1-rs.wrap} | 4 ++-- subprojects/{syn.wrap => syn-2-rs.wrap} | 2 +- .../{thiserror.wrap => thiserror-2-rs.wrap} | 2 +- ...rror-impl.wrap => thiserror-impl-2-rs.wrap} | 2 +- .../{ucd-trie.wrap => ucd-trie-0.1-rs.wrap} | 2 +- ...code-ident.wrap => unicode-ident-1-rs.wrap} | 2 +- .../{zerocopy.wrap => zerocopy-0.8-rs.wrap} | 4 ++-- ...derive.wrap => zerocopy-derive-0.8-rs.wrap} | 2 +- 63 files changed, 92 insertions(+), 92 deletions(-) rename subprojects/{bitflags.wrap => bitflags-2-rs.wrap} (87%) rename subprojects/{cfg-if.wrap => cfg-if-1-rs.wrap} (88%) rename subprojects/{equivalent.wrap => equivalent-1-rs.wrap} (87%) rename subprojects/{errno.wrap => errno-0.3-rs.wrap} (87%) rename subprojects/{hashbrown.wrap => hashbrown-0.14-rs.wrap} (86%) rename subprojects/{indexmap.wrap => indexmap-2-rs.wrap} (87%) rename subprojects/{libc.wrap => libc-0.2-rs.wrap} (88%) rename subprojects/{log.wrap => log-0.4-rs.wrap} (88%) rename subprojects/{once_cell.wrap => once_cell-1-rs.wrap} (87%) rename subprojects/packagefiles/{bitflags => bitflags-2-rs}/meson.build (100%) rename subprojects/packagefiles/{cfg-if => cfg-if-1-rs}/meson.build (100%) rename subprojects/packagefiles/{equivalent => equivalent-1-rs}/meson.build (100%) rename subprojects/packagefiles/{errno => errno-0.3-rs}/meson.build (87%) rename subprojects/packagefiles/{hashbrown => hashbrown-0.14-rs}/meson.build (100%) rename subprojects/packagefiles/{indexmap => indexmap-2-rs}/meson.build (73%) rename subprojects/packagefiles/{libc => libc-0.2-rs}/meson.build (100%) rename subprojects/packagefiles/{log => log-0.4-rs}/meson.build (100%) rename subprojects/packagefiles/{once_cell => once_cell-1-rs}/meson.build (100%) rename subprojects/packagefiles/{paste => paste-1-rs}/meson.build (100%) rename subprojects/packagefiles/{pest => pest-2-rs}/meson.build (85%) rename subprojects/packagefiles/{pest_derive => pest_derive-2-rs}/meson.build (74%) rename subprojects/packagefiles/{pest_generator => pest_generator-2-rs}/meson.build (63%) rename subprojects/packagefiles/{pest_meta => pest_meta-2-rs}/meson.build (76%) rename subprojects/packagefiles/{proc-macro2 => proc-macro2-1-rs}/meson.build (96%) rename subprojects/packagefiles/{quote => quote-1-rs}/meson.build (84%) rename subprojects/packagefiles/{remain => remain-0.2-rs}/meson.build (70%) rename subprojects/packagefiles/{roxmltree => roxmltree-0.20-rs}/meson.build (100%) rename subprojects/packagefiles/{rustc-hash => rustc-hash-2-rs}/meson.build (100%) rename subprojects/packagefiles/{rustix => rustix-1-rs}/0001-BACKPORT-rustix-on-Linux-support-a-build-without-lin.patch (100%) rename subprojects/packagefiles/{rustix => rustix-1-rs}/meson.build (84%) rename subprojects/packagefiles/{syn => syn-2-rs}/meson.build (86%) rename subprojects/packagefiles/{thiserror => thiserror-2-rs}/meson.build (66%) rename subprojects/packagefiles/{thiserror-impl => thiserror-impl-2-rs}/meson.build (72%) rename subprojects/packagefiles/{ucd-trie => ucd-trie-0.1-rs}/meson.build (100%) rename subprojects/packagefiles/{unicode-ident => unicode-ident-1-rs}/meson.build (100%) rename subprojects/packagefiles/{zerocopy => zerocopy-0.8-rs}/0001-zerocopy-work-around-Meson-limitation.patch (100%) rename subprojects/packagefiles/{zerocopy => zerocopy-0.8-rs}/meson.build (87%) rename subprojects/packagefiles/{zerocopy-derive => zerocopy-derive-0.8-rs}/meson.build (72%) rename subprojects/{paste.wrap => paste-1-rs.wrap} (88%) rename subprojects/{pest.wrap => pest-2-rs.wrap} (88%) rename subprojects/{pest_derive.wrap => pest_derive-2-rs.wrap} (87%) rename subprojects/{pest_generator.wrap => pest_generator-2-rs.wrap} (86%) rename subprojects/{pest_meta.wrap => pest_meta-2-rs.wrap} (87%) rename subprojects/{proc-macro2.wrap => proc-macro2-1-rs.wrap} (87%) rename subprojects/{quote.wrap => quote-1-rs.wrap} (88%) rename subprojects/{remain.wrap => remain-0.2-rs.wrap} (87%) rename subprojects/{roxmltree.wrap => roxmltree-0.20-rs.wrap} (86%) rename subprojects/{rustc-hash.wrap => rustc-hash-2-rs.wrap} (87%) rename subprojects/{rustix.wrap => rustix-1-rs.wrap} (65%) rename subprojects/{syn.wrap => syn-2-rs.wrap} (88%) rename subprojects/{thiserror.wrap => thiserror-2-rs.wrap} (87%) rename subprojects/{thiserror-impl.wrap => thiserror-impl-2-rs.wrap} (86%) rename subprojects/{ucd-trie.wrap => ucd-trie-0.1-rs.wrap} (86%) rename subprojects/{unicode-ident.wrap => unicode-ident-1-rs.wrap} (86%) rename subprojects/{zerocopy.wrap => zerocopy-0.8-rs.wrap} (67%) rename subprojects/{zerocopy-derive.wrap => zerocopy-derive-0.8-rs.wrap} (85%) diff --git a/.gitlab-ci/meson/build.sh b/.gitlab-ci/meson/build.sh index 758b9b2bc71..f18a5fc4fbd 100755 --- a/.gitlab-ci/meson/build.sh +++ b/.gitlab-ci/meson/build.sh @@ -144,15 +144,15 @@ fi # shellcheck disable=2206 meson_subprojects=( perfetto - syn - paste - pest - pest_derive - pest_generator - pest_meta - roxmltree - rustc-hash - indexmap + syn-2-rs + paste-1-rs + pest-2-rs + pest_derive-2-rs + pest_generator-2-rs + pest_meta-2-rs + roxmltree-0.20-rs + rustc-hash-2-rs + indexmap-2-rs ${FORCE_FALLBACK_FOR:-} ) diff --git a/src/compiler/rust/meson.build b/src/compiler/rust/meson.build index 98f1a93291a..b50ea756cd0 100644 --- a/src/compiler/rust/meson.build +++ b/src/compiler/rust/meson.build @@ -125,7 +125,7 @@ idep_compiler_rs = declare_dependency( dep_syn = dependency('syn', version : '>= 2.0.15', - fallback : ['syn', 'dep_syn'], + fallback : ['syn-2-rs', 'dep_syn'], required : true, ) diff --git a/src/etnaviv/isa/meson.build b/src/etnaviv/isa/meson.build index 55d093e3437..2dbd2b6679a 100644 --- a/src/etnaviv/isa/meson.build +++ b/src/etnaviv/isa/meson.build @@ -121,31 +121,31 @@ if with_tools.contains('etnaviv') dep_indexmap = dependency('indexmap', version : '>= 2.2.6', - fallback : ['indexmap', 'dep_indexmap'], + fallback : ['indexmap-2-rs', 'dep_indexmap'], required : true, ) dep_roxmltree = dependency('roxmltree', version : '>= 0.20.roxmltree', - fallback : ['roxmltree', 'dep_roxmltree'], + fallback : ['roxmltree-0.20-rs', 'dep_roxmltree'], required : true, ) dep_syn = dependency('syn', version : '>= 2.0.15', - fallback : ['syn', 'dep_syn'], + fallback : ['syn-2-rs', 'dep_syn'], required : true, ) dep_pest_generator = dependency('pest_generator', version: '>= 2.7.6', - fallback: ['pest_generator', 'dep_pest_generator'], + fallback: ['pest_generator-2-rs', 'dep_pest_generator'], required: true, ) dep_pest = dependency('pest', version: '>= 2.7.6', - fallback: ['pest', 'dep_pest'], + fallback: ['pest-2-rs', 'dep_pest'], required: true, ) diff --git a/src/nouveau/compiler/meson.build b/src/nouveau/compiler/meson.build index 1d6ddc699b3..8aa2fbbc44f 100644 --- a/src/nouveau/compiler/meson.build +++ b/src/nouveau/compiler/meson.build @@ -5,12 +5,12 @@ subdir('latencies') dep_paste = dependency('paste', version : '>= 1.0.14', - fallback : ['paste', 'dep_paste'], + fallback : ['paste-1-rs', 'dep_paste'], required : true, ) dep_rustc_hash = dependency('rustc-hash', - fallback: ['rustc-hash', 'dep_rustc_hash'], + fallback: ['rustc-hash-2-rs', 'dep_rustc_hash'], required: true, ) diff --git a/src/nouveau/nil/meson.build b/src/nouveau/nil/meson.build index 4b1350b5799..76b005c71a5 100644 --- a/src/nouveau/nil/meson.build +++ b/src/nouveau/nil/meson.build @@ -9,7 +9,7 @@ prog_cbindgen = find_program( dep_paste = dependency('paste', version : '>= 1.0.14', - fallback : ['paste', 'dep_paste'], + fallback : ['paste-1-rs', 'dep_paste'], required : true, ) diff --git a/src/util/rust/meson.build b/src/util/rust/meson.build index deaa0443d12..2596c91f39a 100644 --- a/src/util/rust/meson.build +++ b/src/util/rust/meson.build @@ -3,31 +3,31 @@ dep_cfg_if = dependency('cfg-if', version: '>= 1.0.0', - fallback: ['cfg-if', 'dep_cfg_if'], + fallback: ['cfg-if-1-rs', 'dep_cfg_if'], required: true, ) dep_thiserror = dependency('thiserror', version: '>= 2.0.11', - fallback: ['thiserror', 'dep_thiserror'], + fallback: ['thiserror-2-rs', 'dep_thiserror'], required: true, ) dep_remain = dependency('remain', version: '>= 0.2.12', - fallback: ['remain', 'dep_remain'], + fallback: ['remain-0.2-rs', 'dep_remain'], required: true, ) dep_zerocopy = dependency('zerocopy', version: '>= 0.8.13', - fallback: ['zerocopy', 'dep_zerocopy'], + fallback: ['zerocopy-0.8-rs', 'dep_zerocopy'], required: true, ) dep_zerocopy_derive = dependency('zerocopy-derive', version: '>= 0.8.13', - fallback: ['zerocopy-derive', 'dep_zerocopy_derive'], + fallback: ['zerocopy-derive-0.8-rs', 'dep_zerocopy_derive'], required: true, ) @@ -37,19 +37,19 @@ dep_mesa3d_util = [dep_cfg_if, dep_thiserror, dep_remain, dep_zerocopy, if host_machine.system() == 'linux' dep_rustix = dependency('rustix', version: '>= 0.38.31', - fallback: ['rustix', 'dep_rustix'], + fallback: ['rustix-1-rs', 'dep_rustix'], required: true, ) dep_bitflags = dependency('bitflags', version: '>= 2.6.0', - fallback: ['bitflags', 'dep_bitflags'], + fallback: ['bitflags-2-rs', 'dep_bitflags'], required: true, ) dep_errno = dependency('errno', version: '>= 0.3.8', - fallback: ['errno', 'dep_errno'], + fallback: ['errno-0.3-rs', 'dep_errno'], required: true, ) diff --git a/src/virtio/virtgpu_kumquat_ffi/meson.build b/src/virtio/virtgpu_kumquat_ffi/meson.build index d7a79cb9867..381f76fe78e 100644 --- a/src/virtio/virtgpu_kumquat_ffi/meson.build +++ b/src/virtio/virtgpu_kumquat_ffi/meson.build @@ -5,7 +5,7 @@ inc_virtgpu_kumquat_ffi = include_directories('include') dep_log = dependency('log', version: '>= 0.4.22', - fallback: ['log', 'dep_log'], + fallback: ['log-0.4-rs', 'dep_log'], required: true, ) diff --git a/subprojects/bitflags.wrap b/subprojects/bitflags-2-rs.wrap similarity index 87% rename from subprojects/bitflags.wrap rename to subprojects/bitflags-2-rs.wrap index e9bbd7e09ef..75f73f9ef80 100644 --- a/subprojects/bitflags.wrap +++ b/subprojects/bitflags-2-rs.wrap @@ -3,4 +3,4 @@ directory = bitflags-2.9.1 source_url = https://crates.io/api/v1/crates/bitflags/2.9.1/download source_filename = bitflags-2.9.1.tar.gz source_hash = 1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967 -patch_directory = bitflags +patch_directory = bitflags-2-rs diff --git a/subprojects/cfg-if.wrap b/subprojects/cfg-if-1-rs.wrap similarity index 88% rename from subprojects/cfg-if.wrap rename to subprojects/cfg-if-1-rs.wrap index 8b634e9cc99..20c56a8a266 100644 --- a/subprojects/cfg-if.wrap +++ b/subprojects/cfg-if-1-rs.wrap @@ -3,4 +3,4 @@ directory = cfg-if-1.0.0 source_url = https://crates.io/api/v1/crates/cfg-if/1.0.0/download source_filename = cfg-if-1.0.0.tar.gz source_hash = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd -patch_directory = cfg-if +patch_directory = cfg-if-1-rs diff --git a/subprojects/equivalent.wrap b/subprojects/equivalent-1-rs.wrap similarity index 87% rename from subprojects/equivalent.wrap rename to subprojects/equivalent-1-rs.wrap index 20ec1aa30bf..919c6403e54 100644 --- a/subprojects/equivalent.wrap +++ b/subprojects/equivalent-1-rs.wrap @@ -3,4 +3,4 @@ directory = equivalent-1.0.1 source_url = https://crates.io/api/v1/crates/equivalent/1.0.1/download source_filename = equivalent-1.0.1.tar.gz source_hash = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5 -patch_directory = equivalent +patch_directory = equivalent-1-rs diff --git a/subprojects/errno.wrap b/subprojects/errno-0.3-rs.wrap similarity index 87% rename from subprojects/errno.wrap rename to subprojects/errno-0.3-rs.wrap index aa3444bfe75..92ccf970685 100644 --- a/subprojects/errno.wrap +++ b/subprojects/errno-0.3-rs.wrap @@ -3,4 +3,4 @@ directory = errno-0.3.12 source_url = https://crates.io/api/v1/crates/errno/0.3.12/download source_filename = errno-0.3.12.tar.gz source_hash = cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18 -patch_directory = errno +patch_directory = errno-0.3-rs diff --git a/subprojects/hashbrown.wrap b/subprojects/hashbrown-0.14-rs.wrap similarity index 86% rename from subprojects/hashbrown.wrap rename to subprojects/hashbrown-0.14-rs.wrap index 99f1fe584c6..ef9523cade2 100644 --- a/subprojects/hashbrown.wrap +++ b/subprojects/hashbrown-0.14-rs.wrap @@ -3,4 +3,4 @@ directory = hashbrown-0.14.1 source_url = https://crates.io/api/v1/crates/hashbrown/0.14.1/download source_filename = hashbrown-0.14.1.tar.gz source_hash = 7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12 -patch_directory = hashbrown +patch_directory = hashbrown-0.14-rs diff --git a/subprojects/indexmap.wrap b/subprojects/indexmap-2-rs.wrap similarity index 87% rename from subprojects/indexmap.wrap rename to subprojects/indexmap-2-rs.wrap index 4e0c8445e27..3055c608fe0 100644 --- a/subprojects/indexmap.wrap +++ b/subprojects/indexmap-2-rs.wrap @@ -3,4 +3,4 @@ directory = indexmap-2.2.6 source_url = https://crates.io/api/v1/crates/indexmap/2.2.6/download source_filename = indexmap-2.2.6.tar.gz source_hash = 168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26 -patch_directory = indexmap +patch_directory = indexmap-2-rs diff --git a/subprojects/libc.wrap b/subprojects/libc-0.2-rs.wrap similarity index 88% rename from subprojects/libc.wrap rename to subprojects/libc-0.2-rs.wrap index 8ec44a94f04..0fd8bb257b3 100644 --- a/subprojects/libc.wrap +++ b/subprojects/libc-0.2-rs.wrap @@ -3,4 +3,4 @@ directory = libc-0.2.168 source_url = https://crates.io/api/v1/crates/libc/0.2.168/download source_filename = libc-0.2.168.tar.gz source_hash = 5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d -patch_directory = libc +patch_directory = libc-0.2-rs diff --git a/subprojects/log.wrap b/subprojects/log-0.4-rs.wrap similarity index 88% rename from subprojects/log.wrap rename to subprojects/log-0.4-rs.wrap index abf20c6cc9a..2abd1015ed5 100644 --- a/subprojects/log.wrap +++ b/subprojects/log-0.4-rs.wrap @@ -3,4 +3,4 @@ directory = log-0.4.27 source_url = https://crates.io/api/v1/crates/log/0.4.27/download source_filename = log-0.4.27.tar.gz source_hash = 13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94 -patch_directory = log +patch_directory = log-0.4-rs diff --git a/subprojects/once_cell.wrap b/subprojects/once_cell-1-rs.wrap similarity index 87% rename from subprojects/once_cell.wrap rename to subprojects/once_cell-1-rs.wrap index 90187931432..bd549d4ea15 100644 --- a/subprojects/once_cell.wrap +++ b/subprojects/once_cell-1-rs.wrap @@ -3,4 +3,4 @@ directory = once_cell-1.8.0 source_url = https://crates.io/api/v1/crates/once_cell/1.8.0/download source_filename = once_cell-1.8.0.tar.gz source_hash = 692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56 -patch_directory = once_cell +patch_directory = once_cell-1-rs diff --git a/subprojects/packagefiles/bitflags/meson.build b/subprojects/packagefiles/bitflags-2-rs/meson.build similarity index 100% rename from subprojects/packagefiles/bitflags/meson.build rename to subprojects/packagefiles/bitflags-2-rs/meson.build diff --git a/subprojects/packagefiles/cfg-if/meson.build b/subprojects/packagefiles/cfg-if-1-rs/meson.build similarity index 100% rename from subprojects/packagefiles/cfg-if/meson.build rename to subprojects/packagefiles/cfg-if-1-rs/meson.build diff --git a/subprojects/packagefiles/equivalent/meson.build b/subprojects/packagefiles/equivalent-1-rs/meson.build similarity index 100% rename from subprojects/packagefiles/equivalent/meson.build rename to subprojects/packagefiles/equivalent-1-rs/meson.build diff --git a/subprojects/packagefiles/errno/meson.build b/subprojects/packagefiles/errno-0.3-rs/meson.build similarity index 87% rename from subprojects/packagefiles/errno/meson.build rename to subprojects/packagefiles/errno-0.3-rs/meson.build index b0eab2221f0..465ff94c85a 100644 --- a/subprojects/packagefiles/errno/meson.build +++ b/subprojects/packagefiles/errno-0.3-rs/meson.build @@ -8,7 +8,7 @@ project( license : 'MIT OR Apache-2.0', ) -libc = subproject('libc').get_variable('lib') +libc = subproject('libc-0.2-rs').get_variable('lib') lib = static_library( 'libc_errno', diff --git a/subprojects/packagefiles/hashbrown/meson.build b/subprojects/packagefiles/hashbrown-0.14-rs/meson.build similarity index 100% rename from subprojects/packagefiles/hashbrown/meson.build rename to subprojects/packagefiles/hashbrown-0.14-rs/meson.build diff --git a/subprojects/packagefiles/indexmap/meson.build b/subprojects/packagefiles/indexmap-2-rs/meson.build similarity index 73% rename from subprojects/packagefiles/indexmap/meson.build rename to subprojects/packagefiles/indexmap-2-rs/meson.build index 63b93bf1732..42258d356fc 100644 --- a/subprojects/packagefiles/indexmap/meson.build +++ b/subprojects/packagefiles/indexmap-2-rs/meson.build @@ -5,8 +5,8 @@ project( license : 'MIT OR Apache-2.0', ) -dep_equivalent = subproject('equivalent').get_variable('dep_equivalent') -dep_hashbrown = subproject('hashbrown').get_variable('dep_hashbrown') +dep_equivalent = subproject('equivalent-1-rs').get_variable('dep_equivalent') +dep_hashbrown = subproject('hashbrown-0.14-rs').get_variable('dep_hashbrown') rust_args = [ '--cfg', 'feature="std"' diff --git a/subprojects/packagefiles/libc/meson.build b/subprojects/packagefiles/libc-0.2-rs/meson.build similarity index 100% rename from subprojects/packagefiles/libc/meson.build rename to subprojects/packagefiles/libc-0.2-rs/meson.build diff --git a/subprojects/packagefiles/log/meson.build b/subprojects/packagefiles/log-0.4-rs/meson.build similarity index 100% rename from subprojects/packagefiles/log/meson.build rename to subprojects/packagefiles/log-0.4-rs/meson.build diff --git a/subprojects/packagefiles/once_cell/meson.build b/subprojects/packagefiles/once_cell-1-rs/meson.build similarity index 100% rename from subprojects/packagefiles/once_cell/meson.build rename to subprojects/packagefiles/once_cell-1-rs/meson.build diff --git a/subprojects/packagefiles/paste/meson.build b/subprojects/packagefiles/paste-1-rs/meson.build similarity index 100% rename from subprojects/packagefiles/paste/meson.build rename to subprojects/packagefiles/paste-1-rs/meson.build diff --git a/subprojects/packagefiles/pest/meson.build b/subprojects/packagefiles/pest-2-rs/meson.build similarity index 85% rename from subprojects/packagefiles/pest/meson.build rename to subprojects/packagefiles/pest-2-rs/meson.build index bd46611f49a..b12f1beb145 100644 --- a/subprojects/packagefiles/pest/meson.build +++ b/subprojects/packagefiles/pest-2-rs/meson.build @@ -5,7 +5,7 @@ project( license : 'MIT OR Apache-2.0', ) -ucd = subproject('ucd-trie').get_variable('lib') +ucd = subproject('ucd-trie-0.1-rs').get_variable('lib') lib = static_library( 'pest', diff --git a/subprojects/packagefiles/pest_derive/meson.build b/subprojects/packagefiles/pest_derive-2-rs/meson.build similarity index 74% rename from subprojects/packagefiles/pest_derive/meson.build rename to subprojects/packagefiles/pest_derive-2-rs/meson.build index 1b4f75f45d6..3790b8e077f 100644 --- a/subprojects/packagefiles/pest_derive/meson.build +++ b/subprojects/packagefiles/pest_derive-2-rs/meson.build @@ -5,8 +5,8 @@ project( license : 'MIT OR Apache-2.0', ) -pest = subproject('pest').get_variable('lib') -pest_generator = subproject('pest_generator').get_variable('lib') +pest = subproject('pest-2-rs').get_variable('lib') +pest_generator = subproject('pest_generator-2-rs').get_variable('lib') rust = import('rust') diff --git a/subprojects/packagefiles/pest_generator/meson.build b/subprojects/packagefiles/pest_generator-2-rs/meson.build similarity index 63% rename from subprojects/packagefiles/pest_generator/meson.build rename to subprojects/packagefiles/pest_generator-2-rs/meson.build index 1566f183959..099d71d2e3d 100644 --- a/subprojects/packagefiles/pest_generator/meson.build +++ b/subprojects/packagefiles/pest_generator-2-rs/meson.build @@ -5,11 +5,11 @@ project( license : 'MIT OR Apache-2.0', ) -pest = subproject('pest').get_variable('lib') -pest_meta = subproject('pest_meta').get_variable('lib') -quote = subproject('quote').get_variable('lib') -pm2 = subproject('proc-macro2').get_variable('lib') -syn = subproject('syn').get_variable('lib') +pest = subproject('pest-2-rs').get_variable('lib') +pest_meta = subproject('pest_meta-2-rs').get_variable('lib') +quote = subproject('quote-1-rs').get_variable('lib') +pm2 = subproject('proc-macro2-1-rs').get_variable('lib') +syn = subproject('syn-2-rs').get_variable('lib') rust_args = [ '--cfg', 'feature="std"', diff --git a/subprojects/packagefiles/pest_meta/meson.build b/subprojects/packagefiles/pest_meta-2-rs/meson.build similarity index 76% rename from subprojects/packagefiles/pest_meta/meson.build rename to subprojects/packagefiles/pest_meta-2-rs/meson.build index 5aba4615a78..f77e7b1d46e 100644 --- a/subprojects/packagefiles/pest_meta/meson.build +++ b/subprojects/packagefiles/pest_meta-2-rs/meson.build @@ -5,8 +5,8 @@ project( license : 'MIT OR Apache-2.0', ) -once_cell = subproject('once_cell').get_variable('lib') -pest = subproject('pest').get_variable('lib') +once_cell = subproject('once_cell-1-rs').get_variable('lib') +pest = subproject('pest-2-rs').get_variable('lib') lib = static_library( 'pest_meta', diff --git a/subprojects/packagefiles/proc-macro2/meson.build b/subprojects/packagefiles/proc-macro2-1-rs/meson.build similarity index 96% rename from subprojects/packagefiles/proc-macro2/meson.build rename to subprojects/packagefiles/proc-macro2-1-rs/meson.build index 88f785044dc..ed5690810d0 100644 --- a/subprojects/packagefiles/proc-macro2/meson.build +++ b/subprojects/packagefiles/proc-macro2-1-rs/meson.build @@ -51,7 +51,7 @@ if rc.version().version_compare('< 1.79') ] endif -u_ind = subproject('unicode-ident').get_variable('lib') +u_ind = subproject('unicode-ident-1-rs').get_variable('lib') lib = static_library( 'proc_macro2', diff --git a/subprojects/packagefiles/quote/meson.build b/subprojects/packagefiles/quote-1-rs/meson.build similarity index 84% rename from subprojects/packagefiles/quote/meson.build rename to subprojects/packagefiles/quote-1-rs/meson.build index e14452d0dc2..5f7eaac23f6 100644 --- a/subprojects/packagefiles/quote/meson.build +++ b/subprojects/packagefiles/quote-1-rs/meson.build @@ -16,10 +16,10 @@ if rc.version().version_compare('< 1.53') rust_args += ['--cfg', 'needs_invalid_span_workaround'] endif -pm2 = subproject('proc-macro2').get_variable('lib') +pm2 = subproject('proc-macro2-1-rs').get_variable('lib') # XXX: workround for meson bug: https://github.com/mesonbuild/meson/issues/11306 -rust_args += ['-L', 'dependency=subprojects/unicode-ident'] +rust_args += ['-L', 'dependency=subprojects/unicode-ident-1-rs'] lib = static_library( 'quote', diff --git a/subprojects/packagefiles/remain/meson.build b/subprojects/packagefiles/remain-0.2-rs/meson.build similarity index 70% rename from subprojects/packagefiles/remain/meson.build rename to subprojects/packagefiles/remain-0.2-rs/meson.build index 75487d3017d..44357b61d87 100644 --- a/subprojects/packagefiles/remain/meson.build +++ b/subprojects/packagefiles/remain-0.2-rs/meson.build @@ -8,9 +8,9 @@ project( license : 'MIT OR Apache-2.0', ) -syn = subproject('syn').get_variable('lib') -quote = subproject('quote').get_variable('lib') -proc_macro2 = subproject('proc-macro2').get_variable('lib') +syn = subproject('syn-2-rs').get_variable('lib') +quote = subproject('quote-1-rs').get_variable('lib') +proc_macro2 = subproject('proc-macro2-1-rs').get_variable('lib') rust = import('rust') lib = rust.proc_macro( diff --git a/subprojects/packagefiles/roxmltree/meson.build b/subprojects/packagefiles/roxmltree-0.20-rs/meson.build similarity index 100% rename from subprojects/packagefiles/roxmltree/meson.build rename to subprojects/packagefiles/roxmltree-0.20-rs/meson.build diff --git a/subprojects/packagefiles/rustc-hash/meson.build b/subprojects/packagefiles/rustc-hash-2-rs/meson.build similarity index 100% rename from subprojects/packagefiles/rustc-hash/meson.build rename to subprojects/packagefiles/rustc-hash-2-rs/meson.build diff --git a/subprojects/packagefiles/rustix/0001-BACKPORT-rustix-on-Linux-support-a-build-without-lin.patch b/subprojects/packagefiles/rustix-1-rs/0001-BACKPORT-rustix-on-Linux-support-a-build-without-lin.patch similarity index 100% rename from subprojects/packagefiles/rustix/0001-BACKPORT-rustix-on-Linux-support-a-build-without-lin.patch rename to subprojects/packagefiles/rustix-1-rs/0001-BACKPORT-rustix-on-Linux-support-a-build-without-lin.patch diff --git a/subprojects/packagefiles/rustix/meson.build b/subprojects/packagefiles/rustix-1-rs/meson.build similarity index 84% rename from subprojects/packagefiles/rustix/meson.build rename to subprojects/packagefiles/rustix-1-rs/meson.build index ce2855a2ae5..ca09539f3d8 100644 --- a/subprojects/packagefiles/rustix/meson.build +++ b/subprojects/packagefiles/rustix-1-rs/meson.build @@ -8,9 +8,9 @@ project( license : 'Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT', ) -errno = subproject('errno').get_variable('lib') -libc = subproject('libc').get_variable('lib') -bitflags = subproject('bitflags').get_variable('lib') +errno = subproject('errno-0.3-rs').get_variable('lib') +libc = subproject('libc-0.2-rs').get_variable('lib') +bitflags = subproject('bitflags-2-rs').get_variable('lib') rustix_args = [] if host_machine.system() == 'linux' or host_machine.system() == 'android' diff --git a/subprojects/packagefiles/syn/meson.build b/subprojects/packagefiles/syn-2-rs/meson.build similarity index 86% rename from subprojects/packagefiles/syn/meson.build rename to subprojects/packagefiles/syn-2-rs/meson.build index a2d66356736..7fc6e79e193 100644 --- a/subprojects/packagefiles/syn/meson.build +++ b/subprojects/packagefiles/syn-2-rs/meson.build @@ -32,9 +32,9 @@ if rc.version().version_compare('< 1.56') rust_args += ['--cfg', 'syn_no_negative_literal_parse'] endif -u_ind = subproject('unicode-ident').get_variable('lib') -quote = subproject('quote').get_variable('lib') -pm2 = subproject('proc-macro2').get_variable('lib') +u_ind = subproject('unicode-ident-1-rs').get_variable('lib') +quote = subproject('quote-1-rs').get_variable('lib') +pm2 = subproject('proc-macro2-1-rs').get_variable('lib') lib = static_library( diff --git a/subprojects/packagefiles/thiserror/meson.build b/subprojects/packagefiles/thiserror-2-rs/meson.build similarity index 66% rename from subprojects/packagefiles/thiserror/meson.build rename to subprojects/packagefiles/thiserror-2-rs/meson.build index bceed91f830..7f33781d5ab 100644 --- a/subprojects/packagefiles/thiserror/meson.build +++ b/subprojects/packagefiles/thiserror-2-rs/meson.build @@ -8,10 +8,10 @@ project( license : 'MIT OR Apache-2.0', ) -syn = subproject('syn').get_variable('lib') -quote = subproject('quote').get_variable('lib') -proc_macro2 = subproject('proc-macro2').get_variable('lib') -thiserror_impl = subproject('thiserror-impl').get_variable('lib') +syn = subproject('syn-2-rs').get_variable('lib') +quote = subproject('quote-1-rs').get_variable('lib') +proc_macro2 = subproject('proc-macro2-1-rs').get_variable('lib') +thiserror_impl = subproject('thiserror-impl-2-rs').get_variable('lib') lib = static_library( 'thiserror', diff --git a/subprojects/packagefiles/thiserror-impl/meson.build b/subprojects/packagefiles/thiserror-impl-2-rs/meson.build similarity index 72% rename from subprojects/packagefiles/thiserror-impl/meson.build rename to subprojects/packagefiles/thiserror-impl-2-rs/meson.build index fb618b65337..d7641cc9377 100644 --- a/subprojects/packagefiles/thiserror-impl/meson.build +++ b/subprojects/packagefiles/thiserror-impl-2-rs/meson.build @@ -8,9 +8,9 @@ project( license : 'MIT OR Apache-2.0', ) -syn = subproject('syn').get_variable('lib') -quote = subproject('quote').get_variable('lib') -proc_macro2 = subproject('proc-macro2').get_variable('lib') +syn = subproject('syn-2-rs').get_variable('lib') +quote = subproject('quote-1-rs').get_variable('lib') +proc_macro2 = subproject('proc-macro2-1-rs').get_variable('lib') rust = import('rust') lib = rust.proc_macro( diff --git a/subprojects/packagefiles/ucd-trie/meson.build b/subprojects/packagefiles/ucd-trie-0.1-rs/meson.build similarity index 100% rename from subprojects/packagefiles/ucd-trie/meson.build rename to subprojects/packagefiles/ucd-trie-0.1-rs/meson.build diff --git a/subprojects/packagefiles/unicode-ident/meson.build b/subprojects/packagefiles/unicode-ident-1-rs/meson.build similarity index 100% rename from subprojects/packagefiles/unicode-ident/meson.build rename to subprojects/packagefiles/unicode-ident-1-rs/meson.build diff --git a/subprojects/packagefiles/zerocopy/0001-zerocopy-work-around-Meson-limitation.patch b/subprojects/packagefiles/zerocopy-0.8-rs/0001-zerocopy-work-around-Meson-limitation.patch similarity index 100% rename from subprojects/packagefiles/zerocopy/0001-zerocopy-work-around-Meson-limitation.patch rename to subprojects/packagefiles/zerocopy-0.8-rs/0001-zerocopy-work-around-Meson-limitation.patch diff --git a/subprojects/packagefiles/zerocopy/meson.build b/subprojects/packagefiles/zerocopy-0.8-rs/meson.build similarity index 87% rename from subprojects/packagefiles/zerocopy/meson.build rename to subprojects/packagefiles/zerocopy-0.8-rs/meson.build index ddf706b8bb0..8d7f7622913 100644 --- a/subprojects/packagefiles/zerocopy/meson.build +++ b/subprojects/packagefiles/zerocopy-0.8-rs/meson.build @@ -9,7 +9,7 @@ project( ) zerocopy_args = ['--cfg', 'feature="derive"'] -zerocopy_derive = subproject('zerocopy-derive').get_variable('lib') +zerocopy_derive = subproject('zerocopy-derive-0.8-rs').get_variable('lib') lib = static_library( 'zerocopy', diff --git a/subprojects/packagefiles/zerocopy-derive/meson.build b/subprojects/packagefiles/zerocopy-derive-0.8-rs/meson.build similarity index 72% rename from subprojects/packagefiles/zerocopy-derive/meson.build rename to subprojects/packagefiles/zerocopy-derive-0.8-rs/meson.build index 010aa11ed85..6f92703715d 100644 --- a/subprojects/packagefiles/zerocopy-derive/meson.build +++ b/subprojects/packagefiles/zerocopy-derive-0.8-rs/meson.build @@ -8,9 +8,9 @@ project( license : 'MIT OR Apache-2.0 OR BSD 2-Clause', ) -syn = subproject('syn').get_variable('lib') -quote = subproject('quote').get_variable('lib') -proc_macro2 = subproject('proc-macro2').get_variable('lib') +syn = subproject('syn-2-rs').get_variable('lib') +quote = subproject('quote-1-rs').get_variable('lib') +proc_macro2 = subproject('proc-macro2-1-rs').get_variable('lib') rust = import('rust') lib = rust.proc_macro( diff --git a/subprojects/paste.wrap b/subprojects/paste-1-rs.wrap similarity index 88% rename from subprojects/paste.wrap rename to subprojects/paste-1-rs.wrap index 45bfdc3e309..5cc51ae341d 100644 --- a/subprojects/paste.wrap +++ b/subprojects/paste-1-rs.wrap @@ -3,4 +3,4 @@ directory = paste-1.0.14 source_url = https://crates.io/api/v1/crates/paste/1.0.14/download source_filename = paste-1.0.14.tar.gz source_hash = de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c -patch_directory = paste +patch_directory = paste-1-rs diff --git a/subprojects/pest.wrap b/subprojects/pest-2-rs.wrap similarity index 88% rename from subprojects/pest.wrap rename to subprojects/pest-2-rs.wrap index ab9f66438a4..1f1dbd5949d 100644 --- a/subprojects/pest.wrap +++ b/subprojects/pest-2-rs.wrap @@ -3,4 +3,4 @@ directory = pest-2.8.0 source_url = https://crates.io/api/v1/crates/pest/2.8.0/download source_filename = pest-2.8.0.tar.gz source_hash = 198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6 -patch_directory = pest +patch_directory = pest-2-rs diff --git a/subprojects/pest_derive.wrap b/subprojects/pest_derive-2-rs.wrap similarity index 87% rename from subprojects/pest_derive.wrap rename to subprojects/pest_derive-2-rs.wrap index 9b4f1ef67dc..bbe4ad58295 100644 --- a/subprojects/pest_derive.wrap +++ b/subprojects/pest_derive-2-rs.wrap @@ -3,4 +3,4 @@ directory = pest_derive-2.8.0 source_url = https://crates.io/api/v1/crates/pest_derive/2.8.0/download source_filename = pest_derive-2.8.0.tar.gz source_hash = d725d9cfd79e87dccc9341a2ef39d1b6f6353d68c4b33c177febbe1a402c97c5 -patch_directory = pest_derive +patch_directory = pest_derive-2-rs diff --git a/subprojects/pest_generator.wrap b/subprojects/pest_generator-2-rs.wrap similarity index 86% rename from subprojects/pest_generator.wrap rename to subprojects/pest_generator-2-rs.wrap index 47fb77178f2..50624c8fa8a 100644 --- a/subprojects/pest_generator.wrap +++ b/subprojects/pest_generator-2-rs.wrap @@ -3,4 +3,4 @@ directory = pest_generator-2.8.0 source_url = https://crates.io/api/v1/crates/pest_generator/2.8.0/download source_filename = pest_generator-2.8.0.tar.gz source_hash = db7d01726be8ab66ab32f9df467ae8b1148906685bbe75c82d1e65d7f5b3f841 -patch_directory = pest_generator +patch_directory = pest_generator-2-rs diff --git a/subprojects/pest_meta.wrap b/subprojects/pest_meta-2-rs.wrap similarity index 87% rename from subprojects/pest_meta.wrap rename to subprojects/pest_meta-2-rs.wrap index 635d7734464..590204c8869 100644 --- a/subprojects/pest_meta.wrap +++ b/subprojects/pest_meta-2-rs.wrap @@ -3,4 +3,4 @@ directory = pest_meta-2.8.0 source_url = https://crates.io/api/v1/crates/pest_meta/2.8.0/download source_filename = pest_meta-2.8.0.tar.gz source_hash = 7f9f832470494906d1fca5329f8ab5791cc60beb230c74815dff541cbd2b5ca0 -patch_directory = pest_meta +patch_directory = pest_meta-2-rs diff --git a/subprojects/proc-macro2.wrap b/subprojects/proc-macro2-1-rs.wrap similarity index 87% rename from subprojects/proc-macro2.wrap rename to subprojects/proc-macro2-1-rs.wrap index 178ab599e99..d79b3e24d15 100644 --- a/subprojects/proc-macro2.wrap +++ b/subprojects/proc-macro2-1-rs.wrap @@ -3,4 +3,4 @@ directory = proc-macro2-1.0.86 source_url = https://crates.io/api/v1/crates/proc-macro2/1.0.86/download source_filename = proc-macro2-1.0.86.tar.gz source_hash = 5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77 -patch_directory = proc-macro2 +patch_directory = proc-macro2-1-rs diff --git a/subprojects/quote.wrap b/subprojects/quote-1-rs.wrap similarity index 88% rename from subprojects/quote.wrap rename to subprojects/quote-1-rs.wrap index 335f058895f..08c5a2a0343 100644 --- a/subprojects/quote.wrap +++ b/subprojects/quote-1-rs.wrap @@ -3,4 +3,4 @@ directory = quote-1.0.35 source_url = https://crates.io/api/v1/crates/quote/1.0.35/download source_filename = quote-1.0.35.tar.gz source_hash = 291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef -patch_directory = quote +patch_directory = quote-1-rs diff --git a/subprojects/remain.wrap b/subprojects/remain-0.2-rs.wrap similarity index 87% rename from subprojects/remain.wrap rename to subprojects/remain-0.2-rs.wrap index a5669e6463a..ad5d2f1e8b6 100644 --- a/subprojects/remain.wrap +++ b/subprojects/remain-0.2-rs.wrap @@ -3,4 +3,4 @@ directory = remain-0.2.12 source_url = https://crates.io/api/v1/crates/remain/0.2.12/download source_filename = remain-0.2.12.tar.gz source_hash = 1ad5e011230cad274d0532460c5ab69828ea47ae75681b42a841663efffaf794 -patch_directory = remain +patch_directory = remain-0.2-rs diff --git a/subprojects/roxmltree.wrap b/subprojects/roxmltree-0.20-rs.wrap similarity index 86% rename from subprojects/roxmltree.wrap rename to subprojects/roxmltree-0.20-rs.wrap index a01ba33e02a..a1b1e283f47 100644 --- a/subprojects/roxmltree.wrap +++ b/subprojects/roxmltree-0.20-rs.wrap @@ -3,4 +3,4 @@ directory = roxmltree-0.20.0 source_url = https://crates.io/api/v1/crates/roxmltree/0.20.0/download source_filename = roxmltree-0.20.0.tar.gz source_hash = 6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97 -patch_directory = roxmltree +patch_directory = roxmltree-0.20-rs diff --git a/subprojects/rustc-hash.wrap b/subprojects/rustc-hash-2-rs.wrap similarity index 87% rename from subprojects/rustc-hash.wrap rename to subprojects/rustc-hash-2-rs.wrap index cc8eef99150..8052e3144ff 100644 --- a/subprojects/rustc-hash.wrap +++ b/subprojects/rustc-hash-2-rs.wrap @@ -3,4 +3,4 @@ directory = rustc-hash-2.1.1 source_url = https://crates.io/api/v1/crates/rustc-hash/2.1.1/download source_filename = rustc-hash-2.1.1.tar.gz source_hash = 357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d -patch_directory = rustc-hash +patch_directory = rustc-hash-2-rs diff --git a/subprojects/rustix.wrap b/subprojects/rustix-1-rs.wrap similarity index 65% rename from subprojects/rustix.wrap rename to subprojects/rustix-1-rs.wrap index 079919c260b..357d6b6be9e 100644 --- a/subprojects/rustix.wrap +++ b/subprojects/rustix-1-rs.wrap @@ -3,6 +3,6 @@ directory = rustix-1.0.7 source_url = https://crates.io/api/v1/crates/rustix/1.0.7/download source_filename = rustix-1.0.7.tar.gz source_hash = c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266 -patch_directory = rustix +patch_directory = rustix-1-rs -diff_files = rustix/0001-BACKPORT-rustix-on-Linux-support-a-build-without-lin.patch +diff_files = rustix-1-rs/0001-BACKPORT-rustix-on-Linux-support-a-build-without-lin.patch diff --git a/subprojects/syn.wrap b/subprojects/syn-2-rs.wrap similarity index 88% rename from subprojects/syn.wrap rename to subprojects/syn-2-rs.wrap index aaef4619251..3382dec5153 100644 --- a/subprojects/syn.wrap +++ b/subprojects/syn-2-rs.wrap @@ -3,4 +3,4 @@ directory = syn-2.0.87 source_url = https://crates.io/api/v1/crates/syn/2.0.87/download source_filename = syn-2.0.87.tar.gz source_hash = 25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d -patch_directory = syn +patch_directory = syn-2-rs diff --git a/subprojects/thiserror.wrap b/subprojects/thiserror-2-rs.wrap similarity index 87% rename from subprojects/thiserror.wrap rename to subprojects/thiserror-2-rs.wrap index 2280b44bd02..4a66878dab7 100644 --- a/subprojects/thiserror.wrap +++ b/subprojects/thiserror-2-rs.wrap @@ -3,4 +3,4 @@ directory = thiserror-2.0.11 source_url = https://crates.io/api/v1/crates/thiserror/2.0.11/download source_filename = thiserror-2.0.11.tar.gz source_hash = d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc -patch_directory = thiserror +patch_directory = thiserror-2-rs diff --git a/subprojects/thiserror-impl.wrap b/subprojects/thiserror-impl-2-rs.wrap similarity index 86% rename from subprojects/thiserror-impl.wrap rename to subprojects/thiserror-impl-2-rs.wrap index f177017acdb..d8aaf67bb2f 100644 --- a/subprojects/thiserror-impl.wrap +++ b/subprojects/thiserror-impl-2-rs.wrap @@ -3,4 +3,4 @@ directory = thiserror-impl-2.0.11 source_url = https://crates.io/api/v1/crates/thiserror-impl/2.0.11/download source_filename = thiserror-impl-2.0.11.tar.gz source_hash = 26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2 -patch_directory = thiserror-impl +patch_directory = thiserror-impl-2-rs diff --git a/subprojects/ucd-trie.wrap b/subprojects/ucd-trie-0.1-rs.wrap similarity index 86% rename from subprojects/ucd-trie.wrap rename to subprojects/ucd-trie-0.1-rs.wrap index f9fd9fd6e12..e2bb3b2ade1 100644 --- a/subprojects/ucd-trie.wrap +++ b/subprojects/ucd-trie-0.1-rs.wrap @@ -3,4 +3,4 @@ directory = ucd-trie-0.1.6 source_url = https://crates.io/api/v1/crates/ucd-trie/0.1.6/download source_filename = ucd-trie-0.1.6.tar.gz source_hash = ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9 -patch_directory = ucd-trie +patch_directory = ucd-trie-0.1-rs diff --git a/subprojects/unicode-ident.wrap b/subprojects/unicode-ident-1-rs.wrap similarity index 86% rename from subprojects/unicode-ident.wrap rename to subprojects/unicode-ident-1-rs.wrap index 46e5f54661f..2a587ca20ea 100644 --- a/subprojects/unicode-ident.wrap +++ b/subprojects/unicode-ident-1-rs.wrap @@ -3,4 +3,4 @@ directory = unicode-ident-1.0.12 source_url = https://crates.io/api/v1/crates/unicode-ident/1.0.12/download source_filename = unicode-ident-1.0.12.tar.gz source_hash = 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b -patch_directory = unicode-ident +patch_directory = unicode-ident-1-rs diff --git a/subprojects/zerocopy.wrap b/subprojects/zerocopy-0.8-rs.wrap similarity index 67% rename from subprojects/zerocopy.wrap rename to subprojects/zerocopy-0.8-rs.wrap index bd8e8abf85b..a75de9fc10b 100644 --- a/subprojects/zerocopy.wrap +++ b/subprojects/zerocopy-0.8-rs.wrap @@ -3,6 +3,6 @@ directory = zerocopy-0.8.13 source_url = https://crates.io/api/v1/crates/zerocopy/0.8.13/download source_filename = zerocopy-0.8.13.tar.gz source_hash = 67914ab451f3bfd2e69e5e9d2ef3858484e7074d63f204fd166ec391b54de21d -patch_directory = zerocopy +patch_directory = zerocopy-0.8-rs -diff_files = zerocopy/0001-zerocopy-work-around-Meson-limitation.patch +diff_files = zerocopy-0.8-rs/0001-zerocopy-work-around-Meson-limitation.patch diff --git a/subprojects/zerocopy-derive.wrap b/subprojects/zerocopy-derive-0.8-rs.wrap similarity index 85% rename from subprojects/zerocopy-derive.wrap rename to subprojects/zerocopy-derive-0.8-rs.wrap index 2275accec72..26fcf39c661 100644 --- a/subprojects/zerocopy-derive.wrap +++ b/subprojects/zerocopy-derive-0.8-rs.wrap @@ -3,4 +3,4 @@ directory = zerocopy-derive-0.8.13 source_url = https://crates.io/api/v1/crates/zerocopy-derive/0.8.13/download source_filename = zerocopy-derive-0.8.13.tar.gz source_hash = 7988d73a4303ca289df03316bc490e934accf371af6bc745393cf3c2c5c4f25d -patch_directory = zerocopy-derive +patch_directory = zerocopy-derive-0.8-rs