From 1768e87eb0a262d770b4b17062dfb13c6422e5fb Mon Sep 17 00:00:00 2001 From: jbeich Date: Mon, 2 Sep 2019 19:55:34 +0000 Subject: [PATCH] devel/meson: Update to 0.52.0 Changes: https://mesonbuild.com/Release-notes-for-0-52-0.html Changes: https://github.com/mesonbuild/meson/compare/0.51.2...0.52.0 PR: 241105 Exp-run by: antoine --- devel/meson/Makefile | 8 +++----- devel/meson/distinfo | 8 +++----- .../files/patch-mesonbuild_dependencies_base.py | 12 ++++++------ 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/devel/meson/Makefile b/devel/meson/Makefile index 724021640e70..45d972338123 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -2,13 +2,10 @@ # $FreeBSD$ PORTNAME= meson -PORTVERSION= 0.51.2 +PORTVERSION= 0.52.0 CATEGORIES= devel python MASTER_SITES= https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/ -PATCH_SITES= https://github.com/mesonbuild/${PORTNAME}/commit/ -PATCHFILES+= efea48788ab2.patch:-p1 - MAINTAINER= gnome@FreeBSD.org COMMENT= High performance build system @@ -17,8 +14,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ninja:devel/ninja -USES= python:3.5+ +USES= python:3.5+ shebangfix USE_PYTHON= autoplist distutils noflavors +SHEBANG_FILES= mesonbuild/cmake/data/run_ctgt.py NO_ARCH= yes .include diff --git a/devel/meson/distinfo b/devel/meson/distinfo index 64d7f4fd9bf8..919215ebd9c9 100644 --- a/devel/meson/distinfo +++ b/devel/meson/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1566836953 -SHA256 (meson-0.51.2.tar.gz) = 23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76 -SIZE (meson-0.51.2.tar.gz) = 1453251 -SHA256 (efea48788ab2.patch) = eee556fb0cd6cbba5756bbfb508412081743cd813dd10d1b9cbc419769281d39 -SIZE (efea48788ab2.patch) = 953 +TIMESTAMP = 1570381541 +SHA256 (meson-0.52.0.tar.gz) = d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32 +SIZE (meson-0.52.0.tar.gz) = 1507110 diff --git a/devel/meson/files/patch-mesonbuild_dependencies_base.py b/devel/meson/files/patch-mesonbuild_dependencies_base.py index a19109739db6..f9d49c93497c 100644 --- a/devel/meson/files/patch-mesonbuild_dependencies_base.py +++ b/devel/meson/files/patch-mesonbuild_dependencies_base.py @@ -52,11 +52,11 @@ users, without depending on the unreliable part of pkg-config output. Fixes https://github.com/mesonbuild/meson/issues/4271. ---- mesonbuild/dependencies/base.py.orig +--- mesonbuild/dependencies/base.py.orig 2019-10-06 17:01:35 UTC +++ mesonbuild/dependencies/base.py -@@ -706,6 +706,21 @@ def _set_cargs(self): +@@ -747,6 +747,21 @@ class PkgConfigDependency(ExternalDependency): (self.name, out)) - self.compile_args = self._convert_mingw_paths(shlex.split(out)) + self.compile_args = self._convert_mingw_paths(self._split_args(out)) + def _sort_libpaths(self, libpaths, refpaths): + if len(refpaths) == 0: @@ -73,10 +73,10 @@ Fixes https://github.com/mesonbuild/meson/issues/4271. + return (max_index, reversed_max_length) + return sorted(libpaths, key=key_func) + - def _search_libs(self, out, out_raw): + def _search_libs(self, out, out_raw, out_all): ''' @out: PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 pkg-config --libs -@@ -741,6 +756,22 @@ def _search_libs(self, out, out_raw): +@@ -784,6 +799,22 @@ class PkgConfigDependency(ExternalDependency): # Resolve the path as a compiler in the build directory would path = os.path.join(self.env.get_build_dir(), path) prefix_libpaths.add(path) @@ -97,5 +97,5 @@ Fixes https://github.com/mesonbuild/meson/issues/4271. + pkg_config_path = self._convert_mingw_paths(pkg_config_path) + prefix_libpaths = self._sort_libpaths(prefix_libpaths, pkg_config_path) system_libpaths = OrderedSet() - full_args = self._convert_mingw_paths(shlex.split(out)) + full_args = self._convert_mingw_paths(self._split_args(out)) for arg in full_args: