mirror of
https://src.fedoraproject.org/rpms/mesa.git
synced 2024-11-28 02:54:51 +00:00
Workaround rhbz#2277018 while awaiting upstream fix
This commit is contained in:
parent
7980c7d4f3
commit
dfd0e10064
2 changed files with 43 additions and 0 deletions
39
mesa-28923.patch
Normal file
39
mesa-28923.patch
Normal file
|
@ -0,0 +1,39 @@
|
|||
From 8561958ccfd9b3a742a8742cc5931e9a6f6a7814 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= <jexposit@redhat.com>
|
||||
Date: Thu, 25 Apr 2024 11:47:31 +0200
|
||||
Subject: [PATCH] meson: Disable proc_macro2 unestable features
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
proc-macro2 >= 1.0.80 uses proc_macro_byte_character [1] and
|
||||
proc_macro_c_str_literals [2].
|
||||
Disable them until they are available.
|
||||
|
||||
[1] https://github.com/rust-lang/rust/issues/115268
|
||||
[2] https://github.com/rust-lang/rust/issues/119750
|
||||
Signed-off-by: José Expósito <jexposit@redhat.com>
|
||||
---
|
||||
subprojects/packagefiles/proc-macro2/meson.build | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/subprojects/packagefiles/proc-macro2/meson.build b/subprojects/packagefiles/proc-macro2/meson.build
|
||||
index b39d76e80c825..5bd635c80a389 100644
|
||||
--- a/subprojects/packagefiles/proc-macro2/meson.build
|
||||
+++ b/subprojects/packagefiles/proc-macro2/meson.build
|
||||
@@ -41,6 +41,12 @@ endif
|
||||
if rc.version().version_compare('< 1.57')
|
||||
rust_args += ['--cfg', 'no_is_available']
|
||||
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')
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
|
@ -75,6 +75,10 @@ Source0: https://archive.mesa3d.org/mesa-%{ver}.tar.xz
|
|||
Source1: Mesa-MLAA-License-Clarification-Email.txt
|
||||
|
||||
Patch10: gnome-shell-glthread-disable.patch
|
||||
# Work around for the meson bug until an upstream fix lands
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2277018
|
||||
# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28923
|
||||
Patch11: mesa-28923.patch
|
||||
|
||||
BuildRequires: meson >= 1.3.0
|
||||
BuildRequires: gcc
|
||||
|
|
Loading…
Reference in a new issue