diff --git a/.gitignore b/.gitignore index fe01e63..af5bd92 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ /meson-0.49.2.tar.gz /meson-0.50.0.tar.gz /meson-0.50.1.tar.gz +/meson-0.51.0.tar.gz diff --git a/0001-compilers-n_debug-if-release-and-buildtype-plain-sho.patch b/0001-compilers-n_debug-if-release-and-buildtype-plain-sho.patch deleted file mode 100644 index 1522056..0000000 --- a/0001-compilers-n_debug-if-release-and-buildtype-plain-sho.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d88bf0eb80e2531a8017de4efd4eb02f1e3081ec Mon Sep 17 00:00:00 2001 -From: Dylan Baker -Date: Mon, 25 Mar 2019 11:35:18 -0700 -Subject: [PATCH] compilers: n_debug=if-release and buildtype=plain should not - enable assertions - -It's a bit odd that it doesn't, and has resulted in bugs in distro -packaging. - -Fixes #5141 ---- - docs/markdown/snippets/debug-if-release-plain.md | 4 ++++ - mesonbuild/compilers/compilers.py | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - create mode 100644 docs/markdown/snippets/debug-if-release-plain.md - -diff --git a/docs/markdown/snippets/debug-if-release-plain.md b/docs/markdown/snippets/debug-if-release-plain.md -new file mode 100644 -index 00000000..013e6c83 ---- /dev/null -+++ b/docs/markdown/snippets/debug-if-release-plain.md -@@ -0,0 +1,4 @@ -+## n_debug=if-release and buildtype=plain means no asserts -+ -+Previously if this combination was used then assertions were enabled, -+which is fairly surprising behavior. -diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py -index da029806..66195dc1 100644 ---- a/mesonbuild/compilers/compilers.py -+++ b/mesonbuild/compilers/compilers.py -@@ -510,7 +510,7 @@ def get_base_compile_args(options, compiler): - try: - if (options['b_ndebug'].value == 'true' or - (options['b_ndebug'].value == 'if-release' and -- options['buildtype'].value == 'release')): -+ options['buildtype'].value in {'release', 'plain'})): - args += ['-DNDEBUG'] - except KeyError: - pass --- -2.21.0 - diff --git a/meson.spec b/meson.spec index 9666ae2..fc48e3d 100644 --- a/meson.spec +++ b/meson.spec @@ -1,15 +1,13 @@ %global libname mesonbuild Name: meson -Version: 0.50.1 +Version: 0.51.0 Release: 1%{?dist} Summary: High productivity build system License: ASL 2.0 URL: https://mesonbuild.com/ Source: https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz -# https://github.com/mesonbuild/meson/commit/d88bf0eb80e2531a8017de4efd4eb02f1e3081ec -Patch0001: 0001-compilers-n_debug-if-release-and-buildtype-plain-sho.patch BuildArch: noarch Obsoletes: %{name}-gui < 0.31.0-3 @@ -49,6 +47,9 @@ install -Dpm0644 -t %{buildroot}%{rpmmacrodir} data/macros.%{name} %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy %changelog +* Mon Jun 17 10:03:21 CEST 2019 Igor Gnatenko - 0.51.0-1 +- Update to 0.51 + * Wed Apr 17 2019 Igor Gnatenko - 0.50.1-1 - Update to 0.50.1 diff --git a/sources b/sources index d664e71..b137824 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (meson-0.50.1.tar.gz) = 44d07204e8971c3e78f189c912d3c1e4fe48084335eb7cd15c7cb6d87d034b852181f0fbb2f8a07fbeb56f7312233157e9d575204d3e1f6d46d6bc076e4c67fc +SHA512 (meson-0.51.0.tar.gz) = 42c4033c1fc6ab76b4189bb588051ce1d31079ac3ac5a89c1e5d9566365b2b64b878adc3ab3c41bc0e345bf98c3f4c2d90b959b5e583e2e20e7dde493b55287f