Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 8A3101A9239 for ; Sun, 7 Nov 2021 13:23:08 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id BF99D84D6B; Sun, 7 Nov 2021 13:23:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 06C7284D5F for ; Sun, 7 Nov 2021 13:23:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id hT0nipGLErMP for ; Sun, 7 Nov 2021 13:23:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 0123A84D46 for ; Sun, 7 Nov 2021 13:23:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EF32DFAEC; Sun, 7 Nov 2021 13:23:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1636291385170880" MIME-Version: 1.0 Date: Sun, 7 Nov 2021 13:23:05 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/devel/meson To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20211107132305.EF32DFAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1636291385170880 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Sun Nov 7 13:23:05 UTC 2021 Modified Files: pkgsrc/devel/meson: Makefile PLIST distinfo pkgsrc/devel/meson/patches: patch-mesonbuild_modules_pkgconfig.py Log Message: meson: updated to 0.60.1 0.60.0: run_target can now be used as a dependency The Python Modules dependency method no longer accepts positional arguments Override python installation paths New subprojects packagefiles subcommand Deprecated project options More efficient static linking of uninstalled libraries gnome.yelp variadic argument deprecation static keyword argument to meson.override_dependency() dependency() sets default_library on fallback subproject install_emptydir function Cython can now transpile to C++ as an intermediate language New custom dependency for iconv Unknown options are now always fatal Install DESTDIR relative to build directory Java Module Link tests can use sources for a different compiler Relax restrictions of str.join() Improvements for the Rustc compiler The qt modules now accept generated outputs as inputs for qt.compile_* Waf support in external-project module Comparing two objects with different types is now an error Installation tags Compiler.unittest_args has been removed Dependencies with multiple names i18n module now returns gettext targets Added support for CLA sources when cross-compiling with the C2000 toolchain Support for clippy-driver as a rustc wrapper Force Visual Studio environment activation MSVC compiler now assumes UTF-8 source code by default Add support for find_library in Emscripten Optional custom_target() name To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/meson/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/meson/PLIST cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/meson/distinfo cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1636291385170880 Content-Disposition: inline Content-Length: 8205 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/meson/Makefile diff -u pkgsrc/devel/meson/Makefile:1.30 pkgsrc/devel/meson/Makefile:1.31 --- pkgsrc/devel/meson/Makefile:1.30 Sun Oct 24 16:20:01 2021 +++ pkgsrc/devel/meson/Makefile Sun Nov 7 13:23:05 2021 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.30 2021/10/24 16:20:01 adam Exp $ +# $NetBSD: Makefile,v 1.31 2021/11/07 13:23:05 adam Exp $ -DISTNAME= meson-0.59.3 +DISTNAME= meson-0.60.1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=m/meson/} Index: pkgsrc/devel/meson/PLIST diff -u pkgsrc/devel/meson/PLIST:1.11 pkgsrc/devel/meson/PLIST:1.12 --- pkgsrc/devel/meson/PLIST:1.11 Mon Sep 27 18:50:06 2021 +++ pkgsrc/devel/meson/PLIST Sun Nov 7 13:23:05 2021 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2021/09/27 18:50:06 adam Exp $ +@comment $NetBSD: PLIST,v 1.12 2021/11/07 13:23:05 adam Exp $ bin/meson ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt @@ -285,6 +285,30 @@ ${PYSITELIB}/mesonbuild/interpreter/kwar ${PYSITELIB}/mesonbuild/interpreter/mesonmain.py ${PYSITELIB}/mesonbuild/interpreter/mesonmain.pyc ${PYSITELIB}/mesonbuild/interpreter/mesonmain.pyo +${PYSITELIB}/mesonbuild/interpreter/primitives/__init__.py +${PYSITELIB}/mesonbuild/interpreter/primitives/__init__.pyc +${PYSITELIB}/mesonbuild/interpreter/primitives/__init__.pyo +${PYSITELIB}/mesonbuild/interpreter/primitives/array.py +${PYSITELIB}/mesonbuild/interpreter/primitives/array.pyc +${PYSITELIB}/mesonbuild/interpreter/primitives/array.pyo +${PYSITELIB}/mesonbuild/interpreter/primitives/boolean.py +${PYSITELIB}/mesonbuild/interpreter/primitives/boolean.pyc +${PYSITELIB}/mesonbuild/interpreter/primitives/boolean.pyo +${PYSITELIB}/mesonbuild/interpreter/primitives/dict.py +${PYSITELIB}/mesonbuild/interpreter/primitives/dict.pyc +${PYSITELIB}/mesonbuild/interpreter/primitives/dict.pyo +${PYSITELIB}/mesonbuild/interpreter/primitives/integer.py +${PYSITELIB}/mesonbuild/interpreter/primitives/integer.pyc +${PYSITELIB}/mesonbuild/interpreter/primitives/integer.pyo +${PYSITELIB}/mesonbuild/interpreter/primitives/range.py +${PYSITELIB}/mesonbuild/interpreter/primitives/range.pyc +${PYSITELIB}/mesonbuild/interpreter/primitives/range.pyo +${PYSITELIB}/mesonbuild/interpreter/primitives/string.py +${PYSITELIB}/mesonbuild/interpreter/primitives/string.pyc +${PYSITELIB}/mesonbuild/interpreter/primitives/string.pyo +${PYSITELIB}/mesonbuild/interpreter/type_checking.py +${PYSITELIB}/mesonbuild/interpreter/type_checking.pyc +${PYSITELIB}/mesonbuild/interpreter/type_checking.pyo ${PYSITELIB}/mesonbuild/interpreterbase/__init__.py ${PYSITELIB}/mesonbuild/interpreterbase/__init__.pyc ${PYSITELIB}/mesonbuild/interpreterbase/__init__.pyo @@ -309,6 +333,9 @@ ${PYSITELIB}/mesonbuild/interpreterbase/ ${PYSITELIB}/mesonbuild/interpreterbase/interpreterbase.py ${PYSITELIB}/mesonbuild/interpreterbase/interpreterbase.pyc ${PYSITELIB}/mesonbuild/interpreterbase/interpreterbase.pyo +${PYSITELIB}/mesonbuild/interpreterbase/operator.py +${PYSITELIB}/mesonbuild/interpreterbase/operator.pyc +${PYSITELIB}/mesonbuild/interpreterbase/operator.pyo ${PYSITELIB}/mesonbuild/linkers/__init__.py ${PYSITELIB}/mesonbuild/linkers/__init__.pyc ${PYSITELIB}/mesonbuild/linkers/__init__.pyo @@ -345,6 +372,9 @@ ${PYSITELIB}/mesonbuild/mesonlib/posix.p ${PYSITELIB}/mesonbuild/mesonlib/universal.py ${PYSITELIB}/mesonbuild/mesonlib/universal.pyc ${PYSITELIB}/mesonbuild/mesonlib/universal.pyo +${PYSITELIB}/mesonbuild/mesonlib/vsenv.py +${PYSITELIB}/mesonbuild/mesonlib/vsenv.pyc +${PYSITELIB}/mesonbuild/mesonlib/vsenv.pyo ${PYSITELIB}/mesonbuild/mesonlib/win32.py ${PYSITELIB}/mesonbuild/mesonlib/win32.pyc ${PYSITELIB}/mesonbuild/mesonlib/win32.pyo @@ -384,6 +414,9 @@ ${PYSITELIB}/mesonbuild/modules/hotdoc.p ${PYSITELIB}/mesonbuild/modules/i18n.py ${PYSITELIB}/mesonbuild/modules/i18n.pyc ${PYSITELIB}/mesonbuild/modules/i18n.pyo +${PYSITELIB}/mesonbuild/modules/java.py +${PYSITELIB}/mesonbuild/modules/java.pyc +${PYSITELIB}/mesonbuild/modules/java.pyo ${PYSITELIB}/mesonbuild/modules/keyval.py ${PYSITELIB}/mesonbuild/modules/keyval.pyc ${PYSITELIB}/mesonbuild/modules/keyval.pyo @@ -474,6 +507,7 @@ ${PYSITELIB}/mesonbuild/scripts/cleantre ${PYSITELIB}/mesonbuild/scripts/cmake_run_ctgt.py ${PYSITELIB}/mesonbuild/scripts/cmake_run_ctgt.pyc ${PYSITELIB}/mesonbuild/scripts/cmake_run_ctgt.pyo +${PYSITELIB}/mesonbuild/scripts/cmd_or_ps.ps1 ${PYSITELIB}/mesonbuild/scripts/coverage.py ${PYSITELIB}/mesonbuild/scripts/coverage.pyc ${PYSITELIB}/mesonbuild/scripts/coverage.pyo Index: pkgsrc/devel/meson/distinfo diff -u pkgsrc/devel/meson/distinfo:1.29 pkgsrc/devel/meson/distinfo:1.30 --- pkgsrc/devel/meson/distinfo:1.29 Tue Oct 26 10:15:40 2021 +++ pkgsrc/devel/meson/distinfo Sun Nov 7 13:23:05 2021 @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.29 2021/10/26 10:15:40 nia Exp $ +$NetBSD: distinfo,v 1.30 2021/11/07 13:23:05 adam Exp $ -BLAKE2s (meson-0.59.3.tar.gz) = d070d78323171e8c448065c2dcb3070713069b4e8a0913456345be5f1f9fc603 -SHA512 (meson-0.59.3.tar.gz) = 4ffca094474c09567a69f576b25588c38e18d3a96d0b1d592adb05493a5d6dcfcd1a6549a821862a5aabd3df34d81b3a90d01e012e62c7f46bd98152337c0ea6 -Size (meson-0.59.3.tar.gz) = 1953620 bytes +BLAKE2s (meson-0.60.1.tar.gz) = ac85879cd830076a1b837b7423f61edfb699d36d2bc32b3423069ac5e61d5474 +SHA512 (meson-0.60.1.tar.gz) = ffaa99622b0c2ec74edda7dcdebf981cd3acbc62f36bde37241cafa2ce27e520f6901eebaef978a1f8b2e1d40d540e7085d0e0723d385064988baacb5b79f31c +Size (meson-0.60.1.tar.gz) = 1995258 bytes SHA1 (patch-mesonbuild_compilers_detect.py) = 6379aaae55a7175291133335f15307b53aee4384 SHA1 (patch-mesonbuild_compilers_mixins_gnu.py) = cc9fe3204c7cf003d288ef5635fa7853a44a2e34 SHA1 (patch-mesonbuild_dependencies_dev.py) = 44a3bdb96a1afad1f1a9110b6187c9daad0d449f -SHA1 (patch-mesonbuild_modules_pkgconfig.py) = fc14da26f81d8aa8dd7b2ec0d034124458e6ba88 +SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 8962056c6966cb38e98661226128b4c9c65ecea7 SHA1 (patch-mesonbuild_scripts_depfixer.py) = b8673de86f49f7a9876afcd05536766e0555d217 Index: pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.3 pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.4 --- pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.3 Mon Sep 27 18:50:06 2021 +++ pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py Sun Nov 7 13:23:05 2021 @@ -1,19 +1,22 @@ -$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.3 2021/09/27 18:50:06 adam Exp $ +$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.4 2021/11/07 13:23:05 adam Exp $ Revert https://github.com/mesonbuild/meson/commit/aba8792 that introduced a condition to match FreeBSD path norm for pkg-config files. ---- mesonbuild/modules/pkgconfig.py.orig 2021-08-18 11:22:33.000000000 +0000 +--- mesonbuild/modules/pkgconfig.py.orig 2021-11-02 20:00:40.000000000 +0000 +++ mesonbuild/modules/pkgconfig.py -@@ -549,10 +549,7 @@ class PkgConfigModule(ExtensionModule): +@@ -545,12 +545,8 @@ class PkgConfigModule(ExtensionModule): pcfile = filebase + '.pc' - pkgroot = kwargs.get('install_dir', default_install_dir) + pkgroot = pkgroot_name = kwargs.get('install_dir', default_install_dir) if pkgroot is None: - if mesonlib.is_freebsd(): - pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('prefix')), 'libdata', 'pkgconfig') +- pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig') - else: - pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 'pkgconfig') +- pkgroot_name = os.path.join('{libdir}', 'pkgconfig') + pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 'pkgconfig') ++ pkgroot_name = os.path.join('{libdir}', 'pkgconfig') if not isinstance(pkgroot, str): raise mesonlib.MesonException('Install_dir must be a string.') self._generate_pkgconfig_file(state, deps, subdirs, name, description, url, --_----------=_1636291385170880--