diff --git a/devel/meson/Makefile b/devel/meson/Makefile index 8e0095635018..57995f9c2fec 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -1,35 +1,35 @@ # Created by: Ting-Wei Lan PORTNAME= meson -PORTVERSION= 0.59.2 +PORTVERSION= 0.60.1 CATEGORIES= devel python MASTER_SITES= https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/ MAINTAINER= desktop@FreeBSD.org COMMENT= High performance build system LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} USES= ninja:run python:3.6+ shebangfix USE_PYTHON= autoplist distutils noflavors SHEBANG_FILES= mesonbuild/rewriter.py \ mesonbuild/scripts/cmake_run_ctgt.py NO_ARCH= yes # https://github.com/mesonbuild/meson/issues/6016 TEST_ENV= ${MAKE_ENV:NCC=*:NCXX=*} # Hide from regular build to avoid accidental dependency on symlinks .if make(test) # helper_create_binary_wrapper, test_python_module, test cases/*.py BINARY_ALIAS+= python3=${PYTHON_CMD:T} python=${PYTHON_CMD:T} do-test: create-binary-alias # force if run late .endif do-test: @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${WRKSRC}/run_unittests.py) .include diff --git a/devel/meson/distinfo b/devel/meson/distinfo index aa9149397854..4ad11de5ebde 100644 --- a/devel/meson/distinfo +++ b/devel/meson/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633411186 -SHA256 (meson-0.59.2.tar.gz) = 13dee549a7ba758b7e33ce7719f28d1d337a98d10d378a4779ccc996f5a2fc49 -SIZE (meson-0.59.2.tar.gz) = 1952115 +TIMESTAMP = 1635886525 +SHA256 (meson-0.60.1.tar.gz) = 5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13 +SIZE (meson-0.60.1.tar.gz) = 1995258 diff --git a/devel/meson/files/patch-run__unittests.py b/devel/meson/files/patch-unittests_linuxliketests.py similarity index 75% rename from devel/meson/files/patch-run__unittests.py rename to devel/meson/files/patch-unittests_linuxliketests.py index d1866651dacb..0596fb79efa4 100644 --- a/devel/meson/files/patch-run__unittests.py +++ b/devel/meson/files/patch-unittests_linuxliketests.py @@ -1,13 +1,13 @@ https://github.com/mesonbuild/meson/pull/4324 ---- run_unittests.py.orig 2021-05-02 09:37:39 UTC -+++ run_unittests.py -@@ -7840,7 +7840,7 @@ class LinuxlikeTests(BasePlatformTests): +--- unittests/linuxliketests.py.orig 2021-10-11 16:26:46 UTC ++++ unittests/linuxliketests.py +@@ -1527,7 +1527,7 @@ class LinuxlikeTests(BasePlatformTests): # Test that installed libraries works self.new_builddir() self.prefix = oldprefix - meson_args = [f'-Dc_link_args=-L{libdir}', + meson_args = [f'-Dc_link_args=-L{libdir} -Wl,-rpath,{libdir}', '--fatal-meson-warnings'] testdir = os.path.join(self.unit_test_dir, '67 static link') env = {'PKG_CONFIG_LIBDIR': os.path.join(libdir, 'pkgconfig')} diff --git a/misc/shared-mime-info/files/patch-data_freedesktop__generate.sh b/misc/shared-mime-info/files/patch-data_freedesktop__generate.sh new file mode 100644 index 000000000000..87d0432ad90e --- /dev/null +++ b/misc/shared-mime-info/files/patch-data_freedesktop__generate.sh @@ -0,0 +1,10 @@ +https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/170 + +--- data/freedesktop_generate.sh.orig 2021-10-19 15:24:23 UTC ++++ data/freedesktop_generate.sh +@@ -9,4 +9,4 @@ itstool \ + --its "${src_root}/data/its/shared-mime-info.its" \ + --join "${src_root}/data/freedesktop.org.xml.in" \ + -o "${build_root}/data/freedesktop.org.xml" \ +- "${build_root}/po/"*".gmo" ++ "${build_root}/po/"*"/LC_MESSAGES/"*".mo"