Index: head/devel/meson/Makefile =================================================================== --- head/devel/meson/Makefile (revision 484632) +++ head/devel/meson/Makefile (revision 484633) @@ -1,21 +1,21 @@ # Created by: Ting-Wei Lan # $FreeBSD$ PORTNAME= meson -PORTVERSION= 0.48.1 +PORTVERSION= 0.48.2 CATEGORIES= devel python MASTER_SITES= https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/ MAINTAINER= gnome@FreeBSD.org COMMENT= High performance build system LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ninja:devel/ninja USES= python:3.5+ USE_PYTHON= autoplist distutils noflavors NO_ARCH= yes .include Index: head/devel/meson/distinfo =================================================================== --- head/devel/meson/distinfo (revision 484632) +++ head/devel/meson/distinfo (revision 484633) @@ -1,3 +1,3 @@ -TIMESTAMP = 1540496521 -SHA256 (meson-0.48.1.tar.gz) = 425d12edbb81498314926afa93a3eb2fca4ca6929cbe0f8abeb6ab45d1d9fa8f -SIZE (meson-0.48.1.tar.gz) = 1310184 +TIMESTAMP = 1541844428 +SHA256 (meson-0.48.2.tar.gz) = 39ead8bfd0dc9c7b0af15e23ea975c864600bf871fba279c9918625bb9a85506 +SIZE (meson-0.48.2.tar.gz) = 1310363 Index: head/devel/meson/files/patch-mesonbuild_modules_gnome.py =================================================================== --- head/devel/meson/files/patch-mesonbuild_modules_gnome.py (revision 484632) +++ head/devel/meson/files/patch-mesonbuild_modules_gnome.py (nonexistent) @@ -1,39 +0,0 @@ -https://github.com/mesonbuild/meson/pull/4348 - -From ca946665fe824c2010a96f659cff3ae21cecd910 Mon Sep 17 00:00:00 2001 -From: Ting-Wei Lan -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.orig 2018-09-22 13:22:03 UTC -+++ mesonbuild/modules/gnome.py -@@ -17,6 +17,7 @@ functionality such as gobject-introspect - - import os - import copy -+import shlex - import subprocess - - from .. import build -@@ -1014,12 +1015,12 @@ This will become a hard error in the fut - compiler = state.environment.coredata.compilers.get('c') - - 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 - Property changes on: head/devel/meson/files/patch-mesonbuild_modules_gnome.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property