diff --git a/packages/borgbackup/build.sh b/packages/borgbackup/build.sh index 2b1be154d2..724e3b725f 100644 --- a/packages/borgbackup/build.sh +++ b/packages/borgbackup/build.sh @@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="Deduplicating and compressing backup program" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000" TERMUX_PKG_VERSION="1.4.3" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/borgbackup/borg/releases/download/${TERMUX_PKG_VERSION}/borgbackup-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=79bbfa745d1901d685973584bd2d16a350686ddd176f6a2244490fb01996441f -TERMUX_PKG_DEPENDS="libacl, liblz4, openssl, python, xxhash, zstd" +TERMUX_PKG_DEPENDS="libacl, liblz4, openssl, python, python-pip, xxhash, zstd" TERMUX_PKG_PYTHON_COMMON_DEPS="build, Cython, pkgconfig, setuptools, setuptools-scm, wheel" TERMUX_PKG_PYTHON_TARGET_DEPS="'msgpack==1.0.8', packaging" TERMUX_PKG_AUTO_UPDATE=true @@ -17,13 +18,5 @@ termux_step_make() { termux_step_make_install() { local _pyver="${TERMUX_PYTHON_VERSION//./}" local _wheel="borgbackup-${TERMUX_PKG_VERSION}-cp${_pyver}-cp${_pyver}-linux_${TERMUX_ARCH}.whl" - pip install --no-deps --prefix="$TERMUX_PREFIX" "$TERMUX_PKG_SRCDIR/dist/${_wheel}" -} - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install $TERMUX_PKG_PYTHON_TARGET_DEPS - EOF + pip install --force-reinstall --no-deps --prefix="$TERMUX_PREFIX" "$TERMUX_PKG_SRCDIR/dist/${_wheel}" } diff --git a/packages/calcurse/build.sh b/packages/calcurse/build.sh index a847976074..e267baf3fb 100644 --- a/packages/calcurse/build.sh +++ b/packages/calcurse/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="calcurse is a calendar and scheduling application for th TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="4.8.2" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://calcurse.org/files/calcurse-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=849ba852c7f37b6772365cb0c42a94cde0fe75efba91363e96a0e7ef797ba565 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/calcurse/calcurse-caldav.subpackage.sh b/packages/calcurse/calcurse-caldav.subpackage.sh index 6872330e30..bea8a1c273 100644 --- a/packages/calcurse/calcurse-caldav.subpackage.sh +++ b/packages/calcurse/calcurse-caldav.subpackage.sh @@ -3,8 +3,4 @@ TERMUX_SUBPKG_DESCRIPTION="Sync calcurse with remote caldav calendar" TERMUX_SUBPKG_DEPENDS="python, python-pip" TERMUX_SUBPKG_REPLACES="calcurse (<< 4.7.1-1)" TERMUX_SUBPKG_BREAKS="calcurse (<< 4.7.1-1)" - -termux_step_create_subpkg_debscripts() { - echo "#!$TERMUX_PREFIX/bin/sh" > postinst - echo "pip3 install httplib2" >> postinst -} +TERMUX_SUBPKG_PYTHON_RUNTIME_DEPS="httplib2" diff --git a/packages/electrum/build.sh b/packages/electrum/build.sh index 4a00b7d602..ba8de7824f 100644 --- a/packages/electrum/build.sh +++ b/packages/electrum/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Electrum is a lightweight Bitcoin wallet" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="4.5.8" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://download.electrum.org/$TERMUX_PKG_VERSION/Electrum-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=dd8595a138132dee87cee76ce760a1d622fc2fd65d3b6ac7df7e53b7fb6ea7e8 # The python dependency list should be compared to @@ -19,11 +19,3 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_CONFLICTS="asciinema (<< 1.4.0-1)" TERMUX_PKG_PYTHON_COMMON_DEPS="wheel" TERMUX_PKG_SERVICE_SCRIPT=("electrum" 'exec electrum daemon 2>&1') - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / } - EOF -} diff --git a/packages/hash-slinger/build.sh b/packages/hash-slinger/build.sh index a8d816a6ba..9c654ed9e8 100644 --- a/packages/hash-slinger/build.sh +++ b/packages/hash-slinger/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Various tools to generate special DNS records" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="3.4" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/letoams/hash-slinger/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=46274aa2124c766c2c15c73576f895db7556bf03c7d3e9e4bb917858fae34ffc TERMUX_PKG_AUTO_UPDATE=true @@ -22,11 +23,3 @@ termux_step_make_install() { install -Dm600 -t $TERMUX_PREFIX/share/man/man1 ${f}.1 done } - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / } - EOF -} diff --git a/packages/lv2/build.sh b/packages/lv2/build.sh index d21e425adb..58948b389b 100644 --- a/packages/lv2/build.sh +++ b/packages/lv2/build.sh @@ -3,17 +3,9 @@ TERMUX_PKG_DESCRIPTION="A plugin standard for audio systems" TERMUX_PKG_LICENSE="ISC" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.18.10 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://lv2plug.in/spec/lv2-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=78c51bcf21b54e58bb6329accbb4dae03b2ed79b520f9a01e734bd9de530953f TERMUX_PKG_DEPENDS="libxml2, libxslt, python, sord, python-pip, python-lxml" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-Dplugins=disabled" TERMUX_PKG_PYTHON_TARGET_DEPS="pygments, rdflib" - -termux_step_create_debscripts() { - cat <<-EOF >./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / } - EOF -} diff --git a/packages/manim/build.sh b/packages/manim/build.sh index f8edb8fb24..a43cbf0fc1 100644 --- a/packages/manim/build.sh +++ b/packages/manim/build.sh @@ -3,20 +3,12 @@ TERMUX_PKG_DESCRIPTION="A community-maintained Python framework for creating mat TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Nguyen Khanh @nguynkhn" TERMUX_PKG_VERSION="0.19.2" -TERMUX_PKG_SRCURL=https://github.com/ManimCommunity/manim/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz +TERMUX_PKG_REVISION=1 +TERMUX_PKG_SRCURL="https://github.com/ManimCommunity/manim/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz" TERMUX_PKG_SHA256=e61992a84c684702ce732e66ae46f85341ebe4cb208f8a4c5cb33ce9ea070f02 -TERMUX_PKG_DEPENDS="ffmpeg, libcairo, pango, xorgproto, python-numpy, python-pillow, pycairo, python-scipy, python-skia-pathops" +TERMUX_PKG_DEPENDS="ffmpeg, libcairo, pango, xorgproto, python-numpy, python-pillow, python-pip, pycairo, python-scipy, python-skia-pathops" TERMUX_PKG_SUGGESTS="texlive-installer" -TERMUX_PKG_PYTHON_TARGET_DEPS="'av>=9.0.0,<14.0.0', 'beautifulsoup4>=4.12', 'click>=8.0', 'cloup>=2.0.0', 'decorator>=4.3.2', 'importlib-metadata>=8.6.1', 'isosurfaces>=0.1.0', 'manimpango>=0.5.0,<1.0.0', 'mapbox-earcut>=1.0.0,<1.0.3', 'moderngl-window>=2.0.0', 'moderngl>=5.0.0,<6.0.0', 'networkx>=2.6', 'pydub>=0.20.0', 'pygments>=2.0.0', 'rich>=12.0.0', 'screeninfo>=0.7', 'srt>=3.0.0', 'svgelements>=1.8.0', 'tqdm>=4.0.0', 'typing-extensions>=4.12.0', 'watchdog>=2.0.0'" TERMUX_PKG_PYTHON_COMMON_DEPS="poetry" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_EXCLUDED_ARCHES="arm, i686" - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / } - EOF -} diff --git a/packages/matplotlib/build.sh b/packages/matplotlib/build.sh index b6d82b5ca7..8a29aaaf83 100644 --- a/packages/matplotlib/build.sh +++ b/packages/matplotlib/build.sh @@ -15,6 +15,7 @@ LICENSE/LICENSE_STIX LICENSE/LICENSE_YORICK" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="3.10.8" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/matplotlib/matplotlib/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=dbc50c7b15bb8d7dbe51a27a58322ed73f09291772d9e3184f03f11c576693f7 TERMUX_PKG_AUTO_UPDATE=true @@ -58,11 +59,3 @@ termux_step_make_install() { local _whl="matplotlib-$TERMUX_PKG_VERSION-cp$_pyv-cp$_pyv-linux_$TERMUX_ARCH.whl" pip install --no-deps --prefix=$TERMUX_PREFIX --force-reinstall $TERMUX_PKG_SRCDIR/dist/$_whl } - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip. This may take a while..." - MATHLIB="m" pip3 install matplotlib - EOF -} diff --git a/packages/nala/build.sh b/packages/nala/build.sh index e99a55d344..95e0ea86b2 100644 --- a/packages/nala/build.sh +++ b/packages/nala/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Commandline frontend for the apt package manager" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="0.16.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://gitlab.com/volian/nala/-/archive/v${TERMUX_PKG_VERSION}/nala-v${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=49e384aa3b94597d09c61b7accc41d1cf10cb6beea85d4620c80c28d7cdc4d5f TERMUX_PKG_DEPENDS="python-apt, python-pip" @@ -12,6 +13,7 @@ TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag" TERMUX_PKG_PYTHON_COMMON_DEPS="poetry" TERMUX_PKG_PYTHON_TARGET_DEPS="anyio, httpx, jsbeautifier, pexpect, python-debian, rich, tomli, typer, typing-extensions" +TERMUX_PKG_PYTHON_RUNTIME_DEPS="nala, python-debian" termux_step_pre_configure() { rm -rf nala/__init__.py.orig @@ -42,7 +44,5 @@ termux_step_create_debscripts() { mkdir -p $TERMUX_PREFIX/var/lib/nala mkdir -p $TERMUX_PREFIX/var/log/nala mkdir -p $TERMUX_PREFIX/var/lock - echo "Installing dependencies through pip..." - pip3 install nala python-debian EOF } diff --git a/packages/python-bcrypt/build.sh b/packages/python-bcrypt/build.sh index b809896ca6..b359f2e198 100644 --- a/packages/python-bcrypt/build.sh +++ b/packages/python-bcrypt/build.sh @@ -3,10 +3,11 @@ TERMUX_PKG_DESCRIPTION="Acceptable password hashing for your software and your s TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="5.0.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://pypi.io/packages/source/b/bcrypt/bcrypt-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=f748f7c2d6fd375cc93d3fba7ef4a9e3a092421b8dbf34d8d4dc06be9492dfdd TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_DEPENDS="python" +TERMUX_PKG_DEPENDS="python, python-pip" TERMUX_PKG_BUILD_DEPENDS="openssl" TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, setuptools-rust" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/python-contourpy/build.sh b/packages/python-contourpy/build.sh index 15b9cf6d18..fbadde9132 100644 --- a/packages/python-contourpy/build.sh +++ b/packages/python-contourpy/build.sh @@ -3,12 +3,13 @@ TERMUX_PKG_DESCRIPTION="Python library for calculating contours in 2D quadrilate TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.3.3" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=git+https://github.com/contourpy/contourpy -TERMUX_PKG_DEPENDS="python, python-numpy" +TERMUX_PKG_DEPENDS="python, python-numpy, python-pip" +TERMUX_PKG_BUILD_DEPENDS="pybind11" TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, meson-python, build" _NUMPY_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python-numpy/build.sh; echo $TERMUX_PKG_VERSION) -TERMUX_PKG_PYTHON_BUILD_DEPS="'pybind11>=2.12.0', 'numpy==$_NUMPY_VERSION'" +TERMUX_PKG_PYTHON_BUILD_DEPS="'numpy==$_NUMPY_VERSION'" TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag" TERMUX_MESON_WHEEL_CROSSFILE="$TERMUX_PKG_TMPDIR/wheel-cross-file.txt" @@ -22,7 +23,7 @@ termux_step_configure() { cp -f $TERMUX_MESON_CROSSFILE $TERMUX_MESON_WHEEL_CROSSFILE sed -i 's|^\(\[binaries\]\)$|\1\npython = '\'$(command -v python)\''|g' \ $TERMUX_MESON_WHEEL_CROSSFILE - sed -i 's|^\(\[properties\]\)$|\1\nnumpy-include-dir = '\'$PYTHON_SITE_PKG/numpy/_core/include\''|g' \ + sed -i 's|^\(\[properties\]\)$|\1\nnumpy-include-dir = '\'$TERMUX_PYTHON_HOME/site-packages/numpy/_core/include\''|g' \ $TERMUX_MESON_WHEEL_CROSSFILE termux_step_configure_meson @@ -37,5 +38,5 @@ termux_step_make() { termux_step_make_install() { local _pyv="${TERMUX_PYTHON_VERSION/./}" local _whl="contourpy-$TERMUX_PKG_VERSION-cp$_pyv-cp$_pyv-linux_$TERMUX_ARCH.whl" - pip install --no-deps --prefix=$TERMUX_PREFIX $TERMUX_PKG_SRCDIR/dist/$_whl + pip install --force-reinstall --no-deps --prefix=$TERMUX_PREFIX $TERMUX_PKG_SRCDIR/dist/$_whl } diff --git a/packages/python-cryptography/build.sh b/packages/python-cryptography/build.sh index 908655a7a0..c1a93df009 100644 --- a/packages/python-cryptography/build.sh +++ b/packages/python-cryptography/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="Apache-2.0, BSD 3-Clause" TERMUX_PKG_LICENSE_FILE="LICENSE, LICENSE.APACHE, LICENSE.BSD" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="46.0.3" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/pyca/cryptography/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=b40f9434d14affd208f03f4832aa616cb49e9ce414cb103825a8184eb94002f5 TERMUX_PKG_AUTO_UPDATE=true @@ -16,14 +17,7 @@ TERMUX_PKG_PYTHON_TARGET_DEPS="'cffi>=1.12'" termux_step_configure() { termux_setup_rust - export CARGO_BUILD_TARGET=${CARGO_TARGET_NAME} - export PYO3_CROSS_LIB_DIR=$TERMUX_PREFIX/lib -} - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install $TERMUX_PKG_PYTHON_TARGET_DEPS - EOF + export CARGO_BUILD_TARGET="${CARGO_TARGET_NAME}" + export PYO3_CROSS_LIB_DIR="${TERMUX_PREFIX}/lib" + export ANDROID_API_LEVEL="${TERMUX_PKG_API_LEVEL}" } diff --git a/packages/python-greenlet/build.sh b/packages/python-greenlet/build.sh index 5c0b538b10..787fce748b 100644 --- a/packages/python-greenlet/build.sh +++ b/packages/python-greenlet/build.sh @@ -5,10 +5,11 @@ TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="LICENSE, LICENSE.PSF" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="3.3.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/python-greenlet/greenlet/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=5d854395dc71b38a22e7e25467e7fc66e6a6fe538165318416cd2bb892692c6c TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag" -TERMUX_PKG_DEPENDS="libc++, python" +TERMUX_PKG_DEPENDS="libc++, python, python-pip" TERMUX_PKG_PYTHON_COMMON_DEPS="wheel" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/python-grpcio/build.sh b/packages/python-grpcio/build.sh index 6518f95d84..b912e88725 100644 --- a/packages/python-grpcio/build.sh +++ b/packages/python-grpcio/build.sh @@ -4,10 +4,10 @@ TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_SRCURL=git+https://github.com/grpc/grpc TERMUX_PKG_VERSION="1.76.0" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag" -TERMUX_PKG_DEPENDS="abseil-cpp, c-ares, ca-certificates, libc++, libre2, openssl, python, zlib" +TERMUX_PKG_DEPENDS="abseil-cpp, c-ares, ca-certificates, libc++, libre2, openssl, python, python-pip, zlib" TERMUX_PKG_BUILD_DEPENDS="gflags, gflags-static" TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, setuptools, 'Cython>=3.0.0'" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/python-llvmlite/build.sh b/packages/python-llvmlite/build.sh index 991af49f3e..5b868ef777 100644 --- a/packages/python-llvmlite/build.sh +++ b/packages/python-llvmlite/build.sh @@ -8,6 +8,7 @@ TERMUX_PKG_VERSION=( "0.46.0" "20.1.8" ) +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=( "https://github.com/numba/llvmlite/archive/refs/tags/v${TERMUX_PKG_VERSION[0]}.tar.gz" "https://github.com/llvm/llvm-project/releases/download/llvmorg-${TERMUX_PKG_VERSION[1]}/llvm-project-${TERMUX_PKG_VERSION[1]}.src.tar.xz" @@ -21,7 +22,6 @@ TERMUX_PKG_PYTHON_COMMON_DEPS="wheel" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_HOSTBUILD=true -TERMUX_PKG_RM_AFTER_INSTALL="include" # See http://llvm.org/docs/CMake.html: TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" @@ -101,6 +101,8 @@ __llvmlite_build_llvm() { TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_TARGET_ARCH=$LLVM_TARGET_ARCH" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_HOST_TRIPLE=$LLVM_DEFAULT_TARGET_TRIPLE" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DCMAKE_INSTALL_PREFIX=$_LLVMLITE_LLVM_INSTALL_DIR" + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DCMAKE_INSTALL_INCLUDEDIR=$_LLVMLITE_LLVM_INSTALL_DIR/include" + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DCMAKE_INSTALL_LIBDIR=$_LLVMLITE_LLVM_INSTALL_DIR/lib" # Backup dirs and envs local __old_ldflags="$LDFLAGS" @@ -175,3 +177,10 @@ termux_step_make_install() { export LLVMLITE_SKIP_BUILD_LIBRARY=1 pip install . --prefix="$TERMUX_PREFIX" -vv --no-build-isolation --no-deps } + +termux_step_post_massage() { + local dir="include" + if [[ -d "${TERMUX_PKG_MASSAGEDIR}${TERMUX_PREFIX}/$dir" ]]; then + termux_error_exit "$dir should not exist in $TERMUX_PKG_NAME!" + fi +} diff --git a/packages/python-msgpack/build.sh b/packages/python-msgpack/build.sh index b399d8aed2..ea5dd393fc 100644 --- a/packages/python-msgpack/build.sh +++ b/packages/python-msgpack/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="MessagePack serializer implementation for Python" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.1.2" +TERMUX_PKG_REVISION=1 # _cmsgpack.c is absent in https://github.com/msgpack/msgpack-python/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://pypi.org/packages/source/m/msgpack/msgpack-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=3b60763c1373dd60f398488069bcdc703cd08a711477b5d480eecc9f9626f47e @@ -17,5 +18,5 @@ termux_step_make() { termux_step_make_install() { local _pyver="${TERMUX_PYTHON_VERSION//./}" local _wheel="msgpack-${TERMUX_PKG_VERSION}-cp${_pyver}-cp${_pyver}-linux_${TERMUX_ARCH}.whl" - pip install --no-deps --prefix="$TERMUX_PREFIX" "$TERMUX_PKG_SRCDIR/dist/${_wheel}" + pip install --force-reinstal --no-deps --prefix="$TERMUX_PREFIX" "$TERMUX_PKG_SRCDIR/dist/${_wheel}" } diff --git a/packages/python-numpy/build.sh b/packages/python-numpy/build.sh index 94e8c6d6ba..32c860b5df 100644 --- a/packages/python-numpy/build.sh +++ b/packages/python-numpy/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" # Revbump revdeps after updating TERMUX_PKG_VERSION="2.2.5" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=git+https://github.com/numpy/numpy TERMUX_PKG_DEPENDS="libc++, libopenblas, python" TERMUX_PKG_AUTO_UPDATE=false @@ -34,7 +34,7 @@ termux_step_configure() { cp -f $TERMUX_MESON_CROSSFILE $TERMUX_MESON_WHEEL_CROSSFILE sed -i 's|^\(\[binaries\]\)$|\1\npython = '\'$(command -v python)\''|g' \ $TERMUX_MESON_WHEEL_CROSSFILE - sed -i 's|^\(\[properties\]\)$|\1\nnumpy-include-dir = '\'$PYTHON_SITE_PKG/numpy/_core/include\''|g' \ + sed -i 's|^\(\[properties\]\)$|\1\nnumpy-include-dir = '\'$TERMUX_PYTHON_HOME/site-packages/numpy/_core/include\''|g' \ $TERMUX_MESON_WHEEL_CROSSFILE local _longdouble_format="" diff --git a/packages/python-onnxruntime/0001-use-system-abseil.patch b/packages/python-onnxruntime/0001-use-system-abseil.patch index 4bd86e5f9a..cc55bc1cf8 100644 --- a/packages/python-onnxruntime/0001-use-system-abseil.patch +++ b/packages/python-onnxruntime/0001-use-system-abseil.patch @@ -2,11 +2,11 @@ This reverts f70215d4e6af2a1b5a0cc232460e2f86125b055d --- a/cmake/external/abseil-cpp.cmake +++ b/cmake/external/abseil-cpp.cmake -@@ -28,7 +28,7 @@ +@@ -36,7 +36,7 @@ onnxruntime_fetchcontent_declare( URL_HASH SHA1=${DEP_SHA1_abseil_cpp} EXCLUDE_FROM_ALL PATCH_COMMAND ${ABSL_PATCH_COMMAND} -- FIND_PACKAGE_ARGS 20240722 NAMES absl +- FIND_PACKAGE_ARGS 20250512 NAMES absl + FIND_PACKAGE_ARGS NAMES absl ) diff --git a/packages/python-onnxruntime/0006-cherry-pick25615.patch b/packages/python-onnxruntime/0006-cherry-pick25615.patch new file mode 100644 index 0000000000..1502c80da7 --- /dev/null +++ b/packages/python-onnxruntime/0006-cherry-pick25615.patch @@ -0,0 +1,64 @@ +From c79a2c525edce42523b35da3edb87ae937a6e5b1 Mon Sep 17 00:00:00 2001 +From: Yulong Wang <7679871+fs-eire@users.noreply.github.com> +Date: Thu, 31 Jul 2025 15:02:37 -0700 +Subject: [PATCH] [build] fix macOS x86_64 cross-compile warning + +--- + cmake/CMakeLists.txt | 1 + + cmake/onnxruntime_config.h.in | 1 + + .../lib/sqnbitgemm_kernel_avx2_int8_blklen32.h | 17 +++++++++++++++++ + 3 files changed, 19 insertions(+) + +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index a76be16572a03..bdc18c424efd1 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -558,6 +558,7 @@ else() + check_cxx_compiler_flag(-Wambiguous-reversed-operator HAS_AMBIGUOUS_REVERSED_OPERATOR) + # -Winterference-size was added in GCC 13 + check_cxx_compiler_flag(-Winterference-size HAS_INTERFERENCE_SIZE) ++ check_cxx_compiler_flag(-Warray-bounds HAS_ARRAY_BOUNDS) + check_cxx_compiler_flag(-Wbitwise-instead-of-logical HAS_BITWISE_INSTEAD_OF_LOGICAL) + check_cxx_compiler_flag(-Wcast-function-type HAS_CAST_FUNCTION_TYPE) + check_cxx_compiler_flag(-Wcatch-value HAS_CATCH_VALUE) +diff --git a/cmake/onnxruntime_config.h.in b/cmake/onnxruntime_config.h.in +index f82a23bf4026b..a36f735c507ba 100644 +--- a/cmake/onnxruntime_config.h.in ++++ b/cmake/onnxruntime_config.h.in +@@ -3,6 +3,7 @@ + + #pragma once + ++#cmakedefine HAS_ARRAY_BOUNDS + #cmakedefine HAS_BITWISE_INSTEAD_OF_LOGICAL + #cmakedefine HAS_CAST_FUNCTION_TYPE + #cmakedefine HAS_CATCH_VALUE +diff --git a/onnxruntime/core/mlas/lib/sqnbitgemm_kernel_avx2_int8_blklen32.h b/onnxruntime/core/mlas/lib/sqnbitgemm_kernel_avx2_int8_blklen32.h +index d2d9886ab61f7..a745dd9f1376d 100644 +--- a/onnxruntime/core/mlas/lib/sqnbitgemm_kernel_avx2_int8_blklen32.h ++++ b/onnxruntime/core/mlas/lib/sqnbitgemm_kernel_avx2_int8_blklen32.h +@@ -1660,7 +1660,24 @@ MlasQ4Int8TileGemmKernelBlkLen32Avx2( + + if constexpr (NCols4 == 8) { + __m128 acc_0 = FoldAccumulators(acc[0], acc[1], acc[2], acc[3]); ++ ++ // Clang is not happy with the code here, even if constexpr `NCols4 == 8` is always false in this context: ++ // ++ // In file included from .../onnxruntime/core/mlas/lib/sqnbitgemm_kernel_avx2.cpp:26: ++ // .../onnxruntime/core/mlas/lib/sqnbitgemm_kernel_avx2_int8_blklen32.h:1663:49: error: array index 4 is past the end of the array (that has type '__m256[4]') [-Werror,-Warray-bounds] ++ // 1663 | __m128 acc_1 = FoldAccumulators(acc[4], acc[5], acc[6], acc[7]); ++ // | ^ ~ ++ // .../onnxruntime/core/mlas/lib/sqnbitgemm_kernel_avx2_int8_blklen32.h:1531:13: note: array 'acc' declared here ++ // 1531 | __m256 acc[NCols4]; ++ // | ^ ++#if defined(__clang__) ++#pragma clang diagnostic push ++#pragma clang diagnostic ignored "-Warray-bounds" ++#endif + __m128 acc_1 = FoldAccumulators(acc[4], acc[5], acc[6], acc[7]); ++#if defined(__clang__) ++#pragma clang diagnostic pop ++#endif + if (BiasPtr != nullptr) { + acc_0 = _mm_add_ps(acc_0, _mm_loadu_ps(BiasPtr)); + acc_1 = _mm_add_ps(acc_1, _mm_loadu_ps(BiasPtr + 4)); diff --git a/packages/python-onnxruntime/build.sh b/packages/python-onnxruntime/build.sh index 533f6bf58e..cba610bb6e 100644 --- a/packages/python-onnxruntime/build.sh +++ b/packages/python-onnxruntime/build.sh @@ -2,23 +2,33 @@ TERMUX_PKG_HOMEPAGE=https://onnxruntime.ai/ TERMUX_PKG_DESCRIPTION="Cross-platform, high performance ML inferencing and training accelerator" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="1.22.2" -TERMUX_PKG_REVISION=5 +TERMUX_PKG_VERSION="1.23.2" TERMUX_PKG_SRCURL=git+https://github.com/microsoft/onnxruntime -TERMUX_PKG_DEPENDS="abseil-cpp, libc++, protobuf, libre2, python" -TERMUX_PKG_BUILD_DEPENDS="python-numpy" +TERMUX_PKG_DEPENDS="abseil-cpp, libc++, protobuf, libre2, python, python-numpy, python-pip" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, build, packaging" TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag" +# if -Donnxruntime_BUILD_SHARED_LIB=ON is not used, +# this build error occurs: +# install(EXPORT "onnxruntimeTargets" ...) includes target "onnxruntime" +# which requires target "XNNPACK" that is not in any export set. +# as of version 1.23.2 +# if -Donnxruntime_BUILD_UNIT_TESTS=OFF is not used, +# this build error occurs for 32-bit targets: +# src/onnxruntime/test/shared_lib/custom_op_utils.cc:657:43: error: +# implicit conversion loses integer precision: 'int64_t' (aka 'long long') +# to 'size_type' (aka 'unsigned int') [-Werror,-Wshorten-64-to-32] +# as of version 1.23.2 TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -Donnxruntime_ENABLE_PYTHON=ON --Donnxruntime_BUILD_SHARED_LIB=OFF +-Donnxruntime_BUILD_SHARED_LIB=ON -DPYBIND11_USE_CROSSCOMPILING=TRUE -Donnxruntime_USE_NNAPI_BUILTIN=ON -Donnxruntime_USE_XNNPACK=ON +-Donnxruntime_BUILD_UNIT_TESTS=OFF " termux_step_pre_configure() { @@ -30,7 +40,7 @@ termux_step_pre_configure() { TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DPYTHON_EXECUTABLE=$(command -v python3)" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DONNX_CUSTOM_PROTOC_EXECUTABLE=$(command -v protoc)" - TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DPython_NumPy_INCLUDE_DIR=$TERMUX_PREFIX/lib/python$TERMUX_PYTHON_VERSION/site-packages/numpy/_core/include" + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DPython_NumPy_INCLUDE_DIR=$TERMUX_PYTHON_HOME/site-packages/numpy/_core/include" local TERMUX_PKG_SRCDIR_SAVE="$TERMUX_PKG_SRCDIR" TERMUX_PKG_SRCDIR+="/cmake" @@ -47,13 +57,5 @@ termux_step_make() { termux_step_make_install() { local _pyver="${TERMUX_PYTHON_VERSION//./}" local _wheel="onnxruntime-${TERMUX_PKG_VERSION}-cp${_pyver}-cp${_pyver}-linux_${TERMUX_ARCH}.whl" - pip install --no-deps --prefix="$TERMUX_PREFIX" "$TERMUX_PKG_SRCDIR/dist/${_wheel}" -} - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install onnxruntime - EOF + pip install --force-reinstall --no-deps --prefix="$TERMUX_PREFIX" "$TERMUX_PKG_SRCDIR/dist/${_wheel}" } diff --git a/packages/python-pillow/build.sh b/packages/python-pillow/build.sh index f2bc53b78c..8597d19a68 100644 --- a/packages/python-pillow/build.sh +++ b/packages/python-pillow/build.sh @@ -3,10 +3,11 @@ TERMUX_PKG_DESCRIPTION="Python Imaging Library" TERMUX_PKG_LICENSE="custom" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="12.1.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/python-pillow/Pillow/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=8160e8b97c9e12337073b91d427d88df9490ba500f21d32015cfbb6f98846670 TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_DEPENDS="freetype, libimagequant, libjpeg-turbo, libraqm, libtiff, libwebp, libxcb, littlecms, openjpeg, python, zlib" +TERMUX_PKG_DEPENDS="freetype, libimagequant, libjpeg-turbo, libraqm, libtiff, libwebp, libxcb, littlecms, openjpeg, python, python-pip, zlib" TERMUX_PKG_LICENSE_FILE="LICENSE" TERMUX_PKG_SETUP_PYTHON=true TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/python-pycryptodomex/build.sh b/packages/python-pycryptodomex/build.sh index 51387294cb..4aea305005 100644 --- a/packages/python-pycryptodomex/build.sh +++ b/packages/python-pycryptodomex/build.sh @@ -4,11 +4,11 @@ TERMUX_PKG_LICENSE="BSD 2-Clause, Public Domain" TERMUX_PKG_LICENSE_FILE="LICENSE.rst" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="3.23.0" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL="https://github.com/Legrandin/pycryptodome/archive/refs/tags/v${TERMUX_PKG_VERSION}x.tar.gz" TERMUX_PKG_SHA256=d3e12d349f62a8c3bd2e7056e2eea925abcfcdd9e2b07bff091bcc05837ac869 TERMUX_PKG_DEPENDS="python, python-pip" -TERMUX_PKG_PYTHON_COMMON_DEPS="wheel" +TERMUX_PKG_SETUP_PYTHON=true TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/python-pynvim/build.sh b/packages/python-pynvim/build.sh index ad6e992609..92882702b1 100644 --- a/packages/python-pynvim/build.sh +++ b/packages/python-pynvim/build.sh @@ -3,10 +3,11 @@ TERMUX_PKG_DESCRIPTION="Python client for Neovim" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="0.6.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/neovim/pynvim/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=6649d630ce4a94007fe69a8debb010c7b185057f36d61576d2542c90f3c8db99 TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_DEPENDS="python-greenlet, python-msgpack" +TERMUX_PKG_DEPENDS="python-pip, python-greenlet, python-msgpack" TERMUX_PKG_PYTHON_BUILD_DEPS="wheel" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/packages/python-scipy/build.sh b/packages/python-scipy/build.sh index 49e9437912..a7c21ada66 100644 --- a/packages/python-scipy/build.sh +++ b/packages/python-scipy/build.sh @@ -3,12 +3,13 @@ TERMUX_PKG_DESCRIPTION="Fundamental algorithms for scientific computing in Pytho TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.17.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=git+https://github.com/scipy/scipy -TERMUX_PKG_DEPENDS="libc++, libopenblas, python, python-numpy" -TERMUX_PKG_BUILD_DEPENDS="python-numpy-static" +TERMUX_PKG_DEPENDS="libc++, libopenblas, python, python-numpy, python-pip" +TERMUX_PKG_BUILD_DEPENDS="python-numpy-static, pybind11" TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, 'Cython>=3.0.8', meson-python, build" _NUMPY_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python-numpy/build.sh; echo $TERMUX_PKG_VERSION) -TERMUX_PKG_PYTHON_BUILD_DEPS="pythran, 'pybind11>=2.12.0', 'numpy==$_NUMPY_VERSION'" +TERMUX_PKG_PYTHON_BUILD_DEPS="pythran, 'numpy==$_NUMPY_VERSION'" TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag" @@ -50,7 +51,7 @@ termux_step_configure() { cp -f $TERMUX_MESON_CROSSFILE $TERMUX_MESON_WHEEL_CROSSFILE sed -i 's|^\(\[binaries\]\)$|\1\npython = '\'$(command -v python)\''|g' \ $TERMUX_MESON_WHEEL_CROSSFILE - sed -i 's|^\(\[properties\]\)$|\1\nnumpy-include-dir = '\'$PYTHON_SITE_PKG/numpy/_core/include\''|g' \ + sed -i 's|^\(\[properties\]\)$|\1\nnumpy-include-dir = '\'$TERMUX_PYTHON_HOME/site-packages/numpy/_core/include\''|g' \ $TERMUX_MESON_WHEEL_CROSSFILE (unset PYTHONPATH && termux_step_configure_meson) @@ -65,5 +66,5 @@ termux_step_make() { termux_step_make_install() { local _pyv="${TERMUX_PYTHON_VERSION/./}" local _whl="scipy-$TERMUX_PKG_VERSION-cp$_pyv-cp$_pyv-linux_$TERMUX_ARCH.whl" - pip install --no-deps --prefix=$TERMUX_PREFIX $TERMUX_PKG_SRCDIR/dist/$_whl + pip install --force-reinstall --no-deps --prefix=$TERMUX_PREFIX $TERMUX_PKG_SRCDIR/dist/$_whl } diff --git a/packages/python-skia-pathops/build.sh b/packages/python-skia-pathops/build.sh index b9aaf678fd..e472695f10 100644 --- a/packages/python-skia-pathops/build.sh +++ b/packages/python-skia-pathops/build.sh @@ -3,11 +3,11 @@ TERMUX_PKG_DESCRIPTION="Python bindings for the Skia library's Path Ops" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="Nguyen Khanh @nguynkhn" TERMUX_PKG_VERSION=0.8.0 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 _SUFFIX='post1' TERMUX_PKG_SRCURL=https://github.com/fonttools/skia-pathops/archive/refs/tags/v${TERMUX_PKG_VERSION}.${_SUFFIX}.tar.gz TERMUX_PKG_SHA256=88bd5872bb96e19108ff7265cae2e1708f5e7f335b39ebfdd023940970e1d54c -TERMUX_PKG_DEPENDS="libc++, python" +TERMUX_PKG_DEPENDS="libc++, python, python-pip" TERMUX_PKG_PYTHON_COMMON_DEPS="setuptools, wheel, setuptools_scm, 'Cython>=0.28.4'" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/python-tflite-runtime/build.sh b/packages/python-tflite-runtime/build.sh index 366d97e680..340e0152fe 100644 --- a/packages/python-tflite-runtime/build.sh +++ b/packages/python-tflite-runtime/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="TensorFlow Lite Python bindings" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="2.20.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=git+https://github.com/tensorflow/tensorflow TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="python, python-numpy, python-pip" @@ -40,7 +41,7 @@ termux_step_pre_configure() { local BUILD_DIR="$TFLITE_BUILD_DIR" local PYTHON="$(command -v python)" local PYBIND11_INCLUDE=$($PYTHON -c "import pybind11; print (pybind11.get_include())") - CPPFLAGS+=" -I$PYTHON_SITE_PKG/numpy/_core/include" + CPPFLAGS+=" -I$TERMUX_PYTHON_HOME/site-packages/numpy/_core/include" CPPFLAGS+=" -I$PYBIND11_INCLUDE" CPPFLAGS+=" -I$TERMUX_PREFIX/include/python$TERMUX_PYTHON_VERSION" CPPFLAGS+=" $TF_CXX_FLAGS" @@ -81,5 +82,5 @@ termux_step_make() { termux_step_make_install() { local _pyver="${TERMUX_PYTHON_VERSION//./}" local _wheel="tflite_runtime-${TERMUX_PKG_VERSION}-cp${_pyver}-cp${_pyver}-linux_${TERMUX_ARCH}.whl" - pip install --no-deps --prefix="$TERMUX_PREFIX" "$TFLITE_BUILD_DIR/dist/${_wheel}" + pip install --force-reinstall --no-deps --prefix="$TERMUX_PREFIX" "$TFLITE_BUILD_DIR/dist/${_wheel}" } diff --git a/packages/python-tldp/build.sh b/packages/python-tldp/build.sh index 1a99e5cfec..cc65f4f7b3 100644 --- a/packages/python-tldp/build.sh +++ b/packages/python-tldp/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Tools for publishing from TLDP sources" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.7.5 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://github.com/tLDP/python-tldp/archive/refs/tags/tldp-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=bae313095b877b4272ddccaabd70efcbc526e2c1036f63fb665ec7ce10c94cde TERMUX_PKG_AUTO_UPDATE=true @@ -13,11 +13,3 @@ TERMUX_PKG_PYTHON_COMMON_DEPS="wheel" TERMUX_PKG_PYTHON_TARGET_DEPS="networkx, nose" TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_BUILD_IN_SRC=true - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / } - EOF -} diff --git a/packages/python-torch/build.sh b/packages/python-torch/build.sh index f0047a178a..b25b1ef64a 100644 --- a/packages/python-torch/build.sh +++ b/packages/python-torch/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Tensors and Dynamic neural networks in Python" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="2.9.1" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=git+https://github.com/pytorch/pytorch TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag" TERMUX_PKG_DEPENDS="abseil-cpp, libc++, libopenblas, libprotobuf, python, python-numpy, python-pip" @@ -41,6 +42,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DUSE_DISTRIBUTED=ON -DANDROID_NDK=${NDK} -DANDROID_NDK_HOST_SYSTEM_NAME=linux-$HOSTTYPE +-DCMAKE_POLICY_VERSION_MINIMUM=3.5 " TERMUX_PKG_RM_AFTER_INSTALL=" @@ -87,9 +89,3 @@ termux_step_make_install() { pip -v install --no-deps --no-build-isolation --prefix $TERMUX_PREFIX "$TERMUX_PKG_SRCDIR" ln -sfr ${TERMUX_PYTHON_HOME}/site-packages/torch/lib/*.so ${TERMUX_PREFIX}/lib } - -termux_step_create_debscripts() { - echo "#!$TERMUX_PREFIX/bin/sh" > postinst - echo "echo 'Installing dependencies for $TERMUX_PKG_NAME...'" >> postinst - echo "pip3 install torch" >> postinst -} diff --git a/packages/python-torchaudio/build.sh b/packages/python-torchaudio/build.sh index a9b2e2fe5d..756ae5d1c1 100644 --- a/packages/python-torchaudio/build.sh +++ b/packages/python-torchaudio/build.sh @@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="Data manipulation and transformation for audio signal pr TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="2.9.1" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://github.com/pytorch/audio/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SHA256=590492c90552959b3df6f601eb733135064bf2d9e53c516adcf6845a4e545662 -TERMUX_PKG_DEPENDS="libc++, python, python-torch, python-torchcodec" +TERMUX_PKG_DEPENDS="libc++, python, python-pip, python-torch, python-torchcodec" TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, setuptools" termux_step_pre_configure() { diff --git a/packages/python-torchcodec/build.sh b/packages/python-torchcodec/build.sh index 16e6ee50d8..ddd9a2640b 100644 --- a/packages/python-torchcodec/build.sh +++ b/packages/python-torchcodec/build.sh @@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="PyTorch media decoding and encoding" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="0.9.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://github.com/pytorch/torchcodec/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SHA256=3a66ca7086369b90ee1dcc88ef0407360a065e1ee827105edbbe5b9ba9b7b666 -TERMUX_PKG_DEPENDS="ffmpeg, google-glog, libc++, python, python-torch" +TERMUX_PKG_DEPENDS="ffmpeg, google-glog, libc++, python, python-pip, python-torch" TERMUX_PKG_BUILD_DEPENDS="pybind11" TERMUX_PKG_PYTHON_COMMON_DEPS="build" diff --git a/packages/python-torchvision/avoid-ubuntu-libpng-config.patch b/packages/python-torchvision/avoid-ubuntu-libpng-config.patch new file mode 100644 index 0000000000..1c86fe154e --- /dev/null +++ b/packages/python-torchvision/avoid-ubuntu-libpng-config.patch @@ -0,0 +1,14 @@ +Prevents error: +libpng-config: --libdir option is disabled in Debian/Ubuntu + +--- a/setup.py ++++ b/setup.py +@@ -204,7 +204,7 @@ def make_C_extension(): + def find_libpng(): + # Returns (found, include dir, library dir, library name) + if sys.platform in ("linux", "darwin", "aix"): +- libpng_config = shutil.which("libpng-config") ++ libpng_config = "@TERMUX_PREFIX@/bin/libpng-config" + if libpng_config is None: + warnings.warn("libpng-config not found") + return False, None, None, None diff --git a/packages/python-torchvision/build.sh b/packages/python-torchvision/build.sh index 8df14df762..0b24167cd1 100644 --- a/packages/python-torchvision/build.sh +++ b/packages/python-torchvision/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Datasets, Transforms and Models specific to Computer Vis TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="0.24.1" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL="https://github.com/pytorch/vision/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SHA256=071da2078600bfec4886efab77358c9329abfedcf1488b05879b556cb9b84ba7 TERMUX_PKG_DEPENDS="libc++, ffmpeg, python, python-numpy, python-pillow, python-pip, python-torch, libjpeg-turbo, libpng, libwebp, zlib" @@ -34,9 +34,3 @@ termux_step_configure() { termux_step_make_install() { pip -v install --no-build-isolation --no-deps --prefix "$TERMUX_PREFIX" "$TERMUX_PKG_SRCDIR" } - -termux_step_create_debscripts() { - echo "#!$TERMUX_PREFIX/bin/sh" > postinst - echo "echo 'Installing dependencies for $TERMUX_PKG_NAME...'" >> postinst - echo "pip3 install torchvision" >> postinst -} diff --git a/packages/python-xlib/build.sh b/packages/python-xlib/build.sh index ec4973af11..fe942af983 100644 --- a/packages/python-xlib/build.sh +++ b/packages/python-xlib/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="The Python X Library" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.33 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/python-xlib/python-xlib/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e10d1b49655800bffe0fbb5eb31eeef915a4421952ef006d468d53d34901f6f8 TERMUX_PKG_AUTO_UPDATE=true @@ -12,11 +12,3 @@ TERMUX_PKG_PYTHON_COMMON_DEPS="wheel" TERMUX_PKG_PYTHON_TARGET_DEPS="'six>=1.10.0'" TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_BUILD_IN_SRC=true - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip. This may take a while..." - pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / } - EOF -} diff --git a/packages/python-yt-dlp/build.sh b/packages/python-yt-dlp/build.sh index 3ca1e94e22..e1290f1dc3 100644 --- a/packages/python-yt-dlp/build.sh +++ b/packages/python-yt-dlp/build.sh @@ -3,13 +3,12 @@ TERMUX_PKG_DESCRIPTION="A youtube-dl fork with additional features and fixes" TERMUX_PKG_LICENSE="Unlicense" TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000" TERMUX_PKG_VERSION="2025.12.08" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/yt-dlp/yt-dlp/archive/refs/tags/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=10bec5b2bfb367263e7e46ddb69187204506f9d67b7f01bb499d07fa0d54d4b7 TERMUX_PKG_DEPENDS="libc++, libexpat, openssl, python, python-brotli, python-pip, python-pycryptodomex" TERMUX_PKG_RECOMMENDS="ffmpeg, yt-dlp-ejs" TERMUX_PKG_PYTHON_COMMON_DEPS="hatchling, wheel" -TERMUX_PKG_PYTHON_TARGET_DEPS="mutagen, pycryptodomex, websockets, certifi, brotli, requests, urllib3" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_AUTO_UPDATE=true @@ -49,11 +48,3 @@ termux_step_make_install() { EOF fi } - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / } - EOF -} diff --git a/packages/python/0011-do-not-hardlink.patch b/packages/python/0011-do-not-hardlink.patch new file mode 100644 index 0000000000..daca89efbc --- /dev/null +++ b/packages/python/0011-do-not-hardlink.patch @@ -0,0 +1,20 @@ +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -817,7 +817,7 @@ $(LIBRARY): $(LIBRARY_OBJS) + libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS) + if test $(INSTSONAME) != $(LDLIBRARY); then \ + $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \ +- $(LN) -f $(INSTSONAME) $@; \ ++ $(LN) -sf $(INSTSONAME) $@; \ + else \ + $(BLDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \ + fi +@@ -1971,7 +1971,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ + if test -f $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE) -o -h $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \ + then rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \ + fi; \ +- (cd $(DESTDIR)$(BINDIR); $(LN) python$(LDVERSION)$(EXE) python$(VERSION)$(EXE)); \ ++ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)$(EXE) python$(VERSION)$(EXE)); \ + fi + @if test "$(PY_ENABLE_SHARED)" = 1 -o "$(STATIC_LIBPYTHON)" = 1; then \ + if test -f $(LDLIBRARY) && test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \ diff --git a/packages/python/build.sh b/packages/python/build.sh index 7d266dd748..43ccec77d7 100644 --- a/packages/python/build.sh +++ b/packages/python/build.sh @@ -4,9 +4,17 @@ TERMUX_PKG_DESCRIPTION="Python 3 programming language intended to enable clear p TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="LICENSE" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="3.12.12" -TERMUX_PKG_SRCURL=https://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=fb85a13414b028c49ba18bbd523c2d055a30b56b18b92ce454ea2c51edc656c4 +TERMUX_PKG_VERSION=3.12.12 +TERMUX_PKG_REVISION=1 +_DEBPYTHON_COMMIT=f358ab52bf2932ad55b1a72a29c9762169e6ac47 +TERMUX_PKG_SRCURL=( + https://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz + https://salsa.debian.org/cpython-team/python3-defaults/-/archive/${_DEBPYTHON_COMMIT}/python3-defaults-${_DEBPYTHON_COMMIT}.tar.gz +) +TERMUX_PKG_SHA256=( + fb85a13414b028c49ba18bbd523c2d055a30b56b18b92ce454ea2c51edc656c4 + 3b7a76c144d39f5c4a2c7789fd4beb3266980c2e667ad36167e1e7a357c684b0 +) TERMUX_PKG_AUTO_UPDATE=false TERMUX_PKG_DEPENDS="gdbm, libandroid-posix-semaphore, libandroid-support, libbz2, libcrypt, libexpat, libffi, liblzma, libsqlite, ncurses, ncurses-ui-libs, openssl, readline, zlib" TERMUX_PKG_BUILD_DEPENDS="tk" @@ -48,6 +56,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_shm_open=yes" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_shm_unlink=yes" # Assume tzset() works TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_working_tzset=yes" +# prevents 'configure: error: Cross compiling requires --with-build-python' (even during on-device build) +TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-build-python=python$_MAJOR_VERSION" TERMUX_PKG_RM_AFTER_INSTALL=" lib/python${_MAJOR_VERSION}/test @@ -56,6 +66,10 @@ lib/python${_MAJOR_VERSION}/*/tests lib/python${_MAJOR_VERSION}/site-packages/*/ " +termux_step_post_get_source() { + mv "$TERMUX_PKG_SRCDIR/python3-defaults-$_DEBPYTHON_COMMIT" "$TERMUX_PKG_SRCDIR/debpython" +} + termux_step_pre_configure() { # -O3 gains some additional performance on at least aarch64. CFLAGS="${CFLAGS/-Oz/-O3}" @@ -68,19 +82,38 @@ termux_step_pre_configure() { LDFLAGS+=" -L$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib" if [ $TERMUX_ARCH = x86_64 ]; then LDFLAGS+=64; fi - if [ "$TERMUX_ON_DEVICE_BUILD" = "true" ]; then - # Python's configure script fails with - # Fatal: you must define __ANDROID_API__ - # if __ANDROID_API__ is not defined. - CPPFLAGS+=" -D__ANDROID_API__=$(getprop ro.build.version.sdk)" - else - TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-build-python=python$_MAJOR_VERSION" + # these prevent errors like "call to undeclared function 'sem_clockwait'" during on-device build + # on devices that have API levels newer than $TERMUX_PKG_API_LEVEL + if [[ "$TERMUX_PKG_API_LEVEL" -lt 28 ]]; then + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_fexecve=no" + fi + + if [[ "$TERMUX_PKG_API_LEVEL" -lt 29 ]]; then + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_getloadavg=no" + fi + + if [[ "$TERMUX_PKG_API_LEVEL" -lt 30 ]]; then + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_sem_clockwait=no" + fi + + if [[ "$TERMUX_PKG_API_LEVEL" -lt 33 ]]; then + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_preadv2=no" + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_pwritev2=no" + fi + + if [[ "$TERMUX_PKG_API_LEVEL" -lt 34 ]]; then + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_close_range=no" + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_copy_file_range=no" fi # For multiprocessing libs export LDFLAGS+=" -landroid-posix-semaphore" export LIBCRYPT_LIBS="-lcrypt" + + sed -i -e "s|@TERMUX_PYTHON_VERSION@|${_MAJOR_VERSION}|g" \ + -e "s|@TERMUX_PKG_FULLVERSION@|$(test ${TERMUX_PACKAGE_FORMAT} = pacman && echo ${TERMUX_PKG_FULLVERSION_FOR_PACMAN} || echo ${TERMUX_PKG_FULLVERSION})|g" \ + $(find "$TERMUX_PKG_SRCDIR/debpython" -type f) } termux_step_post_make_install() { @@ -91,6 +124,14 @@ termux_step_post_make_install() { ln -sf pydoc${_MAJOR_VERSION} pydoc) (cd $TERMUX_PREFIX/share/man/man1 ln -sf python${_MAJOR_VERSION}.1 python.1) + + install -m 755 -d "$TERMUX_PREFIX/lib/python$_MAJOR_VERSION/debpython" + install -m 644 "$TERMUX_PKG_SRCDIR/debpython/debpython/"* \ + "$TERMUX_PREFIX/lib/python$_MAJOR_VERSION/debpython/" + + for prog in py3compile py3clean; do + install -m 755 "$TERMUX_PKG_SRCDIR/debpython/$prog" "$TERMUX_PREFIX/bin/" + done } termux_step_post_massage() { diff --git a/packages/python/debpython.patch b/packages/python/debpython.patch new file mode 100644 index 0000000000..dd00f8be8b --- /dev/null +++ b/packages/python/debpython.patch @@ -0,0 +1,203 @@ +diff --git a/debpython/debpython/__init__.py b/debpython/debpython/__init__.py +index fa6b667..b3b63e1 100644 +--- a/debpython/debpython/__init__.py ++++ b/debpython/debpython/__init__.py +@@ -8,7 +8,7 @@ from subprocess import PIPE, Popen + from pickle import dumps + + log = logging.getLogger(__name__) +-PUBLIC_DIR_RE = re.compile(r'.*?/usr/lib/python(\d(?:.\d+)?)/(site|dist)-packages') ++PUBLIC_DIR_RE = re.compile(r'.*?@TERMUX_PREFIX@/lib/python(\d(?:.\d+)?)/(site|dist)-packages') + + + class memoize: +diff --git a/debpython/debpython/files.py b/debpython/debpython/files.py +index 39ef978..5899a7a 100644 +--- a/debpython/debpython/files.py ++++ b/debpython/debpython/files.py +@@ -48,7 +48,20 @@ def from_package(package_name, extensions=('.py',)): + extensions = tuple(extensions) # .endswith doesn't like list + env = environ.copy() + env["LC_ALL"] = "C.UTF-8" +- process = Popen(('/usr/bin/dpkg', '-L', package_name), stdout=PIPE, ++ env["LD_PRELOAD"] = "" ++ process = Popen(['@TERMUX_PREFIX@/bin/bash', '-c', ++ 'source @TERMUX_PREFIX_CLASSICAL@/bin/termux-setup-package-manager && echo ${TERMUX_APP_PACKAGE_MANAGER}'], ++ stdout=PIPE) ++ termux_app_package_manager = process.communicate()[0].decode()[0:-1] ++ if termux_app_package_manager == "apt": ++ package_manager = "@TERMUX_PREFIX_CLASSICAL@/bin/dpkg" ++ package_manager_list_argument = "-L" ++ elif termux_app_package_manager == "pacman": ++ package_manager = "@TERMUX_PREFIX_CLASSICAL@/bin/pacman" ++ package_manager_list_argument = "-Qql" ++ else: ++ raise Exception(f"cannot determine system package manager ({termux_app_package_manager})!") ++ process = Popen((package_manager, package_manager_list_argument, package_name), stdout=PIPE, + stderr=PIPE, env=env) + stdout, stderr = process.communicate() + if process.returncode != 0: +diff --git a/debpython/debpython/interpreter.py b/debpython/debpython/interpreter.py +index 45b14db..6334661 100644 +--- a/debpython/debpython/interpreter.py ++++ b/debpython/debpython/interpreter.py +@@ -171,16 +171,16 @@ class Interpreter: + #if not version: + # version = Version(DEFAULT) + if self.impl == 'pypy': +- path = '/usr/lib/pypy/dist-packages/' ++ path = '@TERMUX_PREFIX@/lib/pypy/dist-packages/' + elif version << Version('2.6'): +- path = "/usr/lib/python%s/site-packages/" % version ++ path = "@TERMUX_PREFIX@/lib/python%s/site-packages/" % version + elif version << Version('3.0'): +- path = "/usr/lib/python%s/dist-packages/" % version ++ path = "@TERMUX_PREFIX@/lib/python%s/dist-packages/" % version + else: +- path = '/usr/lib/python3/dist-packages/' ++ path = '@TERMUX_PREFIX@/lib/python@TERMUX_PYTHON_VERSION@/site-packages/' + + if gdb: +- path = "/usr/lib/debug%s" % path ++ path = "@TERMUX_PREFIX@/lib/debug%s" % path + if package: + path = "debian/%s%s" % (package, path) + +diff --git a/debpython/debpython/version.py b/debpython/debpython/version.py +index 2d7ed69..f4abf31 100644 +--- a/debpython/debpython/version.py ++++ b/debpython/debpython/version.py +@@ -42,13 +42,8 @@ log = logging.getLogger(__name__) + _supported = environ.get('DEBPYTHON3_SUPPORTED') + _default = environ.get('DEBPYTHON3_DEFAULT') + if not _supported or not _default: +- _config = ConfigParser() +- _config.read('/usr/share/python3/debian_defaults') +- if not _default: +- _default = _config.get('DEFAULT', 'default-version')[6:] +- if not _supported: +- _supported = _config.get('DEFAULT', 'supported-versions')\ +- .replace('python', '') ++ _supported = "@TERMUX_PYTHON_VERSION@" ++ _default = _supported + try: + DEFAULT = tuple(int(i) for i in _default.split('.')) + except Exception: +@@ -257,10 +252,10 @@ def get_requested_versions(vrange=None, available=None): + + if available: + versions = set(v for v in versions +- if exists("/usr/bin/python%d.%d" % v)) ++ if exists("@TERMUX_PREFIX@/bin/python%d.%d" % v)) + elif available is False: + versions = set(v for v in versions +- if not exists("/usr/bin/python%d.%d" % v)) ++ if not exists("@TERMUX_PREFIX@/bin/python%d.%d" % v)) + + return versions + +diff --git a/debpython/py3clean b/debpython/py3clean +index 8e7c3f3..62edeb5 100755 +--- a/debpython/py3clean ++++ b/debpython/py3clean +@@ -1,4 +1,4 @@ +-#! /usr/bin/python3 ++#! @TERMUX_PREFIX@/bin/python@TERMUX_PYTHON_VERSION@ + # vim: et ts=4 sw=4 + + # Copyright © 2010-2012 Piotr Ożarowski +@@ -27,7 +27,7 @@ import sys + from glob import glob + from os import environ, remove, rmdir + from os.path import dirname, basename, exists, join, splitext +-sys.path.insert(1, '/usr/share/python3/') ++sys.path.insert(1, '@TERMUX_PREFIX@/lib/python@TERMUX_PYTHON_VERSION@/') + from debpython import files as dpf + from debpython.interpreter import Interpreter + from debpython.version import SUPPORTED, getver, vrepr +@@ -156,13 +156,13 @@ def destroyer(magic_tag=None): # ;-) + + def main(): + usage = '%prog [-V VERSION] [-p PACKAGE] [DIR_OR_FILE]' +- parser = optparse.OptionParser(usage, version='%prog DEVELV') ++ parser = optparse.OptionParser(usage, version='%prog @TERMUX_PKG_FULLVERSION@') + parser.add_option('-v', '--verbose', action='store_true', dest='verbose', + help='turn verbose mode on') + parser.add_option('-q', '--quiet', action='store_false', dest='verbose', + default=False, help='be quiet') + parser.add_option('-p', '--package', +- help='specify Debian package name to clean') ++ help='specify Termux package name to clean') + parser.add_option('-V', dest='version', + help='specify Python version to clean') + +diff --git a/debpython/py3compile b/debpython/py3compile +index 14cbf4e..f2b0fed 100755 +--- a/debpython/py3compile ++++ b/debpython/py3compile +@@ -1,4 +1,4 @@ +-#! /usr/bin/python3 ++#! @TERMUX_PREFIX@/bin/python@TERMUX_PYTHON_VERSION@ + # vim: et ts=4 sw=4 + + # Copyright © 2010-2012 Piotr Ożarowski +@@ -30,7 +30,7 @@ import sys + from os import environ, listdir, mkdir + from os.path import dirname, exists, isdir, join + from subprocess import PIPE, Popen +-sys.path.insert(1, '/usr/share/python3/') ++sys.path.insert(1, '@TERMUX_PREFIX@/lib/python@TERMUX_PYTHON_VERSION@/') + from debpython.version import SUPPORTED, debsorted, vrepr, \ + get_requested_versions, parse_vrange, getver + from debpython import files as dpf, PUBLIC_DIR_RE, memoize +@@ -56,7 +56,7 @@ Examples: + + ### EXCLUDES ################################################### + @memoize +-def get_exclude_patterns_from_dir(name='/usr/share/python3/bcep/'): ++def get_exclude_patterns_from_dir(name='@TERMUX_PREFIX@/share/python3/bcep/'): + """Return patterns for files that shouldn't be bytecompiled.""" + if not isdir(name): + return [] +@@ -156,7 +156,7 @@ def filter_files(files, e_patterns, compile_versions): + def py_compile(version, optimize, workers): + if not isinstance(version, str): + version = vrepr(version) +- cmd = ["/usr/bin/python" + version] ++ cmd = ["@TERMUX_PREFIX@/bin/python" + version] + if optimize: + cmd.append("-O") + cmd += ["-m", "py_compile", "-"] +@@ -224,7 +224,7 @@ def compile(files, versions, force, optimize, e_patterns=None): + def main(): + usage = '%prog [-V [X.Y][-][A.B]] DIR_OR_FILE [-X REGEXPR]\n' +\ + ' %prog -p PACKAGE' +- parser = optparse.OptionParser(usage, version='%prog DEVELV', ++ parser = optparse.OptionParser(usage, version='%prog @TERMUX_PKG_FULLVERSION@', + option_class=Option) + parser.add_option('-v', '--verbose', action='store_true', dest='verbose', + help='turn verbose mode on') +@@ -236,7 +236,7 @@ def main(): + parser.add_option('-O', action='store_true', dest='optimize', + default=False, help="byte-compile to .pyo files") + parser.add_option('-p', '--package', +- help='specify Debian package name whose files should be bytecompiled') ++ help='specify Termux package name whose files should be bytecompiled') + parser.add_option('-V', type='version_range', dest='vrange', + help="""force private modules to be bytecompiled + with Python version from given range, regardless of the default Python version +@@ -262,12 +262,12 @@ You may use this option multiple times to build up a list of things to exclude.' + + if options.regexpr and not args: + parser.error('--exclude option works with private directories ' +- 'only, please use /usr/share/python3/bcep to specify ' ++ 'only, please use @TERMUX_PREFIX@/share/python3/bcep to specify ' + 'public modules to skip') + + if options.vrange and options.vrange[0] == options.vrange[1] and\ + options.vrange != (None, None) and\ +- exists("/usr/bin/python%d.%d" % options.vrange[0]): ++ exists("@TERMUX_PREFIX@/bin/python%d.%d" % options.vrange[0]): + # specific version requested, use it even if it's not in SUPPORTED + versions = {options.vrange[0]} + else: diff --git a/packages/python/python-tkinter.subpackage.sh b/packages/python/python-tkinter.subpackage.sh index 45364d3713..e6405571aa 100644 --- a/packages/python/python-tkinter.subpackage.sh +++ b/packages/python/python-tkinter.subpackage.sh @@ -7,7 +7,6 @@ lib/python${_MAJOR_VERSION}/tkinter lib/python${_MAJOR_VERSION}/turtle.py lib/python${_MAJOR_VERSION}/turtledemo lib/python${_MAJOR_VERSION}/lib-dynload/_tkinter.*.so -lib/python${_MAJOR_VERSION}/__pycache__/turtle.*.pyc " TERMUX_SUBPKG_BREAKS="python (<< 3.11.1-3)" TERMUX_SUBPKG_REPLACES="python (<< 3.11.1-3)" diff --git a/packages/rdiff-backup/build.sh b/packages/rdiff-backup/build.sh index 904ec346c6..c0d0d6d088 100644 --- a/packages/rdiff-backup/build.sh +++ b/packages/rdiff-backup/build.sh @@ -3,22 +3,14 @@ TERMUX_PKG_DESCRIPTION="A utility for local/remote mirroring and incremental bac TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="2.2.6" -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/rdiff-backup/rdiff-backup/releases/download/v${TERMUX_PKG_VERSION/\~/}/rdiff-backup-${TERMUX_PKG_VERSION/\~/}.tar.gz TERMUX_PKG_SHA256=d0778357266bc6513bb7f75a4570b29b24b2760348bbf607babfc3a6f09458cf TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_DEPENDS="librsync, python" +TERMUX_PKG_DEPENDS="librsync, python, python-pip" TERMUX_PKG_PYTHON_COMMON_DEPS="wheel" TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { continue } - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install pyyaml - EOF -} diff --git a/packages/rdircd/build.sh b/packages/rdircd/build.sh index cbe13f863e..8f5848bbf0 100644 --- a/packages/rdircd/build.sh +++ b/packages/rdircd/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="WTFPL" TERMUX_PKG_MAINTAINER="@termux" _COMMIT=026f1aef9857ae6ce06bfb00860898e6113adfc0 TERMUX_PKG_VERSION=2023.02.07 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=git+https://github.com/mk-fg/reliable-discord-client-irc-daemon TERMUX_PKG_SHA256=c2cc88d6e1616d27f6f7849d536ba7613c7f13f0d16cac6022f9b1952ad537e2 TERMUX_PKG_AUTO_UPDATE=false @@ -34,11 +34,3 @@ termux_step_post_get_source() { termux_step_make_install() { install -Dm700 -t $TERMUX_PREFIX/bin rdircd } - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS} - EOF -} diff --git a/packages/sabnzbd/build.sh b/packages/sabnzbd/build.sh index 26b4436f2b..e8b64f6f05 100644 --- a/packages/sabnzbd/build.sh +++ b/packages/sabnzbd/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0, GPL-3.0" TERMUX_PKG_LICENSE_FILE="LICENSE.txt, GPL2.txt, GPL3.txt" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="4.5.5" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/sabnzbd/sabnzbd/releases/download/${TERMUX_PKG_VERSION}/SABnzbd-${TERMUX_PKG_VERSION}-src.tar.gz TERMUX_PKG_SHA256=7f93d714287293f519f244b92d8eb727aa504448c5961dab8420e2093f92e3b7 TERMUX_PKG_AUTO_UPDATE=true @@ -38,11 +39,3 @@ termux_step_make_install() { install -Dm700 SABnzbd.py "${TERMUX_PREFIX}/bin/sabnzbd" install -Dm600 linux/sabnzbd.bash-completion "${TERMUX_PREFIX}/share/bash-completion/completions/sabnzbd" } - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / } - EOF -} diff --git a/packages/srt2vobsub/build.sh b/packages/srt2vobsub/build.sh index 00a11c78c5..ac946b0b61 100644 --- a/packages/srt2vobsub/build.sh +++ b/packages/srt2vobsub/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A command-line tool that generates a pair of .idx/.sub s TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.0 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_REVISION=7 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/srt2vobsub/srt2vobsub-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=5f59319b300dc8629adf6debf94529f3f71ad8cc34bad5ead53a3cfc8d613c12 TERMUX_PKG_DEPENDS="bdsup2sub, ffmpeg, fontconfig-utils, imagemagick, mediainfo, python, python-pip" @@ -17,11 +17,3 @@ termux_step_make_install() { install -Dm600 -t $TERMUX_PREFIX/share/doc/$TERMUX_PKG_NAME \ README defaults.conf langcodes.txt srt2vobsub.html } - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / } - EOF -} diff --git a/packages/termux-gui-package/build.sh b/packages/termux-gui-package/build.sh index f4947caec0..1952e0251f 100644 --- a/packages/termux-gui-package/build.sh +++ b/packages/termux-gui-package/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A Termux package containing utilities for Termux:GUI" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@tareksander" TERMUX_PKG_VERSION="0.1.6" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_DEPENDS="python, python-pip" TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_BUILD_IN_SRC=true @@ -12,11 +12,3 @@ TERMUX_PKG_SHA256="79a231f6550bde39c0bdd4eca0fce91b21df9c817345072c4859567437e48 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag" TERMUX_PKG_PYTHON_TARGET_DEPS="termuxgui" - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!${TERMUX_PREFIX}/bin/sh - echo "Installing python bindings for Termux:GUI" - pip3 install --upgrade $TERMUX_PKG_PYTHON_TARGET_DEPS - EOF -} diff --git a/packages/termux-gui-pm/build.sh b/packages/termux-gui-pm/build.sh index dc7c7bea16..571de1daf6 100644 --- a/packages/termux-gui-pm/build.sh +++ b/packages/termux-gui-pm/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A graphical package manager for various package formats TERMUX_PKG_LICENSE="MPL-2.0" TERMUX_PKG_MAINTAINER="@tareksander" TERMUX_PKG_VERSION="1.0.0" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_DEPENDS="python, python-pip" TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_BUILD_IN_SRC=true @@ -12,11 +12,3 @@ TERMUX_PKG_SHA256="3a5a829b721d17f2002406571852e63d1984acc9732e58f2f76a296638129 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag" TERMUX_PKG_PYTHON_TARGET_DEPS="termuxgui" - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!${TERMUX_PREFIX}/bin/sh - echo "Installing python bindings for Termux:GUI" - pip3 install --upgrade $TERMUX_PKG_PYTHON_TARGET_DEPS - EOF -} diff --git a/packages/units/build.sh b/packages/units/build.sh index 80498de23d..f2bd6d9576 100644 --- a/packages/units/build.sh +++ b/packages/units/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Converts between different systems of units" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="2.25" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/units/units-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=36edf43ac00b4d6304baea91387e65ab05118bf65c921f73d3b08828e5a6ec0b TERMUX_PKG_DEPENDS="readline, libandroid-support" diff --git a/packages/units/units-cur.subpackage.sh b/packages/units/units-cur.subpackage.sh index 3e59112e80..d0bb0b4b9b 100644 --- a/packages/units/units-cur.subpackage.sh +++ b/packages/units/units-cur.subpackage.sh @@ -6,11 +6,4 @@ TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true TERMUX_SUBPKG_DEPENDS="python, python-pip" TERMUX_SUBPKG_BREAKS="units (<< 2.22)" TERMUX_SUBPKG_REPLACES="units (<< 2.22)" - -termux_step_create_subpkg_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install requests - EOF -} +TERMUX_SUBPKG_PYTHON_RUNTIME_DEPS="requests" diff --git a/packages/yt-dlp-ejs/build.sh b/packages/yt-dlp-ejs/build.sh index 6835e8c853..c6c7a0862f 100644 --- a/packages/yt-dlp-ejs/build.sh +++ b/packages/yt-dlp-ejs/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="External JavaScript for yt-dlp supporting many runtimes" TERMUX_PKG_LICENSE="Unlicense" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="0.3.2" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://github.com/yt-dlp/ejs/releases/download/$TERMUX_PKG_VERSION/yt_dlp_ejs-$TERMUX_PKG_VERSION.tar.gz" TERMUX_PKG_SHA256=31a41292799992bdc913e03c9fac2a8c90c82a5cbbc792b2e3373b01da841e3e TERMUX_PKG_PYTHON_COMMON_DEPS="build, hatchling, hatch-vcs" @@ -22,5 +23,5 @@ termux_step_make() { termux_step_make_install() { local _whl="yt_dlp_ejs-$TERMUX_PKG_VERSION-py3-none-any.whl" - pip install --no-deps --prefix="$TERMUX_PREFIX" "$TERMUX_PKG_SRCDIR/dist/$_whl" + pip install --force-reinstall --no-deps --prefix="$TERMUX_PREFIX" "$TERMUX_PKG_SRCDIR/dist/$_whl" } diff --git a/packages/yt-dlp-ejs/no-frozen-lockfile.patch b/packages/yt-dlp-ejs/no-frozen-lockfile.patch new file mode 100644 index 0000000000..cc32c96332 --- /dev/null +++ b/packages/yt-dlp-ejs/no-frozen-lockfile.patch @@ -0,0 +1,14 @@ +Avoids error: +ERR_PNPM_OUTDATED_LOCKFILE Cannot install with "frozen-lockfile" because pnpm-lock.yaml is not up to date with /package.json + +--- a/pnpm.py ++++ b/pnpm.py +@@ -21,7 +21,7 @@ class CustomBuildHook(BuildHookInterface): + ) + print(f"Building with {name}...") + +- pnpm(["install", "--frozen-lockfile"]) ++ pnpm(["install"]) + pnpm(["run", "bundle"]) + + build_data["force_include"].update( diff --git a/packages/ytui-music/build.sh b/packages/ytui-music/build.sh index 49db8c9ba2..247f4afe61 100644 --- a/packages/ytui-music/build.sh +++ b/packages/ytui-music/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Youtube client in terminal for music" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.0.0-beta -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/sudipghimire533/ytui-music/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=43deb6b3cb9eb836b7122ac2542106f46519f240f99a0af67eecdfa5b200cca7 -TERMUX_PKG_DEPENDS="libsqlite, mpv, openssl, python-pip, python-yt-dlp" +TERMUX_PKG_DEPENDS="libsqlite, mpv, openssl, python-yt-dlp" TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { diff --git a/root-packages/frida/build.sh b/root-packages/frida/build.sh index 8227483c87..6af5c97f82 100644 --- a/root-packages/frida/build.sh +++ b/root-packages/frida/build.sh @@ -6,7 +6,7 @@ _MAJOR_VERSION=17 _MINOR_VERSION=2 _MICRO_VERSION=14 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.${_MINOR_VERSION}.${_MICRO_VERSION} -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_GIT_BRANCH=$TERMUX_PKG_VERSION TERMUX_PKG_SRCURL=git+https://github.com/frida/frida TERMUX_PKG_AUTO_UPDATE=false diff --git a/root-packages/frida/frida-python.subpackage.sh b/root-packages/frida/frida-python.subpackage.sh index 63379d8a84..398d55918b 100644 --- a/root-packages/frida/frida-python.subpackage.sh +++ b/root-packages/frida/frida-python.subpackage.sh @@ -22,9 +22,4 @@ share/fish TERMUX_SUBPKG_DEPENDS="libandroid-support, python, python-pip" TERMUX_SUBPKG_CONFLICTS="frida-tools (<< 15.1.24)" TERMUX_SUBPKG_REPLACES="frida-tools (<< 15.1.24)" - -# See install_requires in https://github.com/frida/frida-tools/blob/main/setup.py -termux_step_create_subpkg_debscripts() { - echo "#!$TERMUX_PREFIX/bin/sh" > postinst - echo "pip${TERMUX_PYTHON_VERSION} install 'prompt-toolkit>=2.0.0,<4.0.0' 'colorama>=0.2.7,<1.0.0' 'pygments>=2.0.2,<3.0.0' 'websockets>=13.0.0,<14.0.0'" >> postinst -} +TERMUX_SUBPKG_PYTHON_RUNTIME_DEPS="'prompt-toolkit>=2.0.0,<4.0.0', 'colorama>=0.2.7,<1.0.0', 'pygments>=2.0.2,<3.0.0', 'websockets>=13.0.0,<14.0.0'" diff --git a/x11-packages/audiotube/build.sh b/x11-packages/audiotube/build.sh index f5731df30c..30d17f52e8 100644 --- a/x11-packages/audiotube/build.sh +++ b/x11-packages/audiotube/build.sh @@ -3,10 +3,11 @@ TERMUX_PKG_DESCRIPTION="AudioTube can search YouTube Music, list albums and arti TERMUX_PKG_LICENSE="GPL-2.0-or-later, LGPL-2.0-or-later" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="25.12.1" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://download.kde.org/stable/release-service/${TERMUX_PKG_VERSION}/src/audiotube-${TERMUX_PKG_VERSION}.tar.xz" TERMUX_PKG_SHA256=5549c2adcf877bf768776a4ffc83945a76a519a422b337758b4afa96f9c17ca7 TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_DEPENDS="futuresql, gst-plugins-bad, gst-plugins-good, gst-plugins-ugly, kf6-kcoreaddons, kf6-kcrash, kf6-ki18n, kf6-kiconthemes, kf6-kirigami, kf6-kwindowsystem, kf6-purpose, kirigami-addons, libc++, python, qt6-qtbase, qt6-qtdeclarative, qt6-qtimageformats, qt6-qtmultimedia, qt6-qtsvg, python-yt-dlp" +TERMUX_PKG_DEPENDS="futuresql, gst-plugins-bad, gst-plugins-good, gst-plugins-ugly, kf6-kcoreaddons, kf6-kcrash, kf6-ki18n, kf6-kiconthemes, kf6-kirigami, kf6-kwindowsystem, kf6-purpose, kirigami-addons, libc++, python, python-pip, qt6-qtbase, qt6-qtdeclarative, qt6-qtimageformats, qt6-qtmultimedia, qt6-qtsvg, python-yt-dlp" TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules, pybind11, qcoro, qcoro-static" TERMUX_PKG_PYTHON_COMMON_DEPS="ytmusicapi" TERMUX_PKG_PYTHON_TARGET_DEPS="ytmusicapi" @@ -17,11 +18,3 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DBUILD_WITH_QT6=ON -DPYBIND11_USE_CROSSCOMPILING=ON " - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / } - EOF -} diff --git a/x11-packages/cinnamon-control-center/build.sh b/x11-packages/cinnamon-control-center/build.sh index c85597c9fd..cc6cd4d05c 100644 --- a/x11-packages/cinnamon-control-center/build.sh +++ b/x11-packages/cinnamon-control-center/build.sh @@ -3,11 +3,12 @@ TERMUX_PKG_DESCRIPTION="Cinnamon control center" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="6.6.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://github.com/linuxmint/cinnamon-control-center/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SHA256=2de5fbc5a9fcc2e1dad9c595dfb1d9047ff885d391f45d6ffe8b6711bb4e24e4 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+\.\d+\.\d+$" -TERMUX_PKG_DEPENDS="glib, gtk3, libgnomekbd, libnotify, libx11, libxklavier, upower, cinnamon-desktop, cinnamon-menus, cinnamon-settings-daemon" +TERMUX_PKG_DEPENDS="glib, gtk3, libgnomekbd, libnotify, libx11, libxklavier, python-pip, upower, cinnamon-desktop, cinnamon-menus, cinnamon-settings-daemon" TERMUX_PKG_BUILD_DEPENDS="glib-cross" TERMUX_PKG_PYTHON_TARGET_DEPS="setproctitle" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" @@ -25,11 +26,3 @@ termux_step_pre_configure() { export TERMUX_MESON_ENABLE_SOVERSION=1 } - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install $TERMUX_PKG_PYTHON_TARGET_DEPS - EOF -} diff --git a/x11-packages/cinnamon-session/build.sh b/x11-packages/cinnamon-session/build.sh index de2b3538fc..9c96ee6629 100644 --- a/x11-packages/cinnamon-session/build.sh +++ b/x11-packages/cinnamon-session/build.sh @@ -3,11 +3,12 @@ TERMUX_PKG_DESCRIPTION="The Cinnamon session manager" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="6.6.1" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://github.com/linuxmint/cinnamon-session/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SHA256=faa9dd42aceab2ed9c20c085c6a162b5171c1d3b6d921caa6252ad8330e87d90 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+\.\d+\.\d+$" -TERMUX_PKG_DEPENDS="glib, libcanberra, gtk3, pango, libx11, libsm, libice, libxext, libxau, libxcomposite, cinnamon-desktop, opengl, dbus-python, keybinder, xapp" +TERMUX_PKG_DEPENDS="glib, libcanberra, gtk3, pango, python-pip, libx11, libsm, libice, libxext, libxau, libxcomposite, cinnamon-desktop, opengl, dbus-python, keybinder, xapp" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, glib-cross" TERMUX_PKG_VERSIONED_GIR=false TERMUX_PKG_PYTHON_TARGET_DEPS="psutil, pyinotify, pyinotify-elephant-fork" @@ -22,11 +23,3 @@ termux_step_pre_configure() { export TERMUX_MESON_ENABLE_SOVERSION=1 } - -termux_step_create_debscripts() { - cat <<-EOF >./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / } - EOF -} diff --git a/x11-packages/cinnamon/build.sh b/x11-packages/cinnamon/build.sh index ed06ebdcfe..42a21d9063 100644 --- a/x11-packages/cinnamon/build.sh +++ b/x11-packages/cinnamon/build.sh @@ -3,12 +3,14 @@ TERMUX_PKG_DESCRIPTION="Cinnamon shell" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="6.6.2" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://github.com/linuxmint/cinnamon/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SHA256=b566d4ef406d1600a34cb6930c09160fec9dffe2f3d011bdf36b11f18df190a5 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+\.\d+\.\d+" -TERMUX_PKG_DEPENDS="atk, cinnamon-control-center, cinnamon-menus, cinnamon-session, cinnamon-settings-daemon, cjs, clutter, clutter-gtk, cogl, dbus, gcr, gdk-pixbuf, gettext, glib, gnome-backgrounds, gobject-introspection, gsound, gtk3, ibus, libadapta, libx11, libxml2, mint-themes, mint-y-icon-theme, muffin, nemo, opengl, pango, python-pillow, python-xapp, sassc, xapp" +TERMUX_PKG_DEPENDS="atk, cinnamon-control-center, cinnamon-menus, cinnamon-session, cinnamon-settings-daemon, cjs, clutter, clutter-gtk, cogl, dbus, gcr, gdk-pixbuf, gettext, glib, gnome-backgrounds, gobject-introspection, gsound, gtk3, ibus, libadapta, libx11, libxml2, mint-themes, mint-y-icon-theme, muffin, nemo, opengl, pango, python-pillow, python-pip, python-xapp, sassc, xapp" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, glib-cross, intltool, python-libsass" +TERMUX_PKG_PYTHON_RUNTIME_DEPS="pytz, tinycss2, requests" TERMUX_PKG_SUGGESTS="gnome-terminal, gnome-screenshot" TERMUX_PKG_PYTHON_BUILD_DEPS="pysass" TERMUX_PKG_VERSIONED_GIR=false @@ -21,6 +23,13 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dpolkit=false " +termux_step_post_get_source() { + find "$TERMUX_PKG_SRCDIR" -type f | \ + xargs -n 1 sed -i \ + -e "s|/usr|$TERMUX_PREFIX|g" \ + -e "s|#!$TERMUX_PREFIX|#!/usr|g" +} + termux_step_pre_configure() { termux_setup_gir termux_setup_glib_cross_pkg_config_wrapper @@ -57,11 +66,3 @@ termux_step_post_make_install() { mkdir -p "$styles_dir" install -Dm644 "$TERMUX_PKG_BUILDER_DIR/22_termux.styles" "$styles_dir/22_termux.styles" } - -termux_step_create_debscripts() { - cat <<-EOF >./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install pytz tinycss2 requests - EOF -} diff --git a/x11-packages/inkscape/inkscape-extensions.subpackage.sh b/x11-packages/inkscape/inkscape-extensions.subpackage.sh index 92180e2029..6e61321717 100644 --- a/x11-packages/inkscape/inkscape-extensions.subpackage.sh +++ b/x11-packages/inkscape/inkscape-extensions.subpackage.sh @@ -2,11 +2,4 @@ TERMUX_SUBPKG_INCLUDE="share/inkscape/extensions" TERMUX_SUBPKG_DESCRIPTION="Inkscape extensions" TERMUX_SUBPKG_DEPENDS="python, python-numpy, python-pip, python-lxml" TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true - -termux_step_create_subpkg_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install scour - EOF -} +TERMUX_SUBPKG_PYTHON_RUNTIME_DEPS="scour" diff --git a/x11-packages/kf6-breeze-icons/build.sh b/x11-packages/kf6-breeze-icons/build.sh index 14e74cea9d..41f7b01d06 100644 --- a/x11-packages/kf6-breeze-icons/build.sh +++ b/x11-packages/kf6-breeze-icons/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION='Breeze icon theme' TERMUX_PKG_LICENSE="GPL-3.0, LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="6.22.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/breeze-icons-${TERMUX_PKG_VERSION}.tar.xz" TERMUX_PKG_SHA256=4239c49740b9e67096034224fa63d1a80c7e1b4b53ba5b381b2c2ef5b680930f TERMUX_PKG_DEPENDS="qt6-qtbase" @@ -32,12 +33,14 @@ termux_step_host_build() { cmake --build build mv CMakeLists.txt.bak CMakeLists.txt popd + + cp "$TERMUX_PKG_SRCDIR"/tools/build/{generate-symbolic-dark,qrcAlias} "$TERMUX_PKG_HOSTBUILD_DIR/" } termux_step_pre_configure() { # this is a workaround for build-all.sh issue TERMUX_PKG_DEPENDS+=", kf6-breeze-icons-data" - sed -e 's|$|'"$TERMUX_PKG_SRCDIR"'/tools/build/generate-symbolic-dark|' -i icons/CMakeLists.txt - sed -e 's|$ -o|'"$TERMUX_PKG_SRCDIR"'/tools/build/qrcAlias -o|' -i icons/CMakeLists.txt + sed -e 's|$|'"$TERMUX_PKG_HOSTBUILD_DIR"'/generate-symbolic-dark|' -i icons/CMakeLists.txt + sed -e 's|$ -o|'"$TERMUX_PKG_HOSTBUILD_DIR"'/qrcAlias -o|' -i icons/CMakeLists.txt } diff --git a/packages/libncnn/CMakeLists.txt.patch b/x11-packages/libncnn/CMakeLists.txt.patch similarity index 100% rename from packages/libncnn/CMakeLists.txt.patch rename to x11-packages/libncnn/CMakeLists.txt.patch diff --git a/packages/libncnn/build.sh b/x11-packages/libncnn/build.sh similarity index 95% rename from packages/libncnn/build.sh rename to x11-packages/libncnn/build.sh index 697a7a9ead..b23c61334e 100644 --- a/packages/libncnn/build.sh +++ b/x11-packages/libncnn/build.sh @@ -3,12 +3,12 @@ TERMUX_PKG_DESCRIPTION="A high-performance neural network inference framework op TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="20250503" -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/Tencent/ncnn/releases/download/${TERMUX_PKG_VERSION}/ncnn-${TERMUX_PKG_VERSION}-full-source.zip TERMUX_PKG_SHA256=b3190d1b6beae3aac30fa99f4d3fd89a2b47a010b888d2d2389189784743a690 TERMUX_PKG_AUTO_UPDATE=false -TERMUX_PKG_DEPENDS="abseil-cpp, glslang, libc++, libandroid-stub, libprotobuf, vulkan-loader" -TERMUX_PKG_BUILD_DEPENDS="python, vulkan-headers, vulkan-loader-android" +TERMUX_PKG_DEPENDS="abseil-cpp, glslang, libc++, libandroid-stub, libprotobuf, python-pip, python-numpy, python-opencv-python, vulkan-loader" +TERMUX_PKG_BUILD_DEPENDS="vulkan-headers, vulkan-loader-android" TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, pybind11" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/libncnn/examples_CMakeLists.txt.patch b/x11-packages/libncnn/examples_CMakeLists.txt.patch similarity index 100% rename from packages/libncnn/examples_CMakeLists.txt.patch rename to x11-packages/libncnn/examples_CMakeLists.txt.patch diff --git a/packages/libncnn/python_CMakeLists.txt.patch b/x11-packages/libncnn/python_CMakeLists.txt.patch similarity index 100% rename from packages/libncnn/python_CMakeLists.txt.patch rename to x11-packages/libncnn/python_CMakeLists.txt.patch diff --git a/packages/libncnn/src_platform.h.in.patch b/x11-packages/libncnn/src_platform.h.in.patch similarity index 100% rename from packages/libncnn/src_platform.h.in.patch rename to x11-packages/libncnn/src_platform.h.in.patch diff --git a/packages/libncnn/tools_CMakeLists.txt.patch b/x11-packages/libncnn/tools_CMakeLists.txt.patch similarity index 100% rename from packages/libncnn/tools_CMakeLists.txt.patch rename to x11-packages/libncnn/tools_CMakeLists.txt.patch diff --git a/packages/libncnn/use-cross-protoc.patch b/x11-packages/libncnn/use-cross-protoc.patch similarity index 100% rename from packages/libncnn/use-cross-protoc.patch rename to x11-packages/libncnn/use-cross-protoc.patch diff --git a/x11-packages/meld/build.sh b/x11-packages/meld/build.sh index 75018c2482..5aedc45eda 100644 --- a/x11-packages/meld/build.sh +++ b/x11-packages/meld/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A visual diff and merge tool targeted at developers" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="3.23.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/meld/${TERMUX_PKG_VERSION%.*}/meld-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=983c2a4240e025a2109c7738198710e9d6b063c910b048332d14690cf538c2a6 TERMUX_PKG_AUTO_UPDATE=true @@ -11,6 +12,7 @@ TERMUX_PKG_DEPENDS="gsettings-desktop-schemas, glib, gtk3, gtksourceview4, libca TERMUX_PKG_BUILD_DEPENDS="gettext" # build dependency only TERMUX_PKG_PYTHON_TARGET_DEPS="itstool" +TERMUX_PKG_PYTHON_RUNTIME_DEPS=false TERMUX_MESON_WHEEL_CROSSFILE="$TERMUX_PKG_TMPDIR/wheel-cross-file.txt" TERMUX_PKG_SETUP_PYTHON=true TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/x11-packages/orca/build.sh b/x11-packages/orca/build.sh index 2552a9cda4..42f7bb2a2b 100644 --- a/x11-packages/orca/build.sh +++ b/x11-packages/orca/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A free, open source, flexible, and extensible screen rea TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="49.5" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/orca/${TERMUX_PKG_VERSION%.*}/orca-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=53df41558319e97c1e84ad604989957a02b5d0ff531419190f0587ea6b256034 TERMUX_PKG_AUTO_UPDATE=true @@ -41,11 +42,3 @@ termux_step_configure() { termux_step_configure_meson } - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / } - EOF -} diff --git a/x11-packages/pyqt5/build.sh b/x11-packages/pyqt5/build.sh index 18b1ce0c1f..57db7cd1e3 100644 --- a/x11-packages/pyqt5/build.sh +++ b/x11-packages/pyqt5/build.sh @@ -3,12 +3,15 @@ TERMUX_PKG_DESCRIPTION="Comprehensive Python Bindings for Qt v5" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="5.15.11" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://files.pythonhosted.org/packages/source/P/PyQt5/PyQt5-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=fda45743ebb4a27b4b1a51c6d8ef455c4c1b5d610c90d2934c7802b5c1557c52 TERMUX_PKG_DEPENDS="libc++, python, qt5-qtbase, qt5-qtdeclarative, qt5-qtlocation, qt5-qtmultimedia, qt5-qtsensors, qt5-qtsvg, qt5-qttools, qt5-qtwebchannel, qt5-qtwebsockets, qt5-qtx11extras, qt5-qtxmlpatterns, python-pip" TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools, qt5-qtdeclarative-cross-tools, qt5-qttools-cross-tools" -TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, 'sip>=6.6.2,<7', 'PyQt-builder>=1.14.1,<2'" +# sip version 6.13 has this error: +# AttributeError: 'ScopedName' object has no attribute 'types' +# if that error disappears in the future, sip can be unpinned +TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, 'sip>=6.6.2,<6.13.0', 'PyQt-builder>=1.14.1,<2'" TERMUX_PKG_PYTHON_TARGET_DEPS="'PyQt5-sip>=12.13,<13'" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_MAKE_ARGS=" @@ -67,11 +70,3 @@ termux_step_make_install() { chmod 0700 "${t}" done } - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip3 install $TERMUX_PKG_PYTHON_TARGET_DEPS - EOF -} diff --git a/x11-packages/python-opencv-python/build.sh b/x11-packages/python-opencv-python/build.sh index 2689230be2..2ad69372f3 100644 --- a/x11-packages/python-opencv-python/build.sh +++ b/x11-packages/python-opencv-python/build.sh @@ -3,10 +3,11 @@ TERMUX_PKG_DESCRIPTION="Python wrapper for Python bindings for OpenCV" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="88" +TERMUX_PKG_REVISION=1 TERMUX_PKG_REPOLOGY_METADATA_VERSION="$(. "$TERMUX_SCRIPTDIR/x11-packages/opencv/build.sh"; echo "$TERMUX_PKG_VERSION").${TERMUX_PKG_VERSION}" TERMUX_PKG_SRCURL="https://github.com/opencv/opencv-python/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SHA256=c1cfdef91a45468b1c4404af594e2286ce2bcd343fe318aae287997a395a6c90 -TERMUX_PKG_DEPENDS="opencv, opencv-python, python" +TERMUX_PKG_DEPENDS="opencv, opencv-python, python, python-pip" TERMUX_PKG_PYTHON_COMMON_DEPS="scikit-build" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true diff --git a/x11-packages/python-pyqtwebengine/build.sh b/x11-packages/python-pyqtwebengine/build.sh index 8a43c18270..ee3d7798bf 100644 --- a/x11-packages/python-pyqtwebengine/build.sh +++ b/x11-packages/python-pyqtwebengine/build.sh @@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="Python Bindings for the Qt WebEngine Framework" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="5.15.7" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://files.pythonhosted.org/packages/source/P/PyQtWebEngine/PyQtWebEngine-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=f121ac6e4a2f96ac289619bcfc37f64e68362f24a346553f5d6c42efa4228a4d -TERMUX_PKG_DEPENDS="libc++, pyqt5, python, qt5-qtbase, qt5-qtwebengine" +TERMUX_PKG_DEPENDS="libc++, pyqt5, python, python-pip, qt5-qtbase, qt5-qtwebengine" TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools" TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, PyQt-builder" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/x11-packages/python-qscintilla/build.sh b/x11-packages/python-qscintilla/build.sh index 72efc32b19..8a2c205389 100644 --- a/x11-packages/python-qscintilla/build.sh +++ b/x11-packages/python-qscintilla/build.sh @@ -4,10 +4,10 @@ TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" # Align the version with `qscintilla` package. TERMUX_PKG_VERSION=2.14.1 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://www.riverbankcomputing.com/static/Downloads/QScintilla/${TERMUX_PKG_VERSION}/QScintilla_src-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=dfe13c6acc9d85dfcba76ccc8061e71a223957a6c02f3c343b30a9d43a4cdd4d -TERMUX_PKG_DEPENDS="libc++, pyqt5, python, qscintilla (>= ${TERMUX_PKG_VERSION}), qt5-qtbase" +TERMUX_PKG_DEPENDS="libc++, pyqt5, python, python-pip, qscintilla (>= ${TERMUX_PKG_VERSION}), qt5-qtbase" TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools" TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, PyQt-builder" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/x11-packages/xfce4-panel-profiles/build.sh b/x11-packages/xfce4-panel-profiles/build.sh index d5f0e73015..1db4e5e559 100644 --- a/x11-packages/xfce4-panel-profiles/build.sh +++ b/x11-packages/xfce4-panel-profiles/build.sh @@ -3,11 +3,11 @@ TERMUX_PKG_DESCRIPTION="A simple application to manage Xfce panel layouts." TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.1.1" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://archive.xfce.org/src/apps/xfce4-panel-profiles/${TERMUX_PKG_VERSION%.*}/xfce4-panel-profiles-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=0126373a03778bb4894afa151de28d36bfc563ddab96d3bd7c63962350d34ba2 TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_DEPENDS="gtk3, libxfce4ui, libxfce4util, pygobject, python, xfce4-panel" +TERMUX_PKG_DEPENDS="gtk3, libxfce4ui, libxfce4util, pygobject, python, python-pip, xfce4-panel" TERMUX_PKG_PYTHON_TARGET_DEPS="psutil" TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_BUILD_IN_SRC=true @@ -27,11 +27,3 @@ termux_step_configure() { -e s,@COPYRIGHT_YEAR@,2025,g \ xfce4-panel-profiles.1.in > xfce4-panel-profiles.1 } - -termux_step_create_debscripts() { - cat <<- EOF > ./postinst - #!$TERMUX_PREFIX/bin/sh - echo "Installing dependencies through pip..." - pip install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / } - EOF -}