diff --git a/meson-0.54.3.tar.gz b/meson-0.54.3.tar.gz deleted file mode 100644 index 9136683..0000000 Binary files a/meson-0.54.3.tar.gz and /dev/null differ diff --git a/meson-0.56.2.tar.gz b/meson-0.56.2.tar.gz new file mode 100644 index 0000000..0b2112d Binary files /dev/null and b/meson-0.56.2.tar.gz differ diff --git a/meson-gcc11.patch b/meson-gcc11.patch new file mode 100644 index 0000000..98abe65 --- /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 60ea8a5..bf6aac9 100644 --- a/meson.spec +++ b/meson.spec @@ -1,10 +1,11 @@ Name: meson -Version: 0.54.3 +Version: 0.56.2 Release: 1 Summary: An open source high quality build system License: ASL 2.0 URL: https://mesonbuild.com/ Source0: https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: %{name}-gcc11.patch BuildArch: noarch Obsoletes: %{name}-gui < 0.31.0-3 @@ -23,7 +24,7 @@ start compiling code. %package_help %prep -%autosetup -p1 +%autosetup -p1 rm -rf "test cases/frameworks/17 mpi" sed -i -e "/^%%__meson /s| .*$| %{_bindir}/%{name}|" data/macros.%{name} @@ -48,6 +49,9 @@ install -Dpm0644 data/macros.%{name} %{buildroot}%{_rpmmacrodir}/macros.%{name} %{_mandir}/man1/%{name}.1* %changelog +* Mon Jun 7 2021 weijin deng - 0.56.2-1 +- Upgrade to 0.56.2 + * Sun Jun 28 2020 huanghaitao - 0.54.3-1 - Upgrade to meet compilation needs