From d97ea66dc7fe82d0acf044bc4c6bd2fe4856a761 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 6 Nov 2020 20:04:44 +0000 Subject: [PATCH] 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 --- meson-gcc11.patch | 13 +++++++++++++ meson.spec | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 meson-gcc11.patch diff --git a/meson-gcc11.patch b/meson-gcc11.patch new file mode 100644 index 0000000..11f34c9 --- /dev/null +++ b/meson-gcc11.patch @@ -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@" },' diff --git a/meson.spec b/meson.spec index 7569524..c046480 100644 --- a/meson.spec +++ b/meson.spec @@ -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 - 0.55.3-2 +- Avoid bogus volatile in gnome modules support code caught by gcc-11 + * Fri Sep 11 2020 Kalev Lember - 0.55.3-1 - Update to 0.55.3