From 25aa178802620afe81a436d1927f9ab3e7d41f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Thu, 25 Apr 2024 11:47:31 +0200 Subject: [PATCH] meson: Update proc_macro2 meson.build patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the proc-macro2/meson.build to include the changes from v1.0.81. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11071 Signed-off-by: José Expósito Part-of: (cherry picked from commit 18c53157318d6c8e572062f6bb768dfb621a55fd) --- .pick_status.json | 2 +- subprojects/packagefiles/proc-macro2/meson.build | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index e263a98b781..8a577cc7998 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4,7 +4,7 @@ "description": "meson: Update proc_macro2 meson.build patch", "nominated": false, "nomination_type": 3, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/subprojects/packagefiles/proc-macro2/meson.build b/subprojects/packagefiles/proc-macro2/meson.build index b39d76e80c8..be2b272d375 100644 --- a/subprojects/packagefiles/proc-macro2/meson.build +++ b/subprojects/packagefiles/proc-macro2/meson.build @@ -41,6 +41,15 @@ endif if rc.version().version_compare('< 1.57') rust_args += ['--cfg', 'no_is_available'] endif +if rc.version().version_compare('< 1.66') + rust_args += ['--cfg', 'no_source_text'] +endif +if rc.version().version_compare('< 1.79') + rust_args += [ + '--cfg', 'no_literal_byte_character', + '--cfg', 'no_literal_c_string', + ] +endif u_ind = subproject('unicode-ident').get_variable('lib')