Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/meson.git#1f043fac7e46a10e87f8ec8f1d8682884f22c85f
This commit is contained in:
parent
54ac971b6f
commit
d97ea66dc7
13
meson-gcc11.patch
Normal file
13
meson-gcc11.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
|
||||
index 1faa128..3c7f378 100644
|
||||
--- a/mesonbuild/modules/gnome.py
|
||||
+++ b/mesonbuild/modules/gnome.py
|
||||
@@ -1417,7 +1417,7 @@ class GnomeModule(ExtensionModule):
|
||||
GType
|
||||
%s@enum_name@_get_type (void)
|
||||
{
|
||||
- static volatile gsize gtype_id = 0;
|
||||
+ static gsize gtype_id = 0;
|
||||
static const G@Type@Value values[] = {''' % func_prefix
|
||||
|
||||
c_file_kwargs['vprod'] = ' { C_@TYPE@(@VALUENAME@), "@VALUENAME@", "@valuenick@" },'
|
@ -7,12 +7,13 @@
|
||||
|
||||
Name: meson
|
||||
Version: 0.55.3
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: High productivity build system
|
||||
|
||||
License: ASL 2.0
|
||||
URL: https://mesonbuild.com/
|
||||
Source: https://github.com/mesonbuild/meson/releases/download/%{version_no_tilde .}/meson-%{version_no_tilde %{quote:}}.tar.gz
|
||||
Patch0: %{name}-gcc11.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
@ -111,6 +112,9 @@ export MESON_PRINT_TEST_OUTPUT=1
|
||||
%{_datadir}/polkit-1/actions/com.mesonbuild.install.policy
|
||||
|
||||
%changelog
|
||||
* Fri Nov 06 2020 Jeff Law <law@redhat.com> - 0.55.3-2
|
||||
- Avoid bogus volatile in gnome modules support code caught by gcc-11
|
||||
|
||||
* Fri Sep 11 2020 Kalev Lember <klember@redhat.com> - 0.55.3-1
|
||||
- Update to 0.55.3
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user