Index: head/devel/meson/Makefile =================================================================== --- head/devel/meson/Makefile (revision 484478) +++ head/devel/meson/Makefile (revision 484479) @@ -1,21 +1,21 @@ # Created by: Ting-Wei Lan # $FreeBSD$ PORTNAME= meson -PORTVERSION= 0.48.0 +PORTVERSION= 0.48.1 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 484478) +++ head/devel/meson/distinfo (revision 484479) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538669945 -SHA256 (meson-0.48.0.tar.gz) = 982937ba5b380abe13f3a0c4dff944dd19d08b72870e3b039f5037c91f82835f -SIZE (meson-0.48.0.tar.gz) = 1307245 +TIMESTAMP = 1540496521 +SHA256 (meson-0.48.1.tar.gz) = 425d12edbb81498314926afa93a3eb2fca4ca6929cbe0f8abeb6ab45d1d9fa8f +SIZE (meson-0.48.1.tar.gz) = 1310184 Index: head/devel/meson/files/patch-mesonbuild_modules_i18n.py =================================================================== --- head/devel/meson/files/patch-mesonbuild_modules_i18n.py (revision 484478) +++ head/devel/meson/files/patch-mesonbuild_modules_i18n.py (nonexistent) @@ -1,39 +0,0 @@ -https://github.com/mesonbuild/meson/issues/4304 - -From 2ff69b20df0864182fdf2b146d29dc67d0cb9a5b Mon Sep 17 00:00:00 2001 -From: Jussi Pakkanen -Date: Mon, 1 Oct 2018 20:31:48 +0300 -Subject: [PATCH] Fix handling generated .desktop files. Closes #4304. - ---- mesonbuild/modules/i18n.py.orig 2018-09-22 13:22:03 UTC -+++ mesonbuild/modules/i18n.py -@@ -82,17 +82,19 @@ class I18nModule(ExtensionModule): - kwargs['command'] = command - - inputfile = kwargs['input'] -- if isinstance(inputfile, str): -- inputfile = mesonlib.File.from_source_file(state.environment.source_dir, -+ if hasattr(inputfile, 'held_object'): -+ ct = build.CustomTarget(kwargs['output'] + '_merge', state.subdir, state.subproject, kwargs) -+ else: -+ if isinstance(inputfile, str): -+ inputfile = mesonlib.File.from_source_file(state.environment.source_dir, - state.subdir, inputfile) -- output = kwargs['output'] -- ifile_abs = inputfile.absolute_path(state.environment.source_dir, -- state.environment.build_dir) -- values = mesonlib.get_filenames_templates_dict([ifile_abs], None) -- outputs = mesonlib.substitute_values([output], values) -- output = outputs[0] -- -- ct = build.CustomTarget(output + '_' + state.subdir + '_merge', state.subdir, state.subproject, kwargs) -+ output = kwargs['output'] -+ ifile_abs = inputfile.absolute_path(state.environment.source_dir, -+ state.environment.build_dir) -+ values = mesonlib.get_filenames_templates_dict([ifile_abs], None) -+ outputs = mesonlib.substitute_values([output], values) -+ output = outputs[0] -+ ct = build.CustomTarget(output + '_' + state.subdir + '_merge', state.subdir, state.subproject, kwargs) - return ModuleReturnValue(ct, [ct]) - - @FeatureNewKwargs('i18n.gettext', '0.37.0', ['preset']) Property changes on: head/devel/meson/files/patch-mesonbuild_modules_i18n.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