From 4caa6a0de4120b8d41431994340d50b2430e8623 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 20 Nov 2023 16:00:05 -0500 Subject: [PATCH 1/2] meson: update to 1.3.0. --- srcpkgs/meson/patches/fix-tests.diff | 140 --------------------------- srcpkgs/meson/template | 6 +- 2 files changed, 3 insertions(+), 143 deletions(-) delete mode 100644 srcpkgs/meson/patches/fix-tests.diff diff --git a/srcpkgs/meson/patches/fix-tests.diff b/srcpkgs/meson/patches/fix-tests.diff deleted file mode 100644 index 95e92c108d181..0000000000000 --- a/srcpkgs/meson/patches/fix-tests.diff +++ /dev/null @@ -1,140 +0,0 @@ -Taken from https://github.com/mesonbuild/meson/pull/12060, with minor -modifications. - -diff --git a/cross/armclang-linux.txt b/cross/armclang-linux.txt -index 863b355c345..36927b882b5 100644 ---- a/cross/armclang-linux.txt -+++ b/cross/armclang-linux.txt -@@ -22,7 +22,7 @@ c = ['/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armclang', '--tar - #cpp = '/usr/bin/arm-linux-gnueabihf-g++' - ar = '/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armar' - #strip = '/usr/arm-linux-gnueabihf/bin/strip' --#pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config' -+#pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config' - - [host_machine] - system = 'baremetal' -diff --git a/cross/linux-mingw-w64-32bit.txt b/cross/linux-mingw-w64-32bit.txt -index caf1da1a045..91ad9c5029a 100644 ---- a/cross/linux-mingw-w64-32bit.txt -+++ b/cross/linux-mingw-w64-32bit.txt -@@ -4,7 +4,7 @@ cpp = '/usr/bin/i686-w64-mingw32-g++' - objc = '/usr/bin/i686-w64-mingw32-gcc' - ar = '/usr/bin/i686-w64-mingw32-ar' - strip = '/usr/bin/i686-w64-mingw32-strip' --pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config' -+pkg-config = '/usr/bin/i686-w64-mingw32-pkg-config' - windres = '/usr/bin/i686-w64-mingw32-windres' - exe_wrapper = 'wine' - ld = '/usr/bin/i686-w64-mingw32-ld' -diff --git a/cross/linux-mingw-w64-64bit.txt b/cross/linux-mingw-w64-64bit.txt -index 7403803b4c0..08fa7041043 100644 ---- a/cross/linux-mingw-w64-64bit.txt -+++ b/cross/linux-mingw-w64-64bit.txt -@@ -4,7 +4,7 @@ cpp = '/usr/bin/x86_64-w64-mingw32-g++' - objc = '/usr/bin/x86_64-w64-mingw32-gcc' - ar = '/usr/bin/x86_64-w64-mingw32-ar' - strip = '/usr/bin/x86_64-w64-mingw32-strip' --pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config' -+pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config' - windres = '/usr/bin/x86_64-w64-mingw32-windres' - exe_wrapper = 'wine' - cmake = '/usr/bin/cmake' -diff --git a/cross/none.txt b/cross/none.txt -index 1fbe4713ac0..9eadf974c32 100644 ---- a/cross/none.txt -+++ b/cross/none.txt -@@ -15,5 +15,5 @@ fc = ['false'] - objc = ['false'] - objcpp = ['false'] - ar = ['false'] --pkgconfig = ['false'] -+pkg-config = ['false'] - cmake = ['false'] -diff --git a/cross/ubuntu-armhf.txt b/cross/ubuntu-armhf.txt -index 408c2ceaecb..6409e396b57 100644 ---- a/cross/ubuntu-armhf.txt -+++ b/cross/ubuntu-armhf.txt -@@ -6,7 +6,7 @@ cpp = ['/usr/bin/arm-linux-gnueabihf-g++'] - rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7'] - ar = '/usr/arm-linux-gnueabihf/bin/ar' - strip = '/usr/arm-linux-gnueabihf/bin/strip' --pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config' -+pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config' - ld = '/usr/bin/arm-linux/gnueabihf-ld' - - [built-in options] -diff --git a/mesonbuild/scripts/env2mfile.py b/mesonbuild/scripts/env2mfile.py -index 27a7dd96984..df93730424d 100755 ---- a/mesonbuild/scripts/env2mfile.py -+++ b/mesonbuild/scripts/env2mfile.py -@@ -213,7 +213,7 @@ def detect_cross_debianlike(options: T.Any) -> MachineInfo: - except ValueError: - pass - try: -- infos.binaries['pkgconfig'] = locate_path("%s-pkg-config" % host_arch) -+ infos.binaries['pkg-config'] = locate_path("%s-pkg-config" % host_arch) - except ValueError: - pass # pkg-config is optional - try: -diff --git a/test cases/common/44 pkgconfig-gen/meson.build b/test cases/common/44 pkgconfig-gen/meson.build -index adf3e2765e8..fd6371ef4b9 100644 ---- a/test cases/common/44 pkgconfig-gen/meson.build -+++ b/test cases/common/44 pkgconfig-gen/meson.build -@@ -8,7 +8,7 @@ if not cc.find_library('z', required: false).found() - endif - - # First check we have pkg-config >= 0.29 --pkgconfig = find_program('pkg-config', required: false) -+pkgconfig = find_program('pkg-config', native: true, required: false) - if not pkgconfig.found() - error('MESON_SKIP_TEST: pkg-config not found') - endif -diff --git a/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt b/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt -index a00a7d1366c..d687b29817a 100644 ---- a/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt -+++ b/test cases/unit/33 cross file overrides always args/ubuntu-armhf-overrides.txt -@@ -6,7 +6,7 @@ cpp = '/usr/bin/arm-linux-gnueabihf-g++' - rust = ['rustc', '--target', 'arm-unknown-linux-gnueabihf', '-C', 'linker=/usr/bin/arm-linux-gnueabihf-gcc-7'] - ar = '/usr/arm-linux-gnueabihf/bin/ar' - strip = '/usr/arm-linux-gnueabihf/bin/strip' --pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config' -+pkg-config = '/usr/bin/arm-linux-gnueabihf-pkg-config' - - [properties] - root = '/usr/arm-linux-gnueabihf' -diff --git a/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt b/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt -index a5a39318d2c..3615f92f763 100644 ---- a/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt -+++ b/test cases/unit/36 exe_wrapper behaviour/broken-cross.txt -@@ -3,7 +3,7 @@ c = '/usr/bin/x86_64-w64-mingw32-gcc' - cpp = '/usr/bin/x86_64-w64-mingw32-g++' - ar = '/usr/bin/x86_64-w64-mingw32-ar' - strip = '/usr/bin/x86_64-w64-mingw32-strip' --pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config' -+pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config' - windres = '/usr/bin/x86_64-w64-mingw32-windres' - exe_wrapper = 'broken' - -diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py -index 12eafd59598..4327d99fcd0 100644 ---- a/unittests/allplatformstests.py -+++ b/unittests/allplatformstests.py -@@ -2722,7 +2722,7 @@ def test_native_dep_pkgconfig(self): - with tempfile.NamedTemporaryFile(mode='w', delete=False, encoding='utf-8') as crossfile: - crossfile.write(textwrap.dedent( - '''[binaries] -- pkgconfig = '{}' -+ pkg-config = '{}' - - [properties] - -@@ -2749,7 +2749,7 @@ def test_pkg_config_libdir(self): - with tempfile.NamedTemporaryFile(mode='w', delete=False, encoding='utf-8') as crossfile: - crossfile.write(textwrap.dedent( - '''[binaries] -- pkgconfig = 'pkg-config' -+ pkg-config = 'pkg-config' - - [properties] - pkg_config_libdir = ['{}'] diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index 527cb6f710e54..78ff9b7c038da 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,7 +1,7 @@ # Template file for 'meson' pkgname=meson -version=1.2.0 -revision=2 +version=1.3.0 +revision=1 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" depends="ninja python3-setuptools" @@ -14,7 +14,7 @@ license="Apache-2.0" homepage="https://mesonbuild.com" changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.*}.0.md" distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz" -checksum=1c0b634fe6b6a7072e398647f1bf392048577068a5c92ae44d04085dab0ded6f +checksum=4ba253ef60e454e23234696119cbafa082a0aead0bd3bbf6991295054795f5dc # XXX: sanitizers aren't available on musl if [ "$XBPS_TARGET_LIBC" = glibc ]; then From 35831f8c0f590ce6e9b4bbe87b4522160ada00aa Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 20 Nov 2023 16:06:28 -0500 Subject: [PATCH 2/2] python3-meson-python: update to 0.15.0. --- srcpkgs/python3-meson-python/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-meson-python/template b/srcpkgs/python3-meson-python/template index 68ea2e1cb6bd2..4fd997e28aac6 100644 --- a/srcpkgs/python3-meson-python/template +++ b/srcpkgs/python3-meson-python/template @@ -1,9 +1,9 @@ # Template file for 'python3-meson-python' pkgname=python3-meson-python -version=0.14.0 -revision=2 +version=0.15.0 +revision=1 build_style=python3-pep517 -hostmakedepends="meson python3-pyproject-metadata" +hostmakedepends="meson python3-pyproject-metadata patchelf" depends="meson python3-pyproject-metadata patchelf" short_desc="Meson PEP 517 Python build backend" maintainer="Andrew J. Hesford " @@ -11,7 +11,7 @@ license="MIT" homepage="https://meson-python.readthedocs.io/" changelog="https://raw.githubusercontent.com/mesonbuild/meson-python/main/CHANGELOG.rst" distfiles="${PYPI_SITE}/m/meson_python/meson_python-${version}.tar.gz" -checksum=b96866690326544dfe452583753ac3f43313227e9fd9416701a8df90af212234 +checksum=fddb73eecd49e89c1c41c87937cd89c2d0b65a1c63ba28238681d4bd9484d26f # tests require custom-built executables, need reconciliation with xbps-src env make_check=no