diff options
| author | Remi Collet <remi@remirepo.net> | 2023-01-02 17:08:22 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2023-01-02 17:08:22 +0100 |
| commit | c653e187de493d3c175d6daa4c194dbaf78544a5 (patch) | |
| tree | ee0af7f3b113faacccccbacb43099aab57619cd4 | |
| parent | 25ef48e9da5dbba556467495809cb4949c9f6c8a (diff) | |
| -rw-r--r-- | 0001-mcompile-use-v-instead-of-verbose-for-ninja.patch | 28 | ||||
| -rw-r--r-- | meson.spec | 10 |
2 files changed, 7 insertions, 31 deletions
diff --git a/0001-mcompile-use-v-instead-of-verbose-for-ninja.patch b/0001-mcompile-use-v-instead-of-verbose-for-ninja.patch deleted file mode 100644 index fa38c5b..0000000 --- a/0001-mcompile-use-v-instead-of-verbose-for-ninja.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c466054902dde6ecf353d6f4a22a6c878fd6dd6f Mon Sep 17 00:00:00 2001 -From: Igor Raits <i.gnatenko.brain@gmail.com> -Date: Sun, 30 Aug 2020 18:17:26 +0200 -Subject: [PATCH] mcompile: use -v instead of --verbose for ninja - -The `--verbose` has been added to ninja in 1.9.0 and we pretend that we have compatibility with Ninja 1.7+. - -References: https://github.com/ninja-build/ninja/commit/bf7517505ad1def03e13bec2b4131399331bc5c4 ---- - mesonbuild/mcompile.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/mcompile.py b/mesonbuild/mcompile.py -index 9fe3a65f5..5352143d9 100644 ---- a/mesonbuild/mcompile.py -+++ b/mesonbuild/mcompile.py -@@ -156,7 +156,7 @@ def get_parsed_args_ninja(options: 'argparse.Namespace', builddir: Path) -> T.Li - cmd.extend(['-l', str(options.load_average)]) - - if options.verbose: -- cmd.append('--verbose') -+ cmd.append('-v') - - cmd += options.ninja_args - --- -2.28.0 - @@ -2,7 +2,7 @@ Name: meson -Version: 0.55.1 +Version: 0.56.2 Release: 1%{?dist} Summary: High productivity build system @@ -11,15 +11,16 @@ URL: https://mesonbuild.com/ Source: https://github.com/mesonbuild/meson/releases/download/%{version}/meson-%{version}.tar.gz # Non-upstreamable Patch0001: 0001-macros-Do-not-use-shrink.patch -# https://github.com/mesonbuild/meson/pull/7669 -Patch0002: 0001-mcompile-use-v-instead-of-verbose-for-ninja.patch BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: epel-rpm-macros +BuildRequires: zlib-static Requires: python%{python3_version}dist(setuptools) Requires: ninja-build +Requires: epel-rpm-macros %description Meson is a build system designed to optimize programmer @@ -52,6 +53,9 @@ install -Dpm0644 -t %{buildroot}%{rpmmacrodir} data/macros.%{name} %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy %changelog +* Mon Jan 2 2023 Remi Collet <remi@remirepo.net> - 0.56.2-1 +- Update to 0.56.2 + * Sun Aug 30 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.55.1-1 - Update to 0.55.1 |