commit 10a9724668e2d346ee4e05c5f194a1f372ac4967 Author: Jan Palus <at...@pld-linux.org> Date: Wed Mar 13 23:28:20 2019 +0100
up to 0.50.0 meson-gtkdoc-quote.patch | 43 ------------------------------------------- meson.spec | 8 +++----- 2 files changed, 3 insertions(+), 48 deletions(-) --- diff --git a/meson.spec b/meson.spec index 3d04328..b353255 100644 --- a/meson.spec +++ b/meson.spec @@ -1,15 +1,14 @@ Summary: High productivity build system Summary(pl.UTF-8): System budowania o dużej produktywności Name: meson -Version: 0.48.0 -Release: 2 +Version: 0.50.0 +Release: 1 License: Apache v2.0 Group: Development/Tools #Source0Download: https://github.com/mesonbuild/meson/releases/ Source0: https://github.com/mesonbuild/meson/releases/download/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: e92273538c6b8371e68d736287a5d991 +# Source0-md5: 433483107fda4616eaf33de7e7083a84 Patch0: %{name}-gtkdocdir.patch -Patch1: %{name}-gtkdoc-quote.patch URL: http://mesonbuild.com/ BuildRequires: ninja >= 1.5 BuildRequires: python3 >= 1:3.5 @@ -53,7 +52,6 @@ Mesona. %prep %setup -q %patch0 -p1 -%patch1 -p1 %{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \ meson.py diff --git a/meson-gtkdoc-quote.patch b/meson-gtkdoc-quote.patch deleted file mode 100644 index 7228943..0000000 --- a/meson-gtkdoc-quote.patch +++ /dev/null @@ -1,43 +0,0 @@ -From bb9f60624b27041805ca87a48f9a4196afb84ccc Mon Sep 17 00:00:00 2001 -From: Ting-Wei Lan <la...@src.gnome.org> -Date: Mon, 8 Oct 2018 23:44:33 +0800 -Subject: [PATCH] gnome: Quote arguments passed to gtkdoc-scangobj - -It is possible for compiler flags to include special characters, such as -double quotes which are needed to define macros with -D options. Since -gtkdoc-scangobj uses shlex.split to split arguments passed to --cc, ---ld, --cflags, --ldflags into lists, we can safely use shlex.quote to -properly quote arguments for these options. ---- - mesonbuild/modules/gnome.py | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index 1c2f034d6d..0d1c22f325 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -17,6 +17,7 @@ - - import os - import copy -+import shlex - import subprocess - - from .. import build -@@ -1034,12 +1035,12 @@ def _get_build_args(self, kwargs, state, depends): - ldflags.update(compiler_flags[1]) - ldflags.update(compiler_flags[2]) - if compiler: -- args += ['--cc=%s' % ' '.join(compiler.get_exelist())] -- args += ['--ld=%s' % ' '.join(compiler.get_linker_exelist())] -+ args += ['--cc=%s' % ' '.join([shlex.quote(x) for x in compiler.get_exelist()])] -+ args += ['--ld=%s' % ' '.join([shlex.quote(x) for x in compiler.get_linker_exelist()])] - if cflags: -- args += ['--cflags=%s' % ' '.join(cflags)] -+ args += ['--cflags=%s' % ' '.join([shlex.quote(x) for x in cflags])] - if ldflags: -- args += ['--ldflags=%s' % ' '.join(ldflags)] -+ args += ['--ldflags=%s' % ' '.join([shlex.quote(x) for x in ldflags])] - - return args - ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/meson.git/commitdiff/10a9724668e2d346ee4e05c5f194a1f372ac4967 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit