[packages/meson] - added gtkdoc-quote patch; release 2

qboosh qboosh at pld-linux.org
Tue Oct 9 20:52:46 CEST 2018


commit 0b40eaaec4e9f86fb28c679f47a6c2a1eb7df24c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Oct 9 20:56:14 2018 +0200

    - added gtkdoc-quote patch; release 2

 meson-gtkdoc-quote.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
 meson.spec               |  4 +++-
 2 files changed, 46 insertions(+), 1 deletion(-)
---
diff --git a/meson.spec b/meson.spec
index 36478f6..ea0e299 100644
--- a/meson.spec
+++ b/meson.spec
@@ -2,13 +2,14 @@ Summary:	High productivity build system
 Summary(pl.UTF-8):	System budowania o dużej produktywności
 Name:		meson
 Version:	0.48.0
-Release:	1
+Release:	2
 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
 Patch0:		%{name}-gtkdocdir.patch
+Patch1:		%{name}-gtkdoc-quote.patch
 URL:		http://mesonbuild.com/
 BuildRequires:	ninja >= 1.5
 BuildRequires:	python3 >= 1:3.5
@@ -51,6 +52,7 @@ 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
new file mode 100644
index 0000000..7228943
--- /dev/null
+++ b/meson-gtkdoc-quote.patch
@@ -0,0 +1,43 @@
+From bb9f60624b27041805ca87a48f9a4196afb84ccc Mon Sep 17 00:00:00 2001
+From: Ting-Wei Lan <lantw at 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/0b40eaaec4e9f86fb28c679f47a6c2a1eb7df24c



More information about the pld-cvs-commit mailing list