diff --git a/packages/calcurse/build.sh b/packages/calcurse/build.sh index f0bf0a9667..9d10e6ed10 100644 --- a/packages/calcurse/build.sh +++ b/packages/calcurse/build.sh @@ -3,7 +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.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://calcurse.org/files/calcurse-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=48a736666cc4b6b53012d73b3aa70152c18b41e6c7b4807fab0f168d645ae32c TERMUX_PKG_DEPENDS="libandroid-support, ncurses" diff --git a/packages/calcurse/calcurse-caldav.subpackage.sh b/packages/calcurse/calcurse-caldav.subpackage.sh index 08346531f1..6872330e30 100644 --- a/packages/calcurse/calcurse-caldav.subpackage.sh +++ b/packages/calcurse/calcurse-caldav.subpackage.sh @@ -1,6 +1,6 @@ TERMUX_SUBPKG_INCLUDE="bin/calcurse-caldav" TERMUX_SUBPKG_DESCRIPTION="Sync calcurse with remote caldav calendar" -TERMUX_SUBPKG_DEPENDS="python" +TERMUX_SUBPKG_DEPENDS="python, python-pip" TERMUX_SUBPKG_REPLACES="calcurse (<< 4.7.1-1)" TERMUX_SUBPKG_BREAKS="calcurse (<< 4.7.1-1)" diff --git a/packages/electrum/build.sh b/packages/electrum/build.sh index 10fb4f4614..731e896f83 100644 --- a/packages/electrum/build.sh +++ b/packages/electrum/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Electrum is a lightweight Bitcoin wallet" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=4.3.3 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://download.electrum.org/$TERMUX_PKG_VERSION/Electrum-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=34f5c67db1234fd97cf199c66c3704dfea06c53853cd6ed87deb01cecb06b1b7 -TERMUX_PKG_DEPENDS="python, libsecp256k1" +TERMUX_PKG_DEPENDS="python, libsecp256k1, python-pip" TERMUX_PKG_PYTHON_TARGET_DEPS="'qrcode', 'protobuf<4,>=3.12', 'qdarkstyle>=2.7', 'aiorpcx<0.23,>=0.22.0', 'aiohttp<4.0.0,>=3.3.0', 'aiohttp_socks>=0.3', 'certifi', 'bitstring', 'attrs>=19.2.0', 'dnspython>=2.0'" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/packages/hash-slinger/build.sh b/packages/hash-slinger/build.sh index 0a01bc6301..bdbfbecc75 100644 --- a/packages/hash-slinger/build.sh +++ b/packages/hash-slinger/build.sh @@ -3,16 +3,13 @@ TERMUX_PKG_DESCRIPTION="Various tools to generate special DNS records" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.2 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/letoams/hash-slinger/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=1b255698ad8b2e5e05a443949476794b3b2a33a8f1e335146cc97a4579964bc1 -TERMUX_PKG_DEPENDS="ca-certificates, gnupg, openssh, python, pyunbound, resolv-conf, swig" +TERMUX_PKG_DEPENDS="ca-certificates, gnupg, openssh, python, pyunbound, resolv-conf, swig, python-pip" TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_BUILD_IN_SRC=true - -termux_step_pre_configure() { - _PKG_PYTHON_DEPENDS="dnspython ipaddr m2crypto python-gnupg" -} +TERMUX_PKG_PYTHON_TARGET_DEPS="dnspython, ipaddr, m2crypto, python-gnupg" termux_step_make() { : @@ -30,6 +27,6 @@ termux_step_create_debscripts() { cat <<- EOF > ./postinst #!$TERMUX_PREFIX/bin/sh echo "Installing dependencies through pip..." - pip3 install ${_PKG_PYTHON_DEPENDS} + pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / } EOF } diff --git a/packages/ledger/build.sh b/packages/ledger/build.sh index 27930ffb31..7d181b593c 100644 --- a/packages/ledger/build.sh +++ b/packages/ledger/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Powerful, double-entry accounting system" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.2.1 -TERMUX_PKG_REVISION=13 +TERMUX_PKG_REVISION=14 TERMUX_PKG_SRCURL=https://github.com/ledger/ledger/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=92bf09bc385b171987f456fe3ee9fa998ed5e40b97b3acdd562b663aa364384a TERMUX_PKG_AUTO_UPDATE=true @@ -19,9 +19,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" " termux_step_pre_configure() { - local _PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION) sed $TERMUX_PKG_BUILDER_DIR/CMakeLists.diff \ -e "s%@TERMUX_PREFIX@%${TERMUX_PREFIX}%g" \ - -e "s%@PYTHON_VERSION@%${_PYTHON_VERSION}%g" \ + -e "s%@PYTHON_VERSION@%${TERMUX_PYTHON_VERSION}%g" \ | patch --silent -p1 } diff --git a/packages/lv2/build.sh b/packages/lv2/build.sh index 9e259efc36..eb36247196 100644 --- a/packages/lv2/build.sh +++ b/packages/lv2/build.sh @@ -3,15 +3,17 @@ 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=1 TERMUX_PKG_SRCURL=https://lv2plug.in/spec/lv2-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=78c51bcf21b54e58bb6329accbb4dae03b2ed79b520f9a01e734bd9de530953f -TERMUX_PKG_DEPENDS="libxml2, libxslt, python, sord" +TERMUX_PKG_DEPENDS="libxml2, libxslt, python, sord, python-pip" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-Dplugins=disabled" +TERMUX_PKG_PYTHON_TARGET_DEPS="lxml, pygments, rdflib" termux_step_create_debscripts() { cat <<-EOF >./postinst #!$TERMUX_PREFIX/bin/sh echo "Installing dependencies through pip..." - pip3 install lxml pygments rdflib + pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / } EOF } diff --git a/packages/matplotlib/build.sh b/packages/matplotlib/build.sh index fab4e1a212..14495fc2e4 100644 --- a/packages/matplotlib/build.sh +++ b/packages/matplotlib/build.sh @@ -16,10 +16,10 @@ LICENSE/LICENSE_STIX LICENSE/LICENSE_YORICK" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.6.3 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/matplotlib/matplotlib/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=d39f9a93881b443bae6fbe73bf9c71dc2eb5b1921d9dcf1c97807f37728d459b -TERMUX_PKG_DEPENDS="freetype, libc++, python, python-numpy, python-pillow" +TERMUX_PKG_DEPENDS="freetype, libc++, python, python-numpy, python-pillow, python-pip" TERMUX_PKG_PYTHON_TARGET_DEPS="'contourpy>=1.0.1', 'cycler>=0.10', 'fonttools>=4.22.0', 'kiwisolver>=1.0.1', 'numpy>=1.19', 'packaging>=20.0', 'pyparsing>=2.2.1', 'python-dateutil>=2.7'" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_PYTHON_COMMON_DEPS="Cython, numpy, setuptools_scm, setuptools_scm_git_archive, wheel" diff --git a/packages/nala/build.sh b/packages/nala/build.sh index 2c7598c78b..35c497a4b7 100644 --- a/packages/nala/build.sh +++ b/packages/nala/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Commandline frontend for the apt package manager" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.12.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://gitlab.com/volian/nala/-/archive/v${TERMUX_PKG_VERSION}/nala-v${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=98738c0cc98bc4b35a2c246632336febbfe7c9aaa210336f56f75baa219b3906 -TERMUX_PKG_DEPENDS="python-apt" +TERMUX_PKG_DEPENDS="python-apt, python-pip" TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/python-apt/build.sh b/packages/python-apt/build.sh index 7f88aacfa6..659aac339c 100644 --- a/packages/python-apt/build.sh +++ b/packages/python-apt/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Python bindings for APT" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.5.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://ftp.debian.org/debian/pool/main/p/python-apt/python-apt_${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=07ece069cdc9f5523a405f46ab5437260dca5e34909601c4540f160c476bb982 TERMUX_PKG_DEPENDS="apt, build-essential, libc++, python, texinfo" diff --git a/packages/python-cryptography/build.sh b/packages/python-cryptography/build.sh index 17ccb84d1a..8dbe03741f 100644 --- a/packages/python-cryptography/build.sh +++ b/packages/python-cryptography/build.sh @@ -5,10 +5,11 @@ TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="LICENSE, LICENSE.APACHE, LICENSE.BSD, LICENSE.PSF" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="39.0.0" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/pyca/cryptography/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=7b62ed8e5e6e7ddcc9d92196b2acd8150c8098de3a058ef0abc9c720c971b0e4 TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_DEPENDS="openssl, python" +TERMUX_PKG_DEPENDS="openssl, python, python-pip" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag" TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, cffi, setuptools-rust" diff --git a/packages/python-tldp/build.sh b/packages/python-tldp/build.sh index 7d3f0cd2f1..f228e1f362 100644 --- a/packages/python-tldp/build.sh +++ b/packages/python-tldp/build.sh @@ -3,10 +3,10 @@ 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=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/tLDP/python-tldp/archive/refs/tags/tldp-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=bae313095b877b4272ddccaabd70efcbc526e2c1036f63fb665ec7ce10c94cde -TERMUX_PKG_DEPENDS="python" +TERMUX_PKG_DEPENDS="python, python-pip" TERMUX_PKG_PYTHON_COMMON_DEPS="wheel" TERMUX_PKG_PYTHON_TARGET_DEPS="networkx, nose" TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/packages/rdircd/build.sh b/packages/rdircd/build.sh index 6518735c85..1521bfd2c7 100644 --- a/packages/rdircd/build.sh +++ b/packages/rdircd/build.sh @@ -4,10 +4,11 @@ TERMUX_PKG_LICENSE="WTFPL" TERMUX_PKG_MAINTAINER="@termux" _COMMIT=6e5f541361a1bdecd8f8aab7060cb4fb3d0b1869 TERMUX_PKG_VERSION=2022.12.28 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=git+https://github.com/mk-fg/reliable-discord-client-irc-daemon TERMUX_PKG_GIT_BRANCH=master -TERMUX_PKG_DEPENDS="python" -_PKG_PYTHON_DEPENDS="aiohttp" +TERMUX_PKG_DEPENDS="python, python-pip" +TERMUX_PKG_PYTHON_TARGET_DEPS="aiohttp" TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_BUILD_IN_SRC=true @@ -31,6 +32,6 @@ termux_step_create_debscripts() { cat <<- EOF > ./postinst #!$TERMUX_PREFIX/bin/sh echo "Installing dependencies through pip..." - pip3 install ${_PKG_PYTHON_DEPENDS} + pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS} EOF } diff --git a/packages/srt2vobsub/build.sh b/packages/srt2vobsub/build.sh index aa3cfcecac..380ee87cc9 100644 --- a/packages/srt2vobsub/build.sh +++ b/packages/srt2vobsub/build.sh @@ -3,12 +3,13 @@ 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=1 +TERMUX_PKG_REVISION=2 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" +TERMUX_PKG_DEPENDS="bdsup2sub, ffmpeg, fontconfig-utils, imagemagick, mediainfo, python, python-pip" TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_PYTHON_TARGET_DEPS="chardet, srt, wand" termux_step_make_install() { install -Dm700 -T srt2vobsub.py $TERMUX_PREFIX/bin/srt2vobsub @@ -21,6 +22,6 @@ termux_step_create_debscripts() { cat <<- EOF > ./postinst #!$TERMUX_PREFIX/bin/sh echo "Installing dependencies through pip..." - pip3 install chardet srt wand + 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 81a494e391..baa28bfb68 100644 --- a/packages/termux-gui-package/build.sh +++ b/packages/termux-gui-package/build.sh @@ -3,16 +3,18 @@ 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_DEPENDS="python" +TERMUX_PKG_REVISION=1 +TERMUX_PKG_DEPENDS="python, python-pip" TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_SRCURL="https://github.com/tareksander/termux-gui-package/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SHA256="79a231f6550bde39c0bdd4eca0fce91b21df9c817345072c4859567437e485bf" +TERMUX_PKG_PYTHON_TARGET_DEPS="termuxgui" termux_step_create_debscripts() { cat <<- EOF > ./postinst #!${TERMUX_PREFIX}/bin/sh echo "Installing python bindings for Termux:GUI" - pip install --upgrade termuxgui + 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 34ea7de288..9a87328d89 100644 --- a/packages/termux-gui-pm/build.sh +++ b/packages/termux-gui-pm/build.sh @@ -3,19 +3,21 @@ 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_DEPENDS="python" +TERMUX_PKG_REVISION=1 +TERMUX_PKG_DEPENDS="python, python-pip" TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_SRCURL="https://github.com/tareksander/termux-gui-pm/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SHA256="3a5a829b721d17f2002406571852e63d1984acc9732e58f2f76a2966381297c6" 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" - pip install --upgrade termuxgui + pip3 install --upgrade $TERMUX_PKG_PYTHON_TARGET_DEPS EOF } diff --git a/packages/units/build.sh b/packages/units/build.sh index 1c0dbb5b0c..6c76e675f8 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.22 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/units/units-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=5d13e1207721fe7726d906ba1d92dc0eddaa9fc26759ed22e3b8d1a793125848 TERMUX_PKG_DEPENDS="readline, libandroid-support" diff --git a/packages/units/units-cur.subpackage.sh b/packages/units/units-cur.subpackage.sh index 96f53e394c..3e59112e80 100644 --- a/packages/units/units-cur.subpackage.sh +++ b/packages/units/units-cur.subpackage.sh @@ -3,7 +3,7 @@ TERMUX_SUBPKG_INCLUDE=" bin/units_cur " TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true -TERMUX_SUBPKG_DEPENDS="python" +TERMUX_SUBPKG_DEPENDS="python, python-pip" TERMUX_SUBPKG_BREAKS="units (<< 2.22)" TERMUX_SUBPKG_REPLACES="units (<< 2.22)" diff --git a/root-packages/frida/build.sh b/root-packages/frida/build.sh index cd1bec0fe6..eae52ec1e7 100644 --- a/root-packages/frida/build.sh +++ b/root-packages/frida/build.sh @@ -6,6 +6,7 @@ _MAJOR_VERSION=16 _MINOR_VERSION=0 _MICRO_VERSION=2 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.${_MINOR_VERSION}.${_MICRO_VERSION} +TERMUX_PKG_REVISION=1 TERMUX_PKG_GIT_BRANCH=$TERMUX_PKG_VERSION TERMUX_PKG_SRCURL=git+https://github.com/frida/frida TERMUX_PKG_DEPENDS="libiconv" @@ -21,10 +22,9 @@ TERMUX_PKG_REPLACES="frida-tools (<< 15.1.24-1), frida-server (<< 15.1.24)" termux_step_pre_configure () { termux_setup_nodejs - _PYTHON_VERSION=$(source $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION) - export TERMUX_PKG_EXTRA_MAKE_ARGS+=" PYTHON=/usr/bin/python${_PYTHON_VERSION}" + export TERMUX_PKG_EXTRA_MAKE_ARGS+=" PYTHON=/usr/bin/python${TERMUX_PYTHON_VERSION}" sed -e "s%@TERMUX_PREFIX@%$TERMUX_PREFIX%g" \ - -e "s%@PYTHON_VERSION@%$_PYTHON_VERSION%g" \ + -e "s%@PYTHON_VERSION@%$TERMUX_PYTHON_VERSION%g" \ $TERMUX_PKG_BUILDER_DIR/frida-python-version.diff | patch -Np1 } diff --git a/root-packages/frida/frida-python.subpackage.sh b/root-packages/frida/frida-python.subpackage.sh index 874ead8299..be854ec120 100644 --- a/root-packages/frida/frida-python.subpackage.sh +++ b/root-packages/frida/frida-python.subpackage.sh @@ -10,12 +10,11 @@ bin/frida-ps bin/frida-trace lib/python* " -TERMUX_SUBPKG_DEPENDS="python" +TERMUX_SUBPKG_DEPENDS="python, python-pip" TERMUX_SUBPKG_CONFLICTS="frida-tools (<< 15.1.24)" TERMUX_SUBPKG_REPLACES="frida-tools (<< 15.1.24)" termux_step_create_subpkg_debscripts() { - _PYTHON_VERSION=$(source $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION) echo "#!$TERMUX_PREFIX/bin/sh" > postinst - echo "pip${_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'" >> 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'" >> postinst } diff --git a/x11-packages/inkscape/build.sh b/x11-packages/inkscape/build.sh index 9aaffb0f98..6a20ada9d3 100644 --- a/x11-packages/inkscape/build.sh +++ b/x11-packages/inkscape/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Free and open source vector graphics editor" TERMUX_PKG_LICENSE="GPL-3.0-or-later" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.2.2 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://media.inkscape.org/dl/resources/file/inkscape-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=a0c7fd0d03c0a21535e648ef301dcf80dd7cfc1f3545e51065fbf1ba3ee8a5c4 TERMUX_PKG_DEPENDS="boost, double-conversion, fontconfig, freetype, gdk-pixbuf, glib, gsl, gtk3, gtkmm3, harfbuzz, libatkmm-1.6, libc++, libcairo, libcairomm-1.0, libgc, libglibmm-2.4, libiconv, libjpeg-turbo, libpangomm-1.4, libpng, libsigc++-2.0, libsoup, libx11, libxml2, libxslt, littlecms, pango, poppler, potrace, readline, zlib" diff --git a/x11-packages/inkscape/inkscape-extensions.subpackage.sh b/x11-packages/inkscape/inkscape-extensions.subpackage.sh index 381c1822a5..8c0463b282 100644 --- a/x11-packages/inkscape/inkscape-extensions.subpackage.sh +++ b/x11-packages/inkscape/inkscape-extensions.subpackage.sh @@ -1,6 +1,6 @@ TERMUX_SUBPKG_INCLUDE="share/inkscape/extensions" TERMUX_SUBPKG_DESCRIPTION="Inkscape extensions" -TERMUX_SUBPKG_DEPENDS="python, python-numpy" +TERMUX_SUBPKG_DEPENDS="python, python-numpy, python-pip" TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true termux_step_create_subpkg_debscripts() { diff --git a/x11-packages/pyqt5/build.sh b/x11-packages/pyqt5/build.sh index c4d8b83218..00b0d66eb6 100644 --- a/x11-packages/pyqt5/build.sh +++ b/x11-packages/pyqt5/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Comprehensive Python Bindings for Qt v5" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=5.15.7 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://ftp-osl.osuosl.org/pub/gentoo/distfiles/PyQt5-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=755121a52b3a08cb07275c10ebb96576d36e320e572591db16cfdbc558101594 -TERMUX_PKG_DEPENDS="libc++, python, qt5-qtbase, qt5-qtdeclarative, qt5-qtlocation, qt5-qtmultimedia, qt5-qtsensors, qt5-qtsvg, qt5-qttools, qt5-qtwebchannel, qt5-qtwebkit, qt5-qtwebsockets, qt5-qtx11extras, qt5-qtxmlpatterns" +TERMUX_PKG_DEPENDS="libc++, python, qt5-qtbase, qt5-qtdeclarative, qt5-qtlocation, qt5-qtmultimedia, qt5-qtsensors, qt5-qtsvg, qt5-qttools, qt5-qtwebchannel, qt5-qtwebkit, 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, PyQt-builder" TERMUX_PKG_PYTHON_TARGET_DEPS="PyQt5-sip"