From 843dc14e6be080596d3b13620004e662a56987ca Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Fri, 24 May 2024 09:09:17 +0000 Subject: [PATCH] Update repo --- scripts/build/setup/meson-python.patch | 21 +++++++++++---------- scripts/build/setup/termux_setup_meson.sh | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/scripts/build/setup/meson-python.patch b/scripts/build/setup/meson-python.patch index 26a06df08d..517a9cf4cc 100644 --- a/scripts/build/setup/meson-python.patch +++ b/scripts/build/setup/meson-python.patch @@ -1,11 +1,12 @@ ---- a/mesonbuild/scripts/python_info.py -+++ b/mesonbuild/scripts/python_info.py -@@ -39,7 +39,7 @@ - # See https://github.com/mesonbuild/meson/issues/8739. - # XXX: We should be using sysconfig, but Debian only patches distutils. +diff -u -r ../tt/meson-1.3.2/mesonbuild/scripts/python_info.py ./mesonbuild/scripts/python_info.py +--- ../tt/meson-1.3.2/mesonbuild/scripts/python_info.py 2023-10-26 16:04:24.000000000 +0000 ++++ ./mesonbuild/scripts/python_info.py 2024-05-24 06:23:34.550181626 +0000 +@@ -47,7 +47,7 @@ + scheme = sysconfig._get_default_scheme() --if 'deb_system' in distutils.command.install.INSTALL_SCHEMES: -+if False: - paths = get_distutils_paths(scheme='deb_system') - install_paths = get_distutils_paths(scheme='deb_system', prefix='') - else: + if sys.version_info >= (3, 10, 3): +- if 'deb_system' in sysconfig.get_scheme_names(): ++ if False: + scheme = 'deb_system' + else: + import distutils.command.install diff --git a/scripts/build/setup/termux_setup_meson.sh b/scripts/build/setup/termux_setup_meson.sh index 18f298ca0e..6124f2adf1 100644 --- a/scripts/build/setup/termux_setup_meson.sh +++ b/scripts/build/setup/termux_setup_meson.sh @@ -1,6 +1,6 @@ termux_setup_meson() { termux_setup_ninja - local MESON_VERSION=1.2.2 + local MESON_VERSION=1.4.0 local MESON_FOLDER if [ "${TERMUX_PACKAGES_OFFLINE-false}" = "true" ]; then @@ -16,7 +16,7 @@ termux_setup_meson() { termux_download \ "https://github.com/mesonbuild/meson/releases/download/$MESON_VERSION/meson-$MESON_VERSION.tar.gz" \ "$MESON_TAR_FILE" \ - 4a0f04de331fbc7af3b802a844fc8838f4ccd1ded1e792ba4f8f2faf8c5fe4d6 + 8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d tar xf "$MESON_TAR_FILE" -C "$TERMUX_PKG_TMPDIR" shopt -s nullglob local f