From 09ede9b077aafcb4d16ce2d98f3c388d8f189d21 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 8 Nov 2015 02:23:57 -0500 Subject: [PATCH] Rebuild some packages and fix dependencies --- packages/dropbear/build.sh | 2 ++ packages/gawk/build.sh | 1 + packages/gcc/build.sh | 2 +- packages/libgnutls/build.sh | 1 + packages/libisl/build.sh | 1 + packages/libmpc/build.sh | 1 + packages/libmpfr/build.sh | 1 + packages/libnettle/build.sh | 2 +- packages/librsvg/build.sh | 1 + packages/ruby/build.sh | 1 + packages/stunnel/build.sh | 3 ++- packages/wcalc/build.sh | 1 + packages/weechat/build.sh | 2 +- 13 files changed, 15 insertions(+), 4 deletions(-) diff --git a/packages/dropbear/build.sh b/packages/dropbear/build.sh index a39016b2..953bcf72 100755 --- a/packages/dropbear/build.sh +++ b/packages/dropbear/build.sh @@ -1,6 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html TERMUX_PKG_DESCRIPTION="Small SSH server and client" +TERMUX_PKG_DEPENDS="libutil" TERMUX_PKG_VERSION=2015.68 +TERMUX_PKG_BUILD_REVISION=1 # Using mirror since main site was down 2015-06-13: # TERMUX_PKG_SRCURL=https://matt.ucc.asn.au/dropbear/releases/dropbear-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SRCURL=https://dropbear.nl/mirror/dropbear-${TERMUX_PKG_VERSION}.tar.bz2 diff --git a/packages/gawk/build.sh b/packages/gawk/build.sh index 50de1845..f4412611 100644 --- a/packages/gawk/build.sh +++ b/packages/gawk/build.sh @@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/gawk/ TERMUX_PKG_DESCRIPTION="Interpreted programming language designed for text processing and typically used as a data extraction and reporting tool" TERMUX_PKG_DEPENDS="libandroid-support, libmpfr, libgmp, readline" TERMUX_PKG_VERSION=4.1.3 +TERMUX_PKG_BUILD_REVISION=1 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/gawk/gawk-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_RM_AFTER_INSTALL="bin/gawk-* bin/igawk share/man/man1/igawk.1" diff --git a/packages/gcc/build.sh b/packages/gcc/build.sh index 53b690c0..996436e1 100755 --- a/packages/gcc/build.sh +++ b/packages/gcc/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://gcc.gnu.org/ TERMUX_PKG_DESCRIPTION="GNU C compiler" TERMUX_PKG_DEPENDS="binutils, libgmp, libmpfr, libmpc, ndk-sysroot" TERMUX_PKG_VERSION=4.9.3 -TERMUX_PKG_BUILD_REVISION=4 +TERMUX_PKG_BUILD_REVISION=5 TERMUX_PKG_SRCURL=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-${TERMUX_PKG_VERSION}/gcc-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-languages=c,c++ --with-system-zlib --disable-multilib --disable-lto" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-gmp=$TERMUX_PREFIX --with-mpfr=$TERMUX_PREFIX --with-mpc=$TERMUX_PREFIX" diff --git a/packages/libgnutls/build.sh b/packages/libgnutls/build.sh index 9a24ae80..1a7464ad 100644 --- a/packages/libgnutls/build.sh +++ b/packages/libgnutls/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Secure communications library implementing the SSL, TLS TERMUX_PKG_DEPENDS="libgmp, libnettle, ca-certificates" _TERMUX_PKG_MAJOR_VERSION=3.4 TERMUX_PKG_VERSION=${_TERMUX_PKG_MAJOR_VERSION}.6 +TERMUX_PKG_BUILD_REVISION=1 TERMUX_PKG_SRCURL=ftp://ftp.gnutls.org/gcrypt/gnutls/v${_TERMUX_PKG_MAJOR_VERSION}/gnutls-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-hardware-acceleration --disable-cxx --disable-openssl-compatibility --with-included-libtasn1 --without-p11-kit --with-default-trust-store-file=$TERMUX_PREFIX/etc/tls/cert.pem" diff --git a/packages/libisl/build.sh b/packages/libisl/build.sh index f6f09090..74ff5fbd 100644 --- a/packages/libisl/build.sh +++ b/packages/libisl/build.sh @@ -1,5 +1,6 @@ TERMUX_PKG_HOMEPAGE=http://isl.gforge.inria.fr/ TERMUX_PKG_DESCRIPTION="Library for manipulating sets and relations of integer points bounded by linear constraints" TERMUX_PKG_VERSION=0.15 +TERMUX_PKG_BUILD_REVISION=1 TERMUX_PKG_SRCURL=http://isl.gforge.inria.fr/isl-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_DEPENDS="libgmp" diff --git a/packages/libmpc/build.sh b/packages/libmpc/build.sh index 5222de0f..cf4f58f9 100755 --- a/packages/libmpc/build.sh +++ b/packages/libmpc/build.sh @@ -2,4 +2,5 @@ TERMUX_PKG_HOMEPAGE=http://www.multiprecision.org/ TERMUX_PKG_DESCRIPTION="C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result" TERMUX_PKG_DEPENDS="libgmp, libmpfr" TERMUX_PKG_VERSION=1.0.3 +TERMUX_PKG_BUILD_REVISION=1 TERMUX_PKG_SRCURL=http://www.multiprecision.org/mpc/download/mpc-${TERMUX_PKG_VERSION}.tar.gz diff --git a/packages/libmpfr/build.sh b/packages/libmpfr/build.sh index 12a4def7..2d72a388 100755 --- a/packages/libmpfr/build.sh +++ b/packages/libmpfr/build.sh @@ -2,5 +2,6 @@ TERMUX_PKG_HOMEPAGE=http://www.mpfr.org/ TERMUX_PKG_DESCRIPTION="C library for multiple-precision floating-point computations with correct rounding" TERMUX_PKG_DEPENDS="libgmp" TERMUX_PKG_VERSION=3.1.3 +TERMUX_PKG_BUILD_REVISION=1 TERMUX_PKG_SRCURL=http://www.mpfr.org/mpfr-current/mpfr-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_header_locale_h=no" diff --git a/packages/libnettle/build.sh b/packages/libnettle/build.sh index eb877f27..97f10a60 100644 --- a/packages/libnettle/build.sh +++ b/packages/libnettle/build.sh @@ -2,6 +2,6 @@ TERMUX_PKG_HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/ TERMUX_PKG_DESCRIPTION="Cryptographic library that is designed to fit easily in more or less any context" TERMUX_PKG_DEPENDS="libgmp" TERMUX_PKG_VERSION=3.1.1 -TERMUX_PKG_BUILD_REVISION=1 +TERMUX_PKG_BUILD_REVISION=2 TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/nettle/nettle-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-static" # needed for building diff --git a/packages/librsvg/build.sh b/packages/librsvg/build.sh index 06c26c5b..f9788e5c 100644 --- a/packages/librsvg/build.sh +++ b/packages/librsvg/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://wiki.gnome.org/action/show/Projects/LibRsvg TERMUX_PKG_DESCRIPTION="Library to render SVG files using cairo" TERMUX_PKG_VERSION=2.40.11 +TERMUX_PKG_BUILD_REVISION=1 TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.40/librsvg-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_DEPENDS="libcroco,pango,gdk-pixbuf" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-introspection" diff --git a/packages/ruby/build.sh b/packages/ruby/build.sh index 5bb8bbbf..b6635db0 100644 --- a/packages/ruby/build.sh +++ b/packages/ruby/build.sh @@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.ruby-lang.org/ TERMUX_PKG_DESCRIPTION="Dynamic programming language with a focus on simplicity and productivity" _MAJOR_VERSION=2.2 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3 +TERMUX_PKG_BUILD_REVISION=1 TERMUX_PKG_SRCURL=http://cache.ruby-lang.org/pub/ruby/${_MAJOR_VERSION}/ruby-${TERMUX_PKG_VERSION}.tar.xz # libbffi is used by the fiddle extension module: TERMUX_PKG_DEPENDS="libffi, libgmp, readline, openssl" diff --git a/packages/stunnel/build.sh b/packages/stunnel/build.sh index 7b5687ac..632802c3 100644 --- a/packages/stunnel/build.sh +++ b/packages/stunnel/build.sh @@ -1,8 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://www.stunnel.org/ TERMUX_PKG_DESCRIPTION="Socket wrapper which can provide TLS support to ordinary applications" TERMUX_PKG_VERSION=5.26 +TERMUX_PKG_BUILD_REVISION=1 TERMUX_PKG_SRCURL=https://www.stunnel.org/downloads/stunnel-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_DEPENDS="openssl" +TERMUX_PKG_DEPENDS="openssl, libutil" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-shared --with-ssl=$TERMUX_PREFIX --disable-fips" TERMUX_PKG_RM_AFTER_INSTALL="bin/stunnel3 share/man/man8/stunnel.*.8" diff --git a/packages/wcalc/build.sh b/packages/wcalc/build.sh index 0e1ab8e8..3a93120e 100644 --- a/packages/wcalc/build.sh +++ b/packages/wcalc/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://w-calc.sourceforge.net TERMUX_PKG_DESCRIPTION="Capable calculator" TERMUX_PKG_VERSION=2.5 +TERMUX_PKG_BUILD_REVISION=1 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/w-calc/wcalc-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_DEPENDS="flex,libmpfr,libgmp,readline" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes" diff --git a/packages/weechat/build.sh b/packages/weechat/build.sh index b4bde015..5958e6b7 100755 --- a/packages/weechat/build.sh +++ b/packages/weechat/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://weechat.org/ TERMUX_PKG_DESCRIPTION="Fast, light and extensible IRC chat client" TERMUX_PKG_VERSION=1.3 -TERMUX_PKG_BUILD_REVISION=1 +TERMUX_PKG_BUILD_REVISION=2 TERMUX_PKG_SRCURL=http://www.weechat.org/files/src/weechat-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_DEPENDS="ncurses, libgcrypt, libcurl, libgnutls, libandroid-support" # weechat-curses is a symlink to weechat, so remove it: -- 2.11.0