diff --git a/packages/build-essential/build.sh b/packages/build-essential/build.sh index bc72e5a1a..6d1538013 100644 --- a/packages/build-essential/build.sh +++ b/packages/build-essential/build.sh @@ -17,7 +17,7 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=yes # bc, bzip2, coreutils, diffutils, ed, findutils, gawk, grep, gzip, lzip, lzop, patch, procps, psmisc, sed, tar, xz-utils # -TERMUX_PKG_DEPENDS="autoconf, automake, bison, clang, cmake, flex, gperf, libtool, m4, make, ninja, pkg-config, bc, coreutils, diffutils, ed, findutils, gawk, grep, gzip, lzip, lzop, patch, procps, psmisc, sed, tar, util-linux, xz-utils" +TERMUX_PKG_DEPENDS="autoconf, automake, bison, clang, cmake, flex, gperf, libtool, m4, make, ninja, pkg-config, bc, coreutils, diffutils, ed, findutils, gawk, grep, gzip, lzip, lzop, patch, procps, psmisc, sed, tar, util-linux" # Other packages that may be interesting. TERMUX_PKG_SUGGESTS="git, golang, nodejs, patchelf, proot, python, python2, ruby, rust, subversion" diff --git a/packages/dpkg/build.sh b/packages/dpkg/build.sh index 21a47af2b..437f6b4c7 100644 --- a/packages/dpkg/build.sh +++ b/packages/dpkg/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=8 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/debian/pool/main/d/dpkg/dpkg_${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=4c27fededf620c0aa522fff1a48577ba08144445341257502e7730f2b1a296e8 # with the extract.c.patch we remove the -p and --warning=no-timestamp tar options so we can use busybox tar -TERMUX_PKG_DEPENDS="coreutils, diffutils, gzip, less, libbz2, liblzma, tar, xz-utils, zlib" +TERMUX_PKG_DEPENDS="coreutils, diffutils, gzip, less, libbz2, liblzma, tar, zlib" TERMUX_PKG_BREAKS="dpkg-dev" TERMUX_PKG_REPLACES="dpkg-dev" TERMUX_PKG_ESSENTIAL=yes diff --git a/packages/liblzma/build.sh b/packages/liblzma/build.sh index d52b7b05f..b5d5023e3 100644 --- a/packages/liblzma/build.sh +++ b/packages/liblzma/build.sh @@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://tukaani.org/xz/ TERMUX_PKG_DESCRIPTION="XZ-format compression library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=5.2.4 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/xz-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=9717ae363760dedf573dad241420c5fea86256b65bc21d2cf71b2b12f0544f4b -TERMUX_PKG_BREAKS="liblzma-dev" -TERMUX_PKG_REPLACES="liblzma-dev" +TERMUX_PKG_BREAKS="liblzma-dev, xz-utils" +TERMUX_PKG_REPLACES="liblzma-dev, xz-utils" +TERMUX_PKG_PROVIDES="xz-utils" TERMUX_PKG_ESSENTIAL=yes diff --git a/packages/liblzma/xz-utils.subpackage.sh b/packages/liblzma/xz-utils.subpackage.sh deleted file mode 100644 index 69edcbd17..000000000 --- a/packages/liblzma/xz-utils.subpackage.sh +++ /dev/null @@ -1,3 +0,0 @@ -TERMUX_SUBPKG_INCLUDE="bin/ share/man/man1/" -TERMUX_SUBPKG_DESCRIPTION="XZ-format compression tools" -TERMUX_SUBPKG_ESSENTIAL=yes diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh index 25ae200c3..ee0193842 100644 --- a/packages/termux-tools/build.sh +++ b/packages/termux-tools/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_CONFLICTS="procps (<< 3.3.15-2)" # Some of these packages are not dependencies and used only to ensure # that core packages are installed after upgrading (we removed busybox # from essentials). -TERMUX_PKG_DEPENDS="coreutils, dash, diffutils, findutils, gawk, grep, gzip, less, procps, psmisc, sed, tar, termux-am, termux-exec, xz-utils" +TERMUX_PKG_DEPENDS="coreutils, dash, diffutils, findutils, gawk, grep, gzip, less, procps, psmisc, sed, tar, termux-am, termux-exec" # Optional packages that are distributed as part of bootstrap archives. TERMUX_PKG_RECOMMENDS="ed, dos2unix, inetutils, net-tools, patch, unzip, util-linux" diff --git a/packages/texlive-tlmgr/build.sh b/packages/texlive-tlmgr/build.sh index 68d4e0b6f..dbe0ea6e4 100644 --- a/packages/texlive-tlmgr/build.sh +++ b/packages/texlive-tlmgr/build.sh @@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="TeX Lives package manager" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" TERMUX_PKG_VERSION=20190410 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=ftp://ftp.tug.org/texlive/historic/${TERMUX_PKG_VERSION:0:4}/install-tl-unx.tar.gz TERMUX_PKG_SHA256=44aa41b5783e345b7021387f19ac9637ff1ce5406a59754230c666642dfe7750 -TERMUX_PKG_DEPENDS="perl, wget, gnupg (>= 2.2.9-1), xz-utils, texlive (>= 20190410)" +TERMUX_PKG_DEPENDS="liblzma, perl, wget, gnupg (>= 2.2.9-1), texlive (>= 20190410)" TERMUX_PKG_CONFFILES="share/texlive/tlpkg/texlive.tlpdb" TERMUX_PKG_CONFLICTS="texlive (<< 20180414-1)" TERMUX_PKG_PLATFORM_INDEPENDENT=yes