From 21b96d3b41ec130af110360759bf2117ce6b119e Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Sat, 20 Jul 2019 11:42:33 +0300 Subject: [PATCH] no more develsplit + provide static libraries as separate package %ci:no-build --- packages/apache2/build.sh | 5 ++-- packages/apr-util/build.sh | 5 ++-- packages/apr/build.sh | 5 ++-- packages/argp/build.sh | 4 ++-- packages/attr/build.sh | 3 +++ packages/babl/build.sh | 3 +++ packages/bash/build.sh | 4 +++- packages/binutils/build.sh | 6 +++-- packages/boost/build.sh | 6 ++--- packages/brotli/build.sh | 3 +++ packages/build-essential/build.sh | 3 ++- packages/c-ares/build.sh | 4 +++- packages/c-toxcore/build.sh | 3 +++ packages/capstone/build.sh | 4 +++- packages/clamav/build.sh | 4 +++- packages/cmark/build.sh | 4 +++- packages/dbus-glib/build.sh | 4 +++- packages/dbus/build.sh | 4 +++- packages/dnsutils/build.sh | 3 +++ packages/dpkg/build.sh | 4 +++- packages/dtc/build.sh | 3 +++ packages/e2fsprogs/build.sh | 6 +++-- packages/emacs/build.sh | 3 +++ packages/erlang/build.sh | 4 ++-- packages/espeak/build.sh | 4 +++- packages/exiv2/build.sh | 4 +++- packages/expect/build.sh | 4 +++- packages/fakeroot/build.sh | 4 ++-- packages/fcgi/build.sh | 3 +++ packages/ffmpeg/build.sh | 7 +++--- packages/fftw/build.sh | 5 ++-- packages/file/build.sh | 3 +++ packages/finch/build.sh | 4 +++- packages/flex/build.sh | 2 +- packages/fontconfig/build.sh | 5 ++-- packages/freetype/build.sh | 4 +++- packages/fribidi/build.sh | 3 +++ packages/fwknop/build.sh | 3 +++ packages/gawk/build.sh | 4 +++- packages/gdb/build.sh | 6 ++--- packages/gdbm/build.sh | 4 +++- packages/gdk-pixbuf/build.sh | 3 ++- packages/gegl/build.sh | 4 +++- packages/gettext/build.sh | 4 +++- packages/giflib/build.sh | 3 +++ packages/glib/build.sh | 5 ++-- packages/gmic/build.sh | 3 +-- packages/golang/build.sh | 4 ++-- packages/googletest/build.sh | 3 +-- packages/gpgme/build.sh | 5 ++-- packages/graphicsmagick/build.sh | 7 +++--- packages/graphviz/build.sh | 4 +++- packages/gsl/build.sh | 3 +++ packages/gst-plugins-bad/build.sh | 4 +++- packages/gst-plugins-base/build.sh | 4 +++- packages/gstreamer/build.sh | 4 +++- packages/harfbuzz/build.sh | 4 +++- packages/hoedown/build.sh | 4 +++- packages/httrack/build.sh | 4 +++- packages/hunspell/build.sh | 4 +++- packages/imagemagick/build.sh | 4 +++- packages/inotify-tools/build.sh | 3 +++ packages/iperf3/build.sh | 3 +++ packages/irssi/build.sh | 3 +++ packages/iverilog/build.sh | 4 +++- packages/jq/build.sh | 3 +++ packages/json-c/build.sh | 3 +++ packages/json-glib/build.sh | 5 ++-- packages/jsoncpp/build.sh | 3 +++ packages/keystone/build.sh | 4 +++- packages/krb5/build.sh | 7 +++++- packages/ldc/build.sh | 5 ++-- packages/ldns/build.sh | 7 ++++-- packages/ledger/build.sh | 4 +++- packages/leptonica/build.sh | 4 +++- packages/leveldb/build.sh | 4 +++- packages/lhasa/build.sh | 4 +++- packages/libandroid-glob/build.sh | 13 +++++++--- packages/libandroid-shmem/build.sh | 6 +++-- packages/libandroid-support/build.sh | 23 +++++++++++++----- packages/libarchive/build.sh | 3 +++ packages/libass/build.sh | 3 +++ packages/libassuan/build.sh | 4 +++- packages/libbsd/build.sh | 3 +++ packages/libbz2/build.sh | 4 +++- packages/libcaca/build.sh | 4 +++- packages/libcairo/build.sh | 4 +++- packages/libcap/build.sh | 3 +++ packages/libcln/build.sh | 4 +++- packages/libcoap/build.sh | 3 +++ packages/libconfig/build.sh | 4 +++- packages/libconfuse/build.sh | 3 +++ packages/libcroco/build.sh | 4 +++- packages/libcrypt/build.sh | 4 +++- packages/libcue/build.sh | 3 +++ packages/libcurl/build.sh | 5 ++-- packages/libdb/build.sh | 4 +++- packages/libduktape/build.sh | 8 +++---- packages/libedit/build.sh | 3 +++ packages/libelf/build.sh | 5 ++-- packages/libev/build.sh | 3 +++ packages/libevent/build.sh | 3 +++ packages/libexif/build.sh | 4 +++- packages/libexpat/build.sh | 3 +++ packages/libffi/build.sh | 4 +++- packages/libflac/build.sh | 4 +++- packages/libgc/build.sh | 3 +++ packages/libgcrypt/build.sh | 4 +++- packages/libgd/build.sh | 4 +++- packages/libgit2/build.sh | 3 +++ packages/libgmime/build.sh | 4 +++- packages/libgmp/build.sh | 4 +++- packages/libgnutls/build.sh | 7 ++++-- packages/libgpg-error/build.sh | 3 +++ packages/libgraphite/build.sh | 4 +++- packages/libgrpc/build.sh | 3 +++ packages/libgsasl/build.sh | 4 +++- packages/libical/build.sh | 4 +++- packages/libiconv/build.sh | 8 +++---- packages/libicu/build.sh | 5 ++-- packages/libid3tag/build.sh | 4 +++- packages/libidn/build.sh | 4 +++- packages/libidn2/build.sh | 3 +++ packages/libisl/build.sh | 3 +++ packages/libjansson/build.sh | 3 +++ packages/libjasper/build.sh | 4 +++- packages/libjpeg-turbo/build.sh | 4 +++- packages/libksba/build.sh | 5 ++-- packages/libllvm/build.sh | 6 ++--- packages/libllvm/libclang-dev.subpackage.sh | 2 -- packages/libllvm/libclang.subpackage.sh | 2 -- packages/liblua/build.sh | 6 ++--- packages/liblua52/build.sh | 4 +++- packages/liblz4/build.sh | 4 +++- packages/liblzma/build.sh | 4 +++- packages/liblzo/build.sh | 3 +++ packages/libmad/build.sh | 4 +++- packages/libmaxminddb/build.sh | 4 +++- packages/libmesode/build.sh | 3 +++ packages/libmnl/build.sh | 3 +++ packages/libmosquitto/build.sh | 3 +++ packages/libmp3lame/build.sh | 3 +++ packages/libmp3splt/build.sh | 4 +++- packages/libmpc/build.sh | 3 +++ packages/libmpdclient/build.sh | 4 +++- packages/libmpfr/build.sh | 4 +++- packages/libmsgpack/build.sh | 3 +++ packages/libnettle/build.sh | 4 +++- packages/libnfs/build.sh | 4 +++- packages/libnghttp2/build.sh | 3 +++ packages/libnl/build.sh | 3 +++ packages/libnpth/build.sh | 3 +++ packages/libogg/build.sh | 3 +++ packages/liboggz/build.sh | 4 +++- packages/libopus/build.sh | 4 +++- packages/libopusenc/build.sh | 3 +++ packages/libotr/build.sh | 3 +++ packages/libpcap/build.sh | 3 +++ packages/libpipeline/build.sh | 3 +++ packages/libpixman/build.sh | 4 +++- packages/libpng/build.sh | 5 ++-- packages/libpopt/build.sh | 4 +++- packages/libprotobuf-c/build.sh | 2 ++ packages/libprotobuf/build.sh | 3 +++ packages/libpsl/build.sh | 4 +++- packages/libpulseaudio/build.sh | 5 ++-- packages/libqrencode/build.sh | 4 +++- packages/librsvg/build.sh | 4 +++- packages/librsync/build.sh | 4 +++- packages/libsasl/build.sh | 3 +++ packages/libsndfile/build.sh | 4 +++- packages/libsodium/build.sh | 3 +++ packages/libsoup/build.sh | 3 +++ packages/libsoxr/build.sh | 4 +++- packages/libsqlite/build.sh | 4 +++- packages/libssh/build.sh | 3 +++ packages/libssh2/build.sh | 3 +++ packages/libtalloc/build.sh | 4 +++- packages/libtermkey/build.sh | 3 +++ packages/libtiff/build.sh | 4 +++- packages/libtool/build.sh | 3 +-- packages/libunibilium/build.sh | 4 +++- packages/libunistring/build.sh | 4 +++- packages/libunwind/build.sh | 3 +++ packages/libuuid/build.sh | 4 +++- packages/libuv/build.sh | 3 +++ packages/libvorbis/build.sh | 5 ++-- packages/libvpx/build.sh | 3 +++ packages/libvterm/build.sh | 3 +++ packages/libwebp/build.sh | 3 +++ packages/libwebsockets/build.sh | 4 +++- packages/libx264/build.sh | 3 +++ packages/libx265/build.sh | 3 +++ packages/libxapian/build.sh | 5 ++-- packages/libxml2/build.sh | 5 ++-- packages/libxslt/build.sh | 6 ++--- packages/libyaml/build.sh | 3 +++ packages/libzip/build.sh | 4 +++- packages/libzmq/build.sh | 3 +++ packages/libzopfli/build.sh | 4 +++- packages/littlecms/build.sh | 4 +++- packages/lldb/build.sh | 4 +++- packages/luarocks/build.sh | 5 ++-- packages/make/build.sh | 4 +++- packages/mariadb/build.sh | 3 +++ packages/mbedtls/build.sh | 3 +++ packages/memcached/build.sh | 3 +++ packages/ncurses/build.sh | 24 +++++++++---------- .../ncurses-ui-libs-static.subpackage.sh | 2 ++ .../ncurses/ncurses-ui-libs.subpackage.sh | 2 +- packages/ndk-multilib/build.sh | 5 ++-- packages/ndk-sysroot/build.sh | 7 +++--- packages/netpbm/build.sh | 4 +++- packages/nodejs-lts/build.sh | 4 +++- packages/nodejs/build.sh | 5 ++-- packages/notmuch/build.sh | 3 +++ packages/oathtool/build.sh | 4 +++- packages/ocrad/build.sh | 4 +++- packages/openal-soft/build.sh | 3 +++ packages/openjpeg/build.sh | 5 ++-- packages/openssl/build.sh | 6 ++--- packages/opusfile/build.sh | 5 ++-- packages/ossp-uuid/build.sh | 3 +++ packages/pango/build.sh | 5 ++-- packages/parted/build.sh | 4 +++- packages/pcre/build.sh | 5 ++-- packages/pcre2/build.sh | 4 +++- packages/perl/build.sh | 2 +- packages/php/build.sh | 6 ++--- packages/poppler/build.sh | 4 +++- packages/postgresql/build.sh | 5 ++-- packages/procps/build.sh | 4 +++- packages/profanity/build.sh | 6 +++-- packages/python/build.sh | 5 ++-- packages/python2/build.sh | 5 ++-- packages/qalc/build.sh | 4 +++- packages/qpdf/build.sh | 4 +++- packages/radare2/build.sh | 3 +++ packages/readline/build.sh | 5 ++-- packages/rhash/build.sh | 9 ++++--- packages/rtmpdump/build.sh | 4 +++- packages/ruby/build.sh | 4 +++- packages/serf/build.sh | 4 +++- packages/sox/build.sh | 4 +++- packages/speexdsp/build.sh | 3 +++ packages/stfl/build.sh | 4 +++- packages/subversion/build.sh | 4 +++- packages/tcl/build.sh | 6 ++--- packages/teckit/build.sh | 4 +++- packages/telepathy-glib/build.sh | 3 +++ packages/termux-auth/build.sh | 3 +++ packages/tesseract/build.sh | 3 +++ packages/texlive-bin/build.sh | 9 ++++--- .../texlive-bin/texlive-bin-dev.subpackage.sh | 4 ---- packages/tidy/build.sh | 3 +++ packages/utf8cpp/build.sh | 2 +- packages/utf8proc/build.sh | 3 +++ packages/util-linux/build.sh | 4 +++- packages/valac/build.sh | 5 +++- packages/valgrind/build.sh | 4 +++- packages/weechat/build.sh | 3 +++ packages/xmlsec/build.sh | 3 +++ packages/xvidcore/build.sh | 3 +++ packages/yajl/build.sh | 4 +++- packages/yasm/build.sh | 4 +++- packages/zbar/build.sh | 4 +++- packages/zlib/build.sh | 8 +++---- packages/zstd/build.sh | 5 +++- .../termux_step_configure_autotools.sh | 9 ++++--- scripts/build/termux_create_subpackages.sh | 20 +++++----------- scripts/build/termux_extract_dep_info.sh | 8 +++---- scripts/build/termux_step_massage.sh | 6 ----- scripts/build/termux_step_setup_toolchain.sh | 6 ++--- scripts/build/termux_step_setup_variables.sh | 7 +----- scripts/buildorder.py | 8 +++---- scripts/package_uploader.sh | 6 ++--- 276 files changed, 845 insertions(+), 335 deletions(-) delete mode 100644 packages/libllvm/libclang-dev.subpackage.sh delete mode 100644 packages/libllvm/libclang.subpackage.sh create mode 100644 packages/ncurses/ncurses-ui-libs-static.subpackage.sh delete mode 100644 packages/texlive-bin/texlive-bin-dev.subpackage.sh diff --git a/packages/apache2/build.sh b/packages/apache2/build.sh index 771f78a86..c259956ce 100644 --- a/packages/apache2/build.sh +++ b/packages/apache2/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://httpd.apache.org TERMUX_PKG_DESCRIPTION="Apache Web Server" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=2.4.39 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=b4ca9d05773aa59b54d66cd8f4744b945289f084d3be17d7981d1783a5decfa2 TERMUX_PKG_SRCURL=https://www.apache.org/dist/httpd/httpd-$TERMUX_PKG_VERSION.tar.bz2 TERMUX_PKG_DEPENDS="apr, apr-util, pcre, openssl, libcrypt, libandroid-support, libnghttp2, libexpat, libuuid, zlib" +TERMUX_PKG_BREAKS="apache2-dev" +TERMUX_PKG_REPLACES="apache2-dev" TERMUX_PKG_CONFFILES=" etc/apache2/httpd.conf etc/apache2/extra/httpd-autoindex.conf @@ -68,7 +70,6 @@ ac_cv_have_threadsafe_pollset=no " TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_RM_AFTER_INSTALL="share/apache2/manual etc/apache2/original share/man/man8/suexec.8 libexec/httpd.exp" -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/apache2/build" TERMUX_PKG_EXTRA_MAKE_ARGS="-s" termux_step_pre_configure() { diff --git a/packages/apr-util/build.sh b/packages/apr-util/build.sh index c55d6b0ae..76640b8f0 100644 --- a/packages/apr-util/build.sh +++ b/packages/apr-util/build.sh @@ -2,14 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://apr.apache.org/ TERMUX_PKG_DESCRIPTION="Apache Portable Runtime Utility Library" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=1.6.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b TERMUX_PKG_SRCURL=http://apache.mirrors.spacedump.net/apr/apr-util-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_DEPENDS="apr, libcrypt, libexpat, libiconv, libuuid" +TERMUX_PKG_BREAKS="apr-util-dev" +TERMUX_PKG_REPLACES="apr-util-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_lib_pq_PQsendQueryPrepared=no --with-apr=$TERMUX_PREFIX --without-sqlite3 " -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/apu-1-config" TERMUX_PKG_RM_AFTER_INSTALL="lib/aprutil.exp" diff --git a/packages/apr/build.sh b/packages/apr/build.sh index fa1936e9c..e89c85d44 100644 --- a/packages/apr/build.sh +++ b/packages/apr/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://apr.apache.org/ TERMUX_PKG_DESCRIPTION="Apache Portable Runtime Library" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=1.7.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=http://apache.mirrors.spacedump.net/apr/apr-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea TERMUX_PKG_DEPENDS="libuuid" +TERMUX_PKG_BREAKS="apr-dev" +TERMUX_PKG_REPLACES="apr-dev" TERMUX_PKG_BUILD_IN_SRC="yes" # "ac_cv_search_crypt=" to avoid needlessly linking to libcrypt. TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" @@ -18,7 +20,6 @@ apr_cv_process_shared_works=no apr_cv_tcp_nodelay_with_cork=yes ac_cv_sizeof_struct_iovec=$(( TERMUX_ARCH_BITS==32 ? 8 : 16 )) ac_cv_search_crypt=" -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/apr-1-config share/apr-1/build" TERMUX_PKG_RM_AFTER_INSTALL="lib/apr.exp" termux_step_post_make_install() { diff --git a/packages/argp/build.sh b/packages/argp/build.sh index 478ffc73a..b8c8e5d59 100644 --- a/packages/argp/build.sh +++ b/packages/argp/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.lysator.liu.se/~nisse/misc/ TERMUX_PKG_DESCRIPTION="Standalone version of arguments parsing functions from GLIBC" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be TERMUX_PKG_SRCURL=https://www.lysator.liu.se/~nisse/misc/argp-standalone-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_KEEP_STATIC_LIBRARIES=true -TERMUX_PKG_NO_DEVELSPLIT=true +TERMUX_PKG_NO_STATICSPLIT=yes termux_step_post_make_install() { cp libargp.a $TERMUX_PREFIX/lib diff --git a/packages/attr/build.sh b/packages/attr/build.sh index f3617d8ee..5bf07bc95 100644 --- a/packages/attr/build.sh +++ b/packages/attr/build.sh @@ -2,8 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://savannah.nongnu.org/projects/attr/ TERMUX_PKG_DESCRIPTION="Utilities for manipulating filesystem extended attributes" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.4.48 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://download.savannah.gnu.org/releases/attr/attr-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7 +TERMUX_PKG_BREAKS="attr-dev" +TERMUX_PKG_REPLACES="attr-dev" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gettext=no" # TERMUX_PKG_MAKE_INSTALL_TARGET="install install-lib" diff --git a/packages/babl/build.sh b/packages/babl/build.sh index 7985f25cf..7424e7dc9 100644 --- a/packages/babl/build.sh +++ b/packages/babl/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://gegl.org/babl/ TERMUX_PKG_DESCRIPTION="Dynamic pixel format translation library" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_VERSION=0.1.68 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/GNOME/babl/archive/BABL_${TERMUX_PKG_VERSION//./_}.tar.gz TERMUX_PKG_SHA256=788f60c6ae9a78c9ed7b6a0f2a1e2c493d81a5b1e5f3c795447b01824331637e TERMUX_PKG_DEPENDS="littlecms" +TERMUX_PKG_BREAKS="babl-dev" +TERMUX_PKG_REPLACES="babl-dev" termux_step_pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/packages/bash/build.sh b/packages/bash/build.sh index 70b5f8950..2c5103c4e 100644 --- a/packages/bash/build.sh +++ b/packages/bash/build.sh @@ -4,10 +4,12 @@ TERMUX_PKG_LICENSE="GPL-3.0" _MAIN_VERSION=5.0 _PATCH_VERSION=7 TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION} -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/bash/bash-${_MAIN_VERSION}.tar.gz TERMUX_PKG_SHA256=b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d TERMUX_PKG_DEPENDS="command-not-found, libandroid-support, libiconv, ncurses, readline (>= 8.0), termux-tools" +TERMUX_PKG_BREAKS="bash-dev" +TERMUX_PKG_REPLACES="bash-dev" TERMUX_PKG_ESSENTIAL=true TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/binutils/build.sh b/packages/binutils/build.sh index 53d992a1e..8509a25ac 100644 --- a/packages/binutils/build.sh +++ b/packages/binutils/build.sh @@ -2,14 +2,16 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/binutils/ TERMUX_PKG_DESCRIPTION="Collection of binary tools, the main ones being ld, the GNU linker, and as, the GNU assembler" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.32 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SHA256=9b0d97b3d30df184d302bced12f976aa1e5fbf4b0be696cdebc6cca30411a46e TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/binutils/binutils-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libc++, zlib" +TERMUX_PKG_BREAKS="binutils-dev" +TERMUX_PKG_REPLACES="binutils-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gold --enable-plugins --disable-werror --with-system-zlib --enable-new-dtags" TERMUX_PKG_EXTRA_MAKE_ARGS="tooldir=$TERMUX_PREFIX" TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1/windmc.1 share/man/man1/windres.1 bin/ld.bfd" -TERMUX_PKG_KEEP_STATIC_LIBRARIES=true +TERMUX_PKG_NO_STATICSPLIT=yes TERMUX_PKG_HAS_DEBUG=no # Debug build fails with: # ~/termux-build/binutils/src/binutils/readelf.c:19060:81: error: in call to 'fread', size * count is too large for the given buffer diff --git a/packages/boost/build.sh b/packages/boost/build.sh index 85815134d..dd404cecc 100644 --- a/packages/boost/build.sh +++ b/packages/boost/build.sh @@ -2,14 +2,14 @@ TERMUX_PKG_HOMEPAGE=https://boost.org TERMUX_PKG_DESCRIPTION="Free peer-reviewed portable C++ source libraries" TERMUX_PKG_LICENSE="BSL-1.0" TERMUX_PKG_VERSION=1.70.0 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://dl.bintray.com/boostorg/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2 TERMUX_PKG_SHA256=430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778 TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_DEPENDS="libc++, libbz2, libiconv, liblzma, zlib" TERMUX_PKG_BUILD_DEPENDS="python, python2" -TERMUX_PKG_BREAKS="libboost-python (<= 1.65.1-2)" -TERMUX_PKG_REPLACES="libboost-python (<= 1.65.1-2)" +TERMUX_PKG_BREAKS="libboost-python (<= 1.65.1-2), boost-dev" +TERMUX_PKG_REPLACES="libboost-python (<= 1.65.1-2), boost-dev" termux_step_make_install() { CXXFLAGS+=" -std=c++14" diff --git a/packages/brotli/build.sh b/packages/brotli/build.sh index 81128c27b..d84466535 100644 --- a/packages/brotli/build.sh +++ b/packages/brotli/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/google/brotli TERMUX_PKG_DESCRIPTION="lossless compression algorithm and format (command line utility)" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=1.0.7 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=4c61bfb0faca87219ea587326c467b95acb25555b53d1a421ffa3c8a9296ee2c +TERMUX_PKG_BREAKS="brotli-dev" +TERMUX_PKG_REPLACES="brotli-dev" TERMUX_PKG_SRCURL=https://github.com/google/brotli/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_FORCE_CMAKE=yes diff --git a/packages/build-essential/build.sh b/packages/build-essential/build.sh index ca2f85682..55fe48b27 100644 --- a/packages/build-essential/build.sh +++ b/packages/build-essential/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A metapackage that installs essential development tools" TERMUX_PKG_LICENSE="Public Domain" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=3.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_METAPACKAGE=yes TERMUX_PKG_PLATFORM_INDEPENDENT=yes @@ -19,7 +20,7 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=yes TERMUX_PKG_DEPENDS="autoconf, automake, bison, clang, cmake, flex, gperf, libtool, m4, make, ninja, pkg-config, bc, bzip2, coreutils, diffutils, ed, findutils, gawk, grep, gzip, lzip, lzop, patch, procps, psmisc, sed, tar, util-linux, xz-utils" # Other packages that may be interesting. -TERMUX_PKG_SUGGESTS="git, golang, nodejs, patchelf, proot, python-dev, python2-dev, ruby-dev, rust, subversion" +TERMUX_PKG_SUGGESTS="git, golang, nodejs, patchelf, proot, python, python2, ruby, rust, subversion" termux_step_post_massage() { cd "$TERMUX_PKG_MASSAGEDIR" diff --git a/packages/c-ares/build.sh b/packages/c-ares/build.sh index 7c70a83e9..33982a9cf 100644 --- a/packages/c-ares/build.sh +++ b/packages/c-ares/build.sh @@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://c-ares.haxx.se TERMUX_PKG_DESCRIPTION="Library for asynchronous DNS requests (including name resolves)" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=1.15.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/c-ares/c-ares/archive/cares-${TERMUX_PKG_VERSION//./_}.tar.gz TERMUX_PKG_SHA256=7deb7872cbd876c29036d5f37e30c4cbc3cc068d59d8b749ef85bb0736649f04 +TERMUX_PKG_BREAKS="c-ares-dev" +TERMUX_PKG_REPLACES="c-ares-dev" # Build with cmake to install cmake/c-ares/*.cmake files: TERMUX_PKG_FORCE_CMAKE=yes TERMUX_PKG_RM_AFTER_INSTALL="bin/" diff --git a/packages/c-toxcore/build.sh b/packages/c-toxcore/build.sh index 8d303e19f..ae8b66f45 100644 --- a/packages/c-toxcore/build.sh +++ b/packages/c-toxcore/build.sh @@ -3,9 +3,12 @@ TERMUX_PKG_DESCRIPTION="Backend library for the Tox protocol" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=0.2.10 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=5ccc4ecd79b95c367efe8341b06bf2a81f853032e6fcd7cb2bc0ad0ef7419d40 TERMUX_PKG_SRCURL=https://github.com/TokTok/toxcore/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libsodium" +TERMUX_PKG_BREAKS="c-toxcore-dev" +TERMUX_PKG_REPLACES="c-toxcore-dev" #TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DCMAKE_INSTALL_PREFIX=${TERMUX_PREFIX} diff --git a/packages/capstone/build.sh b/packages/capstone/build.sh index 156c8bee6..20c37109e 100644 --- a/packages/capstone/build.sh +++ b/packages/capstone/build.sh @@ -3,7 +3,9 @@ TERMUX_PKG_DESCRIPTION="Lightweight multi-platform, multi-architecture disassemb TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=4.0.1 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/aquynh/capstone/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=79bbea8dbe466bd7d051e037db5961fdb34f67c9fac5c3471dd105cfb1e05dc7 +TERMUX_PKG_BREAKS="capstone-dev" +TERMUX_PKG_REPLACES="capstone-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DINSTALL_LIB_DIR=$TERMUX_PREFIX/lib" diff --git a/packages/clamav/build.sh b/packages/clamav/build.sh index d027b4a18..72d109e2d 100644 --- a/packages/clamav/build.sh +++ b/packages/clamav/build.sh @@ -3,10 +3,12 @@ TERMUX_PKG_DESCRIPTION="Anti-virus toolkit for Unix" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=0.101.2 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://www.clamav.net/downloads/production/clamav-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=0a12ebdf6ff7a74c0bde2bdc2b55cae33449e6dd953ec90824a9e01291277634 TERMUX_PKG_DEPENDS="json-c, libandroid-support, libbz2, libc++, libcurl, libltdl, liblzma, libxml2, openssl, pcre2, zlib" +TERMUX_PKG_BREAKS="clamav-dev" +TERMUX_PKG_REPLACES="clamav-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --sysconfdir=$TERMUX_PREFIX/etc/clamav diff --git a/packages/cmark/build.sh b/packages/cmark/build.sh index af106d9b2..71b2b0adf 100644 --- a/packages/cmark/build.sh +++ b/packages/cmark/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://github.com/github/cmark TERMUX_PKG_DESCRIPTION="CommonMark parsing and rendering program" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_VERSION=0.29.0.gfm.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=6a94aeaa59a583fadcbf28de81dea8641b3f56d935dda5b2447a3c8df6c95fea +TERMUX_PKG_BREAKS="cmark-dev" +TERMUX_PKG_REPLACES="cmark-dev" TERMUX_PKG_SRCURL=https://github.com/github/cmark/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_INSTALL_LIBDIR=$TERMUX_PREFIX/lib" -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="lib/cmake-gfm-extensions" termux_step_post_make_install() { cd $TERMUX_PREFIX/bin diff --git a/packages/dbus-glib/build.sh b/packages/dbus-glib/build.sh index 5ef1d4dba..2db604a5a 100644 --- a/packages/dbus-glib/build.sh +++ b/packages/dbus-glib/build.sh @@ -3,10 +3,12 @@ TERMUX_PKG_DESCRIPTION="GLib bindings for DBUS" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Tristan Ross " TERMUX_PKG_VERSION=0.110 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL="https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-$TERMUX_PKG_VERSION.tar.gz" TERMUX_PKG_SHA256=7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825 TERMUX_PKG_DEPENDS="dbus, glib" +TERMUX_PKG_BREAKS="dbus-glib-dev" +TERMUX_PKG_REPLACES="dbus-glib-dev" TERMUX_PKG_HOSTBUILD=true termux_step_host_build() { diff --git a/packages/dbus/build.sh b/packages/dbus/build.sh index 53518c3e1..a0fee2241 100644 --- a/packages/dbus/build.sh +++ b/packages/dbus/build.sh @@ -3,10 +3,12 @@ TERMUX_PKG_DESCRIPTION="Freedesktop.org message bus system" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Tristan Ross " TERMUX_PKG_VERSION=1.12.16 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL="https://dbus.freedesktop.org/releases/dbus/dbus-$TERMUX_PKG_VERSION.tar.gz" TERMUX_PKG_SHA256=54a22d2fa42f2eb2a871f32811c6005b531b9613b1b93a0d269b05e7549fec80 TERMUX_PKG_DEPENDS="libexpat" +TERMUX_PKG_BREAKS="dbus-dev" +TERMUX_PKG_REPLACES="dbus-dev" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-libaudit --disable-systemd --disable-tests" diff --git a/packages/dnsutils/build.sh b/packages/dnsutils/build.sh index 451794257..8146b7c5f 100644 --- a/packages/dnsutils/build.sh +++ b/packages/dnsutils/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.isc.org/downloads/bind/ TERMUX_PKG_DESCRIPTION="Clients provided with BIND" TERMUX_PKG_LICENSE="MPL-2.0" TERMUX_PKG_VERSION=9.14.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="ftp://ftp.isc.org/isc/bind9/${TERMUX_PKG_VERSION}/bind-${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SHA256=312efb82a6889074f31ef2849af498b3ec97ca69acd5c4e5e4b4045a8fe6b83f TERMUX_PKG_DEPENDS="openssl, readline, resolv-conf, zlib" +TERMUX_PKG_BREAKS="dnsutils-dev" +TERMUX_PKG_REPLACES="dnsutils-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-linux-caps --without-python diff --git a/packages/dpkg/build.sh b/packages/dpkg/build.sh index f94a522bd..97777a01f 100644 --- a/packages/dpkg/build.sh +++ b/packages/dpkg/build.sh @@ -2,11 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/dpkg TERMUX_PKG_DESCRIPTION="Debian package management system" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.19.7 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 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="bzip2, coreutils, diffutils, gzip, less, libbz2, liblzma, tar, xz-utils, zlib" +TERMUX_PKG_BREAKS="dpkg-dev" +TERMUX_PKG_REPLACES="dpkg-dev" TERMUX_PKG_ESSENTIAL=yes TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/dtc/build.sh b/packages/dtc/build.sh index 3455b4d08..193f750b4 100644 --- a/packages/dtc/build.sh +++ b/packages/dtc/build.sh @@ -3,7 +3,10 @@ TERMUX_PKG_DESCRIPTION="Device Tree Compiler" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=1.5.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/dtc-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=3416f10ca69b0b911f027a9cb96471485dd8705705fc4813283f963299eaae0a +TERMUX_PKG_BREAKS="dtc-dev" +TERMUX_PKG_REPLACES="dtc-dev" TERMUX_PKG_EXTRA_MAKE_ARGS="PREFIX=$TERMUX_PREFIX" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/e2fsprogs/build.sh b/packages/e2fsprogs/build.sh index c3f91ce95..84f653d72 100644 --- a/packages/e2fsprogs/build.sh +++ b/packages/e2fsprogs/build.sh @@ -4,14 +4,16 @@ TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.0, MIT" TERMUX_PKG_LICENSE_FILE="NOTICE" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=1.45.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v$TERMUX_PKG_VERSION/e2fsprogs-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=90d10066b815e27b0b4875f0d5e396c663e0bf55aa3ca10868978d10c6ffe595 -TERMUX_PKG_KEEP_STATIC_LIBRARIES=true -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="lib/*.a" TERMUX_PKG_CONFFILES="etc/mke2fs.conf" +TERMUX_PKG_NO_STATICSPLIT=yes ## util-linux provides libblkid TERMUX_PKG_DEPENDS="libuuid, util-linux" +TERMUX_PKG_BREAKS="e2fsprogs-dev" +TERMUX_PKG_REPLACES="e2fsprogs-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --sbindir=${TERMUX_PREFIX}/bin diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh index 526e423cc..57c98cb56 100644 --- a/packages/emacs/build.sh +++ b/packages/emacs/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/emacs/ TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=26.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=151ce69dbe5b809d4492ffae4a4b153b2778459de6deb26f35691e1281a9c58e TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_DEPENDS="ncurses, gnutls, libxml2" +TERMUX_PKG_BREAKS="emacs-dev" +TERMUX_PKG_REPLACES="emacs-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-autodepend --with-gif=no diff --git a/packages/erlang/build.sh b/packages/erlang/build.sh index 603df09d4..d192f5e38 100644 --- a/packages/erlang/build.sh +++ b/packages/erlang/build.sh @@ -2,15 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://www.erlang.org/ TERMUX_PKG_DESCRIPTION="General-purpose concurrent functional programming language" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=22.0.7 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/erlang/otp/archive/OTP-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=04c090b55ec4a01778e7e1a5b7fdf54012548ca72737965b7aa8c4d7878c92bc TERMUX_PKG_DEPENDS="openssl, ncurses, zlib" +TERMUX_PKG_NO_STATICSPLIT=yes TERMUX_PKG_HOSTBUILD="yes" TERMUX_PKG_BUILD_IN_SRC="yes" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-javac --with-ssl=${TERMUX_PREFIX} --with-termcap" TERMUX_PKG_EXTRA_MAKE_ARGS="noboot" -TERMUX_PKG_KEEP_STATIC_LIBRARIES="true" -TERMUX_PKG_NO_DEVELSPLIT="yes" termux_step_post_extract_package() { # We need a host build every time: diff --git a/packages/espeak/build.sh b/packages/espeak/build.sh index 971765674..2afa3e69c 100644 --- a/packages/espeak/build.sh +++ b/packages/espeak/build.sh @@ -5,8 +5,10 @@ TERMUX_PKG_LICENSE="GPL-2.0" # See https://github.com/espeak-ng/espeak-ng/issues/180 # about cross compilation of espeak-ng. TERMUX_PKG_VERSION=1.49.2 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=cf7ed86850b99bafe819548c73a6651a74300980dd15f319ff22e2bd72ea20b4 +TERMUX_PKG_BREAKS="espeak-dev" +TERMUX_PKG_REPLACES="espeak-dev" TERMUX_PKG_SRCURL=https://github.com/espeak-ng/espeak-ng/releases/download/${TERMUX_PKG_VERSION}/espeak-ng-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_HOSTBUILD=yes diff --git a/packages/exiv2/build.sh b/packages/exiv2/build.sh index ce9560acf..27b15c186 100644 --- a/packages/exiv2/build.sh +++ b/packages/exiv2/build.sh @@ -3,10 +3,12 @@ TERMUX_PKG_DESCRIPTION="Exif, Iptc and XMP metadata manipulation library and too TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=0.27.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/Exiv2/exiv2/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=1b3766b2c203ce213a4195de14d61694017ec1a69d15d4575bccecef130990fe TERMUX_PKG_DEPENDS="libandroid-support, libc++, libexpat, zlib" +TERMUX_PKG_BREAKS="exiv2-dev" +TERMUX_PKG_REPLACES="exiv2-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DEXIV2_ENABLE_VIDEO=ON diff --git a/packages/expect/build.sh b/packages/expect/build.sh index 561c1d4f1..801aefe7c 100644 --- a/packages/expect/build.sh +++ b/packages/expect/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://core.tcl.tk/expect/index TERMUX_PKG_DESCRIPTION="Tool for automating interactive terminal applications" TERMUX_PKG_LICENSE="Public Domain" TERMUX_PKG_VERSION=5.45.4 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/expect/Expect/${TERMUX_PKG_VERSION}/expect${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="tcl" +TERMUX_PKG_BREAKS="expect-dev" +TERMUX_PKG_REPLACES="expect-dev" termux_step_pre_configure() { autoconf diff --git a/packages/fakeroot/build.sh b/packages/fakeroot/build.sh index 908897585..b0b19b2eb 100644 --- a/packages/fakeroot/build.sh +++ b/packages/fakeroot/build.sh @@ -3,11 +3,11 @@ TERMUX_PKG_DESCRIPTION="Tool for simulating superuser privileges (with tcp ipc)" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=1.23 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_${TERMUX_PKG_VERSION}.orig.tar.xz TERMUX_PKG_SHA256=009cd6696a931562cf1c212bb57ca441a4a2d45cd32c3190a35c7ae98506f4f6 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ipc=tcp" -TERMUX_PKG_BUILD_DEPENDS="libcap-dev" +TERMUX_PKG_BUILD_DEPENDS="libcap" termux_step_post_make_install() { ln -sfr "${TERMUX_PREFIX}/lib/libfakeroot-0.so" "${TERMUX_PREFIX}/lib/libfakeroot.so" diff --git a/packages/fcgi/build.sh b/packages/fcgi/build.sh index b7ef58564..9ba28dc61 100644 --- a/packages/fcgi/build.sh +++ b/packages/fcgi/build.sh @@ -3,8 +3,11 @@ TERMUX_PKG_DESCRIPTION="A language independent, high performant extension to CGI TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="LICENSE.TERMS" TERMUX_PKG_VERSION=2.4.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://sources.archlinux.org/other/packages/fcgi/fcgi-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9 +TERMUX_PKG_BREAKS="fcgi-dev" +TERMUX_PKG_REPLACES="fcgi-dev" termux_step_pre_configure() { libtoolize --automake --copy --force diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh index 414f1e246..6d08a5c95 100644 --- a/packages/ffmpeg/build.sh +++ b/packages/ffmpeg/build.sh @@ -3,12 +3,13 @@ TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multim TERMUX_PKG_LICENSE="GPL-3.0" # NOTE: mpv has to be rebuilt and version bumped after updating ffmpeg. TERMUX_PKG_VERSION=4.1.4 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=f1f049a82fcfbf156564e73a3935d7e750891fab2abf302e735104fd4050a7e1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz +TERMUX_PKG_SHA256=f1f049a82fcfbf156564e73a3935d7e750891fab2abf302e735104fd4050a7e1 TERMUX_PKG_DEPENDS="libass, libbz2, libiconv, libsoxr, libx264, libx265, xvidcore, libvorbis, libmp3lame, libopus, libvpx, libgnutls, libandroid-glob, freetype, zlib, liblzma" -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples" TERMUX_PKG_CONFLICTS="libav" +TERMUX_PKG_BREAKS="ffmpeg-dev" +TERMUX_PKG_REPLACES="ffmpeg-dev" termux_step_configure() { cd $TERMUX_PKG_BUILDDIR diff --git a/packages/fftw/build.sh b/packages/fftw/build.sh index 343b29dce..347e56de6 100644 --- a/packages/fftw/build.sh +++ b/packages/fftw/build.sh @@ -2,15 +2,16 @@ TERMUX_PKG_HOMEPAGE=http://www.fftw.org/ TERMUX_PKG_DESCRIPTION="Library for computing the Discrete Fourier Transform (DFT) in one or more dimensions" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=3.3.8 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303 +TERMUX_PKG_BREAKS="fftw-dev" +TERMUX_PKG_REPLACES="fftw-dev" TERMUX_PKG_SRCURL=http://www.fftw.org/fftw-${TERMUX_PKG_VERSION}.tar.gz # ac_cv_func_clock_gettime=no avoids having clock_gettime(CLOCK_SGI_CYCLE, &t) # being used. It's not supported on Android but fails at runtime and, fftw # does not check the return value so gets bogus values. TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-threads ac_cv_func_clock_gettime=no" TERMUX_PKG_RM_AFTER_INSTALL="include/fftw*.f*" -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/ share/man/" termux_step_post_make_install() { local COMMON_ARGS="$TERMUX_PKG_EXTRA_CONFIGURE_ARGS" diff --git a/packages/file/build.sh b/packages/file/build.sh index 1615bad7b..710222443 100644 --- a/packages/file/build.sh +++ b/packages/file/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://darwinsys.com/file/ TERMUX_PKG_DESCRIPTION="Command-line tool that tells you in words what kind of data a file contains" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_VERSION=5.37 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=ftp://ftp.astron.com/pub/file/file-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e9c13967f7dd339a3c241b7710ba093560b9a33013491318e88e6b8b57bae07f TERMUX_PKG_DEPENDS="zlib" +TERMUX_PKG_BREAKS="file-dev" +TERMUX_PKG_REPLACES="file-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_mmap_fixed_mapped=yes" TERMUX_PKG_EXTRA_MAKE_ARGS="FILE_COMPILE=$TERMUX_PKG_HOSTBUILD_DIR/src/file" TERMUX_PKG_HOSTBUILD="yes" diff --git a/packages/finch/build.sh b/packages/finch/build.sh index 4fb936185..a40b304ad 100644 --- a/packages/finch/build.sh +++ b/packages/finch/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://pidgin.im/ TERMUX_PKG_DESCRIPTION="Text-based multi-protocol instant messaging client" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.13.0 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/pidgin/Pidgin/${TERMUX_PKG_VERSION}/pidgin-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_DEPENDS="libiconv, libgnutls, libxml2, ncurses-ui-libs, glib" +TERMUX_PKG_BREAKS="finch-dev" +TERMUX_PKG_REPLACES="finch-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-gtkui --disable-gstreamer diff --git a/packages/flex/build.sh b/packages/flex/build.sh index 6d1091f92..6caa09974 100644 --- a/packages/flex/build.sh +++ b/packages/flex/build.sh @@ -2,12 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://github.com/westes/flex TERMUX_PKG_DESCRIPTION="Fast lexical analyser generator" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_VERSION=2.6.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/westes/flex/releases/download/v${TERMUX_PKG_VERSION}/flex-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 TERMUX_PKG_DEPENDS="m4" TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="ac_cv_path_M4=$TERMUX_PREFIX/bin/m4" -TERMUX_PKG_NO_DEVELSPLIT=yes TERMUX_PKG_CONFLICTS="flex-dev" TERMUX_PKG_REPLACES="flex-dev" diff --git a/packages/fontconfig/build.sh b/packages/fontconfig/build.sh index 364edbf39..66a5e026f 100644 --- a/packages/fontconfig/build.sh +++ b/packages/fontconfig/build.sh @@ -2,11 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/fontconfig/ TERMUX_PKG_DESCRIPTION="Library for configuring and customizing font access" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=2.13.1 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SHA256=f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741 TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/fontconfig/release/fontconfig-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_DEPENDS="freetype, libxml2, libpng, libuuid, zlib" -TERMUX_PKG_DEVPACKAGE_DEPENDS="freetype-dev, libxml2-dev" +TERMUX_PKG_BREAKS="fontconfig-dev" +TERMUX_PKG_REPLACES="fontconfig-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-libxml2 --enable-iconv=no diff --git a/packages/freetype/build.sh b/packages/freetype/build.sh index 4c211402d..45774d553 100644 --- a/packages/freetype/build.sh +++ b/packages/freetype/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.freetype.org TERMUX_PKG_DESCRIPTION="Software font engine capable of producing high-quality output" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.10.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=16dbfa488a21fe827dc27eaf708f42f7aa3bb997d745d31a19781628c36ba26f TERMUX_PKG_SRCURL=https://download.savannah.gnu.org/releases/freetype/freetype-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_DEPENDS="libbz2, libpng, zlib" -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/freetype-config share/man/man1/freetype-config.1" +TERMUX_PKG_BREAKS="freetype-dev" +TERMUX_PKG_REPLACES="freetype-dev" # Use with-harfbuzz=no to avoid circular dependency between freetype and harfbuzz: TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-harfbuzz=no" # not install these files anymore so install them manually. diff --git a/packages/fribidi/build.sh b/packages/fribidi/build.sh index 4a1c98529..d5e0c9fea 100644 --- a/packages/fribidi/build.sh +++ b/packages/fribidi/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/fribidi/fribidi/ TERMUX_PKG_DESCRIPTION="Implementation of the Unicode Bidirectional Algorithm" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.0.5 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce TERMUX_PKG_SRCURL=https://github.com/fribidi/fribidi/releases/download/v$TERMUX_PKG_VERSION/fribidi-$TERMUX_PKG_VERSION.tar.bz2 TERMUX_PKG_DEPENDS="glib" +TERMUX_PKG_BREAKS="fribidi-dev" +TERMUX_PKG_REPLACES="fribidi-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-docs" diff --git a/packages/fwknop/build.sh b/packages/fwknop/build.sh index ed5d7a9b2..908a72e2f 100644 --- a/packages/fwknop/build.sh +++ b/packages/fwknop/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.cipherdyne.org/fwknop/ TERMUX_PKG_DESCRIPTION="fwknop: Single Packet Authorization > Port Knocking" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.6.10 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77 TERMUX_PKG_SRCURL=https://www.cipherdyne.org/fwknop/download/fwknop-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_DEPENDS="gpgme" +TERMUX_PKG_BREAKS="fwknop-dev" +TERMUX_PKG_REPLACES="fwknop-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-server --with-gpgme diff --git a/packages/gawk/build.sh b/packages/gawk/build.sh index 818e5029f..f3d25ec34 100644 --- a/packages/gawk/build.sh +++ b/packages/gawk/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gawk/ TERMUX_PKG_DESCRIPTION="Programming language designed for text processing" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=5.0.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gawk/gawk-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794 TERMUX_PKG_DEPENDS="libandroid-support, libgmp, libmpfr, readline" +TERMUX_PKG_BREAKS="gawk-dev" +TERMUX_PKG_REPLACES="gawk-dev" TERMUX_PKG_RM_AFTER_INSTALL="bin/gawk-* bin/igawk share/man/man1/igawk.1" termux_step_pre_configure() { diff --git a/packages/gdb/build.sh b/packages/gdb/build.sh index 4d5686b1a..7e66899d5 100644 --- a/packages/gdb/build.sh +++ b/packages/gdb/build.sh @@ -2,15 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gdb/ TERMUX_PKG_DESCRIPTION="The standard GNU Debugger that runs on many Unix-like systems and works for many programming languages" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=8.3 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gdb/gdb-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=802f7ee309dcc547d65a68d61ebd6526762d26c3051f52caebe2189ac1ffd72e TERMUX_PKG_DEPENDS="libc++, liblzma, libexpat, readline, ncurses, libmpfr, zlib" -# gdb can not build with our normal --disable-static: https://sourceware.org/bugzilla/show_bug.cgi?id=15916 +TERMUX_PKG_BREAKS="gdb-dev" +TERMUX_PKG_REPLACES="gdb-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-system-readline --with-curses ---enable-static ac_cv_func_getpwent=no ac_cv_func_getpwnam=no " diff --git a/packages/gdbm/build.sh b/packages/gdbm/build.sh index 7333c9aee..07ea0e84b 100644 --- a/packages/gdbm/build.sh +++ b/packages/gdbm/build.sh @@ -2,7 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org.ua/software/gdbm/ TERMUX_PKG_DESCRIPTION="Library of database functions that use extensible hashing" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=1.18.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc +TERMUX_PKG_BREAKS="gdbm-dev" +TERMUX_PKG_REPLACES="gdbm-dev" TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gdbm/gdbm-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-readline --enable-libgdbm-compat" diff --git a/packages/gdk-pixbuf/build.sh b/packages/gdk-pixbuf/build.sh index 5a40ce1ba..cb9f0c2ce 100644 --- a/packages/gdk-pixbuf/build.sh +++ b/packages/gdk-pixbuf/build.sh @@ -6,7 +6,8 @@ TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=f19ff836ba991031610dcc53774e8ca436160f7d981867c8c3a37acfe493ab3a TERMUX_PKG_SRCURL=ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${TERMUX_PKG_VERSION:0:4}/gdk-pixbuf-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_DEPENDS="glib, libpng, libtiff, libjpeg-turbo" -TERMUX_PKG_DEVPACKAGE_DEPENDS="libpng-dev, glib-dev" +TERMUX_PKG_BREAKS="gdk-pixbuf-dev" +TERMUX_PKG_REPLACES="gdk-pixbuf-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dgio_sniffing=false -Dgir=false diff --git a/packages/gegl/build.sh b/packages/gegl/build.sh index ecf8520a9..5d749dce6 100644 --- a/packages/gegl/build.sh +++ b/packages/gegl/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://gegl.org/ TERMUX_PKG_DESCRIPTION="Data flow based image processing framework" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=0.4.16 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://download.gimp.org/pub/gegl/${TERMUX_PKG_VERSION:0:3}/gegl-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=0112df690301d9eb993cc48965fc71b7751c9021a4f4ee08fcae366c326b5e5a TERMUX_PKG_DEPENDS="libandroid-support, libc++, ffmpeg, babl, json-glib, libjpeg-turbo, libpng, libjasper, littlecms, libtiff, librsvg, zlib" +TERMUX_PKG_BREAKS="gegl-dev" +TERMUX_PKG_REPLACES="gegl-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --without-gdk-pixbuf ac_cv_func_bind_textdomain_codeset=yes diff --git a/packages/gettext/build.sh b/packages/gettext/build.sh index c60dbe238..29e400d46 100644 --- a/packages/gettext/build.sh +++ b/packages/gettext/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gettext/ TERMUX_PKG_DESCRIPTION="GNU Internationalization utilities" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=0.20.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gettext/gettext-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800 TERMUX_PKG_DEPENDS="libc++, libiconv, pcre, liblzma, libxml2, libcroco, ncurses, libunistring, zlib" +TERMUX_PKG_BREAKS="gettext-dev" +TERMUX_PKG_REPLACES="gettext-dev" TERMUX_PKG_BUILD_IN_SRC=yes termux_step_pre_configure() { diff --git a/packages/giflib/build.sh b/packages/giflib/build.sh index 81e5c7d1a..57736f6a6 100644 --- a/packages/giflib/build.sh +++ b/packages/giflib/build.sh @@ -3,6 +3,9 @@ TERMUX_PKG_DESCRIPTION="A library for reading and writing gif images" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=5.2.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd +TERMUX_PKG_BREAKS="giflib-dev" +TERMUX_PKG_REPLACES="giflib-dev" TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/giflib-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/glib/build.sh b/packages/glib/build.sh index 9ea18baf5..6a5a44dfe 100644 --- a/packages/glib/build.sh +++ b/packages/glib/build.sh @@ -2,14 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://developer.gnome.org/glib/ TERMUX_PKG_DESCRIPTION="Library providing core building blocks for libraries and applications written in C" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_VERSION=2.60.6 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/glib/${TERMUX_PKG_VERSION:0:4}/glib-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=ff8fab8d8deaa4fd0536c90f90d9769a09071779c7e6183907f6855645bffb6c # libandroid-support to get langinfo.h in include path. TERMUX_PKG_DEPENDS="libffi, libiconv, pcre, libandroid-support, zlib" +TERMUX_PKG_BREAKS="glib-dev" +TERMUX_PKG_REPLACES="glib-dev" TERMUX_PKG_RM_AFTER_INSTALL="share/gtk-doc lib/locale share/glib-2.0/gettext share/gdb/auto-load share/glib-2.0/codegen share/glib-2.0/gdb bin/gtester-report bin/glib-gettextize bin/gdbus-codegen" # Needed by pkg-config for glib-2.0: -TERMUX_PKG_DEVPACKAGE_DEPENDS="pcre-dev" -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="lib/glib-2.0/include" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dlibmount=false -Diconv=gnu diff --git a/packages/gmic/build.sh b/packages/gmic/build.sh index 0bf80ba60..2173f8842 100644 --- a/packages/gmic/build.sh +++ b/packages/gmic/build.sh @@ -2,12 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://gmic.eu TERMUX_PKG_DESCRIPTION="Full-featured framework for image processing" TERMUX_PKG_LICENSE="CeCILL-2.1" TERMUX_PKG_VERSION=2.6.7 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://gmic.eu/files/source/gmic_$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=2e5535d1bae66254136e928428750aac8efcef6f4413fc352b6de9ce8ac8b0ff TERMUX_PKG_DEPENDS="libc++, libcurl, fftw, libpng, libjpeg-turbo, libtiff, zlib" TERMUX_PKG_BUILD_DEPENDS="graphicsmagick" -TERMUX_PKG_NO_DEVELSPLIT=yes TERMUX_PKG_BUILD_IN_SRC=yes termux_step_configure() { diff --git a/packages/golang/build.sh b/packages/golang/build.sh index 70114340d..6e95a909a 100644 --- a/packages/golang/build.sh +++ b/packages/golang/build.sh @@ -5,10 +5,10 @@ local _MAJOR_VERSION=1.12.7 TERMUX_PKG_SHA256=95e8447d6f04b8d6a62de1726defbb20ab203208ee167ed15f83d7978ce43b13 # Use the ~ deb versioning construct in the future: TERMUX_PKG_VERSION=2:${_MAJOR_VERSION} -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz -TERMUX_PKG_KEEP_STATIC_LIBRARIES=true TERMUX_PKG_DEPENDS="clang" +TERMUX_PKG_NO_STATICSPLIT=yes termux_step_make_install() { termux_setup_golang diff --git a/packages/googletest/build.sh b/packages/googletest/build.sh index dce5a7e7b..510095a45 100644 --- a/packages/googletest/build.sh +++ b/packages/googletest/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/google/googletest TERMUX_PKG_DESCRIPTION="Google C++ testing framework" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=1.8.1 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/google/googletest/archive/release-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c TERMUX_PKG_DEPENDS="libc++" -TERMUX_PKG_NO_DEVELSPLIT=yes TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_SHARED_LIBS=ON" diff --git a/packages/gpgme/build.sh b/packages/gpgme/build.sh index 77cfb9186..d8fa0fd4c 100644 --- a/packages/gpgme/build.sh +++ b/packages/gpgme/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.gnupg.org/related_software/gpgme/ TERMUX_PKG_DESCRIPTION="Library designed to make access to GnuPG easier" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.13.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46 TERMUX_PKG_DEPENDS="gnupg (>= 2.2.9-1), libassuan, libgpg-error" -TERMUX_PKG_DEVPACKAGE_DEPENDS="libgpg-error-dev" +TERMUX_PKG_BREAKS="gpgme-dev" +TERMUX_PKG_REPLACES="gpgme-dev" # Use "--disable-gpg-test" to avoid "No rule to make target `../../src/libgpgme-pthread.la": # Use "--enable-languages=no" to only build the C library. TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" @@ -16,4 +18,3 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --without-gpgconf --without-gpgsm " -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/gpgme-config" diff --git a/packages/graphicsmagick/build.sh b/packages/graphicsmagick/build.sh index fc2387503..d629cf9c2 100644 --- a/packages/graphicsmagick/build.sh +++ b/packages/graphicsmagick/build.sh @@ -2,17 +2,16 @@ TERMUX_PKG_HOMEPAGE=http://www.graphicsmagick.org/ TERMUX_PKG_DESCRIPTION="Collection of image processing tools" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=1.3.32 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 # Bandwith limited on main ftp site, so it's asked to use sourceforge instead: TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/${TERMUX_PKG_VERSION}/GraphicsMagick-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=b842a5a0d6c84fd6c5f161b5cd8e02bbd210b0c0b6728dd762b7c53062ba94e1 TERMUX_PKG_DEPENDS="littlecms, libc++, libtiff, freetype, libjasper, libjpeg-turbo, libpng, libbz2, libxml2, liblzma, zstd, zlib" -TERMUX_PKG_REPLACES="graphicsmagick++" -TERMUX_PKG_DEVPACKAGE_REPLACES="graphicsmagick++-dev" +TERMUX_PKG_BREAKS="graphicsmagick-dev" +TERMUX_PKG_REPLACES="graphicsmagick++, graphicsmagick-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_func_ftime=no --with-fontpath=/system/fonts --without-webp --without-x " -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/*-config" diff --git a/packages/graphviz/build.sh b/packages/graphviz/build.sh index 90e3ebb02..dcf5f9fb5 100644 --- a/packages/graphviz/build.sh +++ b/packages/graphviz/build.sh @@ -3,10 +3,12 @@ TERMUX_PKG_DESCRIPTION="Rich set of graph drawing tools" TERMUX_PKG_LICENSE="EPL-2.0" TERMUX_PKG_MAINTAINER="Dustin DeWeese @HackerFoo" TERMUX_PKG_VERSION=2.40.1 -TERMUX_PKG_REVISION=8 +TERMUX_PKG_REVISION=9 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/graphviz-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421 TERMUX_PKG_DEPENDS="libandroid-glob, libc++, libcairo, pango, libexpat, libltdl, librsvg, libgd, zlib" +TERMUX_PKG_BREAKS="graphviz-dev" +TERMUX_PKG_REPLACES="graphviz-dev" TERMUX_PKG_BUILD_DEPENDS="libtool" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/gsl/build.sh b/packages/gsl/build.sh index 7bd3db0da..2d9db5cc1 100644 --- a/packages/gsl/build.sh +++ b/packages/gsl/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gsl/ TERMUX_PKG_DESCRIPTION="GNU Scientific Library (GSL) providing a wide range of mathematical routines" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.5 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=0460ad7c2542caaddc6729762952d345374784100223995eb14d614861f2258d +TERMUX_PKG_BREAKS="gsl-dev" +TERMUX_PKG_REPLACES="gsl-dev" TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gsl/gsl-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_RM_AFTER_INSTALL="bin/ share/man/man1" diff --git a/packages/gst-plugins-bad/build.sh b/packages/gst-plugins-bad/build.sh index f79eb1b25..8f0402e3a 100644 --- a/packages/gst-plugins-bad/build.sh +++ b/packages/gst-plugins-bad/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/ TERMUX_PKG_DESCRIPTION="GStreamer Bad Plug-ins" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.16.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=22139de35626ada6090bdfa3423b27b7fc15a0198331d25c95e6b12cb1072b05 TERMUX_PKG_DEPENDS="gst-plugins-base, libbz2, libcurl, libiconv, libpng, librsvg, libssh2, libsndfile, libx264, libx265, littlecms, openal-soft, openjpeg" +TERMUX_PKG_BREAKS="gst-plugins-bad-dev" +TERMUX_PKG_REPLACES="gst-plugins-bad-dev" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-android_media diff --git a/packages/gst-plugins-base/build.sh b/packages/gst-plugins-base/build.sh index 8ba791c47..08af0f7da 100644 --- a/packages/gst-plugins-base/build.sh +++ b/packages/gst-plugins-base/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/ TERMUX_PKG_DESCRIPTION="GStreamer base plug-ins" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.16.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=4093aa7b51e28fb24dfd603893fead8d1b7782f088b05ed0f22a21ef176fb5ae TERMUX_PKG_DEPENDS="gstreamer, libjpeg-turbo, libopus, libpng, libvorbis, zlib" +TERMUX_PKG_BREAKS="gst-plugins-base-dev" +TERMUX_PKG_REPLACES="gst-plugins-base-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" GLIB_GENMARSHAL=/usr/bin/glib-genmarshal GLIB_MKENUMS=/usr/bin/glib-mkenums diff --git a/packages/gstreamer/build.sh b/packages/gstreamer/build.sh index 382f5bfbd..eadd06f95 100644 --- a/packages/gstreamer/build.sh +++ b/packages/gstreamer/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/ TERMUX_PKG_DESCRIPTION="Open source multimedia framework" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.16.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=0e8e2f7118be437cba879353970cf83c2acced825ecb9275ba05d9186ef07c00 TERMUX_PKG_DEPENDS="glib" -TERMUX_PKG_DEVPACKAGE_DEPENDS="glib-dev" +TERMUX_PKG_BREAKS="gstreamer-dev" +TERMUX_PKG_REPLACES="gstreamer-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-check --disable-tests diff --git a/packages/harfbuzz/build.sh b/packages/harfbuzz/build.sh index bbcdf20c1..afc2a468d 100644 --- a/packages/harfbuzz/build.sh +++ b/packages/harfbuzz/build.sh @@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz/ TERMUX_PKG_DESCRIPTION="OpenType text shaping engine" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=2.5.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=fed00dc797b7ba3ca943225f0a854baaed4c1640fff8a31d455cd3b5caec855c TERMUX_PKG_DEPENDS="freetype, glib, libbz2, libc++, libpng, libgraphite" +TERMUX_PKG_BREAKS="harfbuzz-dev" +TERMUX_PKG_REPLACES="harfbuzz-dev" TERMUX_PKG_BUILD_DEPENDS="libicu" -TERMUX_PKG_DEVPACKAGE_DEPENDS="libgraphite-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-icu=yes --with-graphite2=yes --disable-gtk-doc-html" diff --git a/packages/hoedown/build.sh b/packages/hoedown/build.sh index 568629bfd..0152aa248 100644 --- a/packages/hoedown/build.sh +++ b/packages/hoedown/build.sh @@ -3,7 +3,9 @@ TERMUX_PKG_DESCRIPTION="Hoedown is a revived fork of Sundown, the Markdown parse TERMUX_PKG_LICENSE="ISC" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=3.0.7 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/hoedown/hoedown/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=01b6021b1ec329b70687c0d240b12edcaf09c4aa28423ddf344d2bd9056ba920 +TERMUX_PKG_BREAKS="hoedown-dev" +TERMUX_PKG_REPLACES="hoedown-dev" TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/httrack/build.sh b/packages/httrack/build.sh index 9ad128e12..82f0912e6 100644 --- a/packages/httrack/build.sh +++ b/packages/httrack/build.sh @@ -3,9 +3,11 @@ TERMUX_PKG_DESCRIPTION="It allows you to download a World Wide Web site from the TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=3.49.2 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=http://mirror.httrack.com/historical/httrack-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025 TERMUX_PKG_DEPENDS="libandroid-support, openssl, zlib" +TERMUX_PKG_BREAKS="httrack-dev" +TERMUX_PKG_REPLACES="httrack-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-zlib=$TERMUX_PREFIX" TERMUX_PKG_BUILD_IN_SRC="yes" diff --git a/packages/hunspell/build.sh b/packages/hunspell/build.sh index bfdec8056..d8c8ced72 100644 --- a/packages/hunspell/build.sh +++ b/packages/hunspell/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://hunspell.github.io TERMUX_PKG_DESCRIPTION="Spell checker" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.7.0 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://github.com/hunspell/hunspell/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a TERMUX_PKG_DEPENDS="libc++, libiconv, ncurses, readline, hunspell-en-us" +TERMUX_PKG_BREAKS="hunspell-dev" +TERMUX_PKG_REPLACES="hunspell-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ui --with-readline" TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/imagemagick/build.sh b/packages/imagemagick/build.sh index e8a3e83eb..63e48b99b 100644 --- a/packages/imagemagick/build.sh +++ b/packages/imagemagick/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.imagemagick.org/ TERMUX_PKG_DESCRIPTION="Suite to create, edit, compose, or convert images in a variety of formats" TERMUX_PKG_LICENSE="ImageMagick" TERMUX_PKG_VERSION=7.0.8.56 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/ImageMagick/ImageMagick/archive/$(echo $TERMUX_PKG_VERSION | sed 's/\(.*\)\./\1-/').tar.gz TERMUX_PKG_SHA256=061b80fdc3dc254acb6d61166162e4cdfed5f1ded19034ca0cc15497c4e19f38 TERMUX_PKG_DEPENDS="fftw, pango, glib, libbz2, libjpeg-turbo, liblzma, libpng, libtiff, libxml2, openjpeg, littlecms, libwebp" +TERMUX_PKG_BREAKS="imagemagick-dev" +TERMUX_PKG_REPLACES="imagemagick-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-largefile diff --git a/packages/inotify-tools/build.sh b/packages/inotify-tools/build.sh index a2691b9b5..bcf704a73 100644 --- a/packages/inotify-tools/build.sh +++ b/packages/inotify-tools/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/rvoicilas/inotify-tools/wiki TERMUX_PKG_DESCRIPTION="Programs providing a simple interface to inotify" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=3.20.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=a433cc1dedba851078276db69b0e97f9fe41e4ba3336d2971adfca4b3a6242ac +TERMUX_PKG_BREAKS="inotify-tools-dev" +TERMUX_PKG_REPLACES="inotify-tools-dev" TERMUX_PKG_SRCURL=https://github.com/rvoicilas/inotify-tools/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/iperf3/build.sh b/packages/iperf3/build.sh index c07931024..2aca1af12 100644 --- a/packages/iperf3/build.sh +++ b/packages/iperf3/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/esnet/iperf TERMUX_PKG_DESCRIPTION="TCP, UDP, and SCTP network bandwidth measurement tool" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=3.7 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=d846040224317caf2f75c843d309a950a7db23f9b44b94688ccbe557d6d1710c TERMUX_PKG_SRCURL=https://fossies.org/linux/privat/iperf-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="openssl" +TERMUX_PKG_BREAKS="iperf3-dev" +TERMUX_PKG_REPLACES="iperf3-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-profiling" diff --git a/packages/irssi/build.sh b/packages/irssi/build.sh index f416d8618..e4077bdd0 100644 --- a/packages/irssi/build.sh +++ b/packages/irssi/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://irssi.org/ TERMUX_PKG_DESCRIPTION="Terminal based IRC client" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_DEPENDS="libiconv, ncurses, openssl, glib, libandroid-glob, utf8proc" +TERMUX_PKG_BREAKS="irssi-dev" +TERMUX_PKG_REPLACES="irssi-dev" TERMUX_PKG_VERSION=1.2.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/irssi/irssi/releases/download/$TERMUX_PKG_VERSION/irssi-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=5466a1ed9612cfa707d9a37d60b29d027b4ac7d83c74ceb1a410e2b59edba92c TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/iverilog/build.sh b/packages/iverilog/build.sh index 3342cafb6..8280c8817 100644 --- a/packages/iverilog/build.sh +++ b/packages/iverilog/build.sh @@ -3,10 +3,12 @@ TERMUX_PKG_DESCRIPTION="Icarus Verilog compiler and simulation tool" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=10.2 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_REVISION=7 TERMUX_PKG_SRCURL=https://github.com/steveicarus/iverilog/archive/v${TERMUX_PKG_VERSION/./_}.tar.gz TERMUX_PKG_SHA256=f54d91821223c71c70f4735a1fb2af39c62efbccdeb9b0060ea1cf9c67647ee3 TERMUX_PKG_DEPENDS="libbz2, libc++, readline, zlib" +TERMUX_PKG_BREAKS="iverilog-dev" +TERMUX_PKG_REPLACES="iverilog-dev" termux_step_pre_configure() { LDFLAGS+=" -lm" diff --git a/packages/jq/build.sh b/packages/jq/build.sh index e4161ee27..6b1c5cd11 100644 --- a/packages/jq/build.sh +++ b/packages/jq/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://stedolan.github.io/jq/ TERMUX_PKG_DESCRIPTION="Command-line JSON processor" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=1.6 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72 +TERMUX_PKG_BREAKS="jq-dev" +TERMUX_PKG_REPLACES="jq-dev" TERMUX_PKG_SRCURL=https://github.com/stedolan/jq/releases/download/jq-$TERMUX_PKG_VERSION/jq-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-oniguruma=no" TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/json-c/build.sh b/packages/json-c/build.sh index 0a50302f8..ab4ddc3bd 100644 --- a/packages/json-c/build.sh +++ b/packages/json-c/build.sh @@ -3,7 +3,10 @@ TERMUX_PKG_DESCRIPTION="A JSON implementation in C" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Balazs Kutil @balazs_kutil" TERMUX_PKG_VERSION=0.13.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873 +TERMUX_PKG_BREAKS="json-c-dev" +TERMUX_PKG_REPLACES="json-c-dev" TERMUX_PKG_SRCURL=https://s3.amazonaws.com/json-c_releases/releases/json-c-${TERMUX_PKG_VERSION}.tar.gz termux_step_make() { diff --git a/packages/json-glib/build.sh b/packages/json-glib/build.sh index 8cbbfb90b..dd30cc31f 100644 --- a/packages/json-glib/build.sh +++ b/packages/json-glib/build.sh @@ -2,11 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://wiki.gnome.org/Projects/JsonGlib TERMUX_PKG_DESCRIPTION="GLib JSON manipulation library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.4.4 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/json-glib/${TERMUX_PKG_VERSION:0:3}/json-glib-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_DEPENDS="glib" -TERMUX_PKG_DEVPACKAGE_DEPENDS="glib-dev" +TERMUX_PKG_BREAKS="json-glib-dev" +TERMUX_PKG_REPLACES="json-glib-dev" TERMUX_PKG_RM_AFTER_INSTALL=" share/installed-tests libexec/installed-tests diff --git a/packages/jsoncpp/build.sh b/packages/jsoncpp/build.sh index 990b3e333..e778470a0 100644 --- a/packages/jsoncpp/build.sh +++ b/packages/jsoncpp/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://github.com/open-source-parsers/jsoncpp TERMUX_PKG_DESCRIPTION="C++ library for interacting with JSON" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=1.9.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=c7b40f5605dd972108f503f031b20186f5e5bca2b65cd4b8bd6c3e4ba8126697 TERMUX_PKG_SRCURL=https://github.com/open-source-parsers/jsoncpp/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libc++" +TERMUX_PKG_BREAKS="jsoncpp-dev" +TERMUX_PKG_REPLACES="jsoncpp-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DBUILD_SHARED_LIBS=ON diff --git a/packages/keystone/build.sh b/packages/keystone/build.sh index 2c1d16020..8983b6d4f 100644 --- a/packages/keystone/build.sh +++ b/packages/keystone/build.sh @@ -3,10 +3,12 @@ TERMUX_PKG_DESCRIPTION="Keystone is a lightweight multi-platform, multi-architec TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=0.9.1 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://github.com/keystone-engine/keystone/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=e9d706cd0c19c49a6524b77db8158449b9c434b415fbf94a073968b68cf8a9f0 TERMUX_PKG_DEPENDS="libc++" +TERMUX_PKG_BREAKS="keystone-dev" +TERMUX_PKG_REPLACES="keystone-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DPYTHON_EXECUTABLE=$(which python2.7) diff --git a/packages/krb5/build.sh b/packages/krb5/build.sh index a77e77cfa..dfd61c183 100644 --- a/packages/krb5/build.sh +++ b/packages/krb5/build.sh @@ -2,12 +2,17 @@ TERMUX_PKG_HOMEPAGE=https://web.mit.edu/kerberos TERMUX_PKG_DESCRIPTION="The Kerberos network authentication system" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=1.17 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/krb5-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=5a6e2284a53de5702d3dc2be3b9339c963f9b5397d3fbbc53beb249380a781f5 TERMUX_PKG_DEPENDS="libandroid-support, libandroid-glob, readline, openssl, libdb" +TERMUX_PKG_BREAKS="krb5-dev" +TERMUX_PKG_REPLACES="krb5-dev" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" TERMUX_PKG_CONFFILES="etc/krb5.conf var/krb5kdc/kdc.conf" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-readline +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +--disable-static +--with-readline --without-system-verto --with-netlib=-lc --enable-dns-for-realm diff --git a/packages/ldc/build.sh b/packages/ldc/build.sh index 9d89bfe61..5bbb15e25 100644 --- a/packages/ldc/build.sh +++ b/packages/ldc/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_VERSION+=(1.13.0) TERMUX_PKG_VERSION+=(7.0.1) # LLVM version TERMUX_PKG_VERSION+=(2.083.1) # TOOLS version TERMUX_PKG_VERSION+=(1.12.1) # DUB version -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=(https://github.com/ldc-developers/ldc/releases/download/v${TERMUX_PKG_VERSION}/ldc-${TERMUX_PKG_VERSION}-src.tar.gz https://github.com/ldc-developers/llvm/releases/download/ldc-v${TERMUX_PKG_VERSION[1]}/llvm-${TERMUX_PKG_VERSION[1]}.src.tar.xz @@ -19,6 +19,7 @@ TERMUX_PKG_SHA256=(4b2fd3eb90fb6debc0ae6d70406bc78fcb531a0f20806640e626d4822e87b bd17cf67784f2ea0a2e0298761c662c80fddf6700c065f6689eb353e2144c987 3692974b6dc6c81280c0321371b400101006f28bafb890f089b1d357dadbcbf1) TERMUX_PKG_DEPENDS="clang, libc++, zlib" +TERMUX_PKG_NO_STATICSPLIT=yes TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_FORCE_CMAKE=yes #These CMake args are only used to configure a patched LLVM @@ -29,8 +30,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen -DPYTHON_EXECUTABLE=$(which python3) " -TERMUX_PKG_KEEP_STATIC_LIBRARIES=true -TERMUX_PKG_NO_DEVELSPLIT=yes termux_step_post_extract_package() { mv llvm-${TERMUX_PKG_VERSION[1]}.src llvm diff --git a/packages/ldns/build.sh b/packages/ldns/build.sh index ae9482528..2687bd277 100644 --- a/packages/ldns/build.sh +++ b/packages/ldns/build.sh @@ -1,16 +1,19 @@ TERMUX_PKG_HOMEPAGE=https://www.nlnetlabs.nl/projects/ldns/ TERMUX_PKG_DESCRIPTION="Library for simplifying DNS programming and supporting recent and experimental RFCs" TERMUX_PKG_LICENSE="BSD 3-Clause" -TERMUX_PKG_DEPENDS="openssl" TERMUX_PKG_VERSION=1.7.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.nlnetlabs.nl/downloads/ldns/ldns-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229 +TERMUX_PKG_DEPENDS="openssl" +TERMUX_PKG_BREAKS="ldns-dev" +TERMUX_PKG_REPLACES="ldns-dev" TERMUX_PKG_BUILD_IN_SRC=yes + TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-ssl=$TERMUX_PREFIX --disable-gost " -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/ldns-config share/man/man1/ldns-config.1" termux_step_post_make_install() { # The ldns build doesn't install its pkg-config: diff --git a/packages/ledger/build.sh b/packages/ledger/build.sh index 28137a719..821eabaec 100644 --- a/packages/ledger/build.sh +++ b/packages/ledger/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.ledger-cli.org TERMUX_PKG_DESCRIPTION="Powerful, double-entry accounting system" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=3.1.3 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/ledger/ledger/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=b248c91d65c7a101b9d6226025f2b4bf3dabe94c0c49ab6d51ce84a22a39622b TERMUX_PKG_DEPENDS="boost, libc++, libedit, libmpfr, libgmp" +TERMUX_PKG_BREAKS="ledger-dev" +TERMUX_PKG_REPLACES="ledger-dev" TERMUX_PKG_BUILD_DEPENDS="utf8cpp" # See https://gitlab.kitware.com/cmake/cmake/issues/18865: TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBoost_NO_BOOST_CMAKE=ON" diff --git a/packages/leptonica/build.sh b/packages/leptonica/build.sh index 45afebceb..64de94b68 100644 --- a/packages/leptonica/build.sh +++ b/packages/leptonica/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://www.leptonica.com/ TERMUX_PKG_DESCRIPTION="Library for image processing and image analysis" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_VERSION=1.78.0 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=f8ac4d93cc76b524c2c81d27850bfc342e68b91368aa7a1f7d69e34ce13adbb4 TERMUX_PKG_SRCURL=https://github.com/DanBloomberg/leptonica/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libjpeg-turbo, libpng, libtiff, zlib" +TERMUX_PKG_BREAKS="leptonica-dev" +TERMUX_PKG_REPLACES="leptonica-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-giflib --without-libwebp --without-libopenjpeg" termux_step_pre_configure() { diff --git a/packages/leveldb/build.sh b/packages/leveldb/build.sh index 36b8edbf9..eb32d350c 100644 --- a/packages/leveldb/build.sh +++ b/packages/leveldb/build.sh @@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/google/leveldb TERMUX_PKG_DESCRIPTION="Fast key-value storage library" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=1.22 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/google/leveldb/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=55423cac9e3306f4a9502c738a001e4a339d1a38ffbee7572d4a07d5d63949b2 TERMUX_PKG_DEPENDS="libc++" +TERMUX_PKG_BREAKS="leveldb-dev" +TERMUX_PKG_REPLACES="leveldb-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_SHARED_LIBS=TRUE" diff --git a/packages/lhasa/build.sh b/packages/lhasa/build.sh index ce937255d..53fb65764 100644 --- a/packages/lhasa/build.sh +++ b/packages/lhasa/build.sh @@ -3,7 +3,9 @@ TERMUX_PKG_DESCRIPTION="LHA compressor/decompressor" TERMUX_PKG_LICENSE="ISC" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=0.3.1 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://soulsphere.org/projects/lhasa/lhasa-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=3fb08e5f85a9b9dd023922896be9157d5fb5c0448424681810aaa2b0558a5f24 +TERMUX_PKG_BREAKS="lhasa-dev" +TERMUX_PKG_REPLACES="lhasa-dev" TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/libandroid-glob/build.sh b/packages/libandroid-glob/build.sh index 5a8485fc6..ae64522b2 100644 --- a/packages/libandroid-glob/build.sh +++ b/packages/libandroid-glob/build.sh @@ -1,10 +1,17 @@ TERMUX_PKG_HOMEPAGE=http://man7.org/linux/man-pages/man3/glob.3.html TERMUX_PKG_DESCRIPTION="Shared library for the glob(3) system function" TERMUX_PKG_LICENSE="BSD 3-Clause" -TERMUX_PKG_VERSION=0.4 +TERMUX_PKG_VERSION=0.5 TERMUX_PKG_BUILD_IN_SRC=yes +termux_step_make() { + $CC $CFLAGS $CPPFLAGS -I$TERMUX_PKG_BUILDER_DIR -c $TERMUX_PKG_BUILDER_DIR/glob.c + $CC $LDFLAGS -shared glob.o -o libandroid-glob.so + $AR rcu libandroid-glob.a glob.o +} + termux_step_make_install() { - cp $TERMUX_PKG_BUILDER_DIR/glob.h $TERMUX_PREFIX/include/ - $CC $CFLAGS $CPPFLAGS $LDFLAGS $TERMUX_PKG_BUILDER_DIR/glob.c -shared -o $TERMUX_PREFIX/lib/libandroid-glob.so + install -Dm600 $TERMUX_PKG_BUILDER_DIR/glob.h $TERMUX_PREFIX/include/glob.h + install -Dm600 libandroid-glob.a $TERMUX_PREFIX/lib/libandroid-glob.a + install -Dm600 libandroid-glob.so $TERMUX_PREFIX/lib/libandroid-glob.so } diff --git a/packages/libandroid-shmem/build.sh b/packages/libandroid-shmem/build.sh index e67fafe2b..7e459c90b 100644 --- a/packages/libandroid-shmem/build.sh +++ b/packages/libandroid-shmem/build.sh @@ -1,7 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/termux/libandroid-shmem TERMUX_PKG_DESCRIPTION="System V shared memory emulation on Android using ashmem" TERMUX_PKG_LICENSE="BSD 3-Clause" -TERMUX_PKG_VERSION=0.2 +TERMUX_PKG_VERSION=0.2.1 TERMUX_PKG_SRCURL=https://github.com/termux/libandroid-shmem/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=75e687f48c01d96ea1345f11c064ff76f7eb9a119f51ebe2f6253cf8b24a2b97 +TERMUX_PKG_SHA256=09369398658af357e3644178d42ebfcc79ea11fe760b10855011521fc3e35be4 +TERMUX_PKG_BREAKS="libandroid-shmem-dev" +TERMUX_PKG_REPLACES="libandroid-shmem-dev" TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/libandroid-support/build.sh b/packages/libandroid-support/build.sh index b8e086870..3bf76f159 100644 --- a/packages/libandroid-support/build.sh +++ b/packages/libandroid-support/build.sh @@ -2,17 +2,28 @@ TERMUX_PKG_HOMEPAGE=https://github.com/termux/libandroid-support TERMUX_PKG_DESCRIPTION="Library extending the Android C library (Bionic) for additional multibyte, locale and math support" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=25 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/termux/libandroid-support/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=42e7b55c2e5fc91cc0447fa8bea432e7a75ec78b03469330668af17aea56f660 TERMUX_PKG_PRE_DEPENDS="dpkg (>= 1.19.4-3)" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_ESSENTIAL=yes +termux_step_make() { + local c_file + + mkdir objects + for c_file in $(find src -type f -iname \*.c); do + $CC $CPPFLAGS $CFLAGS -std=c99 -DNULL=0 -fPIC -Iinclude \ + -c $c_file -o ./objects/$(basename "$c_file").o + done + + cd objects + ar rcu ../libandroid-support.a + $CC $LDFLAGS -shared -o ../libandroid-support.so *.o +} + termux_step_make_install() { - _C_FILES="src/musl-*/*.c" - $CC $CFLAGS -std=c99 -DNULL=0 $CPPFLAGS $LDFLAGS \ - -Iinclude \ - $_C_FILES \ - -shared -fpic \ - -o $TERMUX_PREFIX/lib/libandroid-support.so + install -Dm600 libandroid-support.a $TERMUX_PREFIX/lib/libandroid-support.a + install -Dm600 libandroid-support.so $TERMUX_PREFIX/lib/libandroid-support.so } diff --git a/packages/libarchive/build.sh b/packages/libarchive/build.sh index 9e89ad8dd..5509f28d3 100644 --- a/packages/libarchive/build.sh +++ b/packages/libarchive/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.libarchive.org/ TERMUX_PKG_DESCRIPTION="Multi-format archive and compression library" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_VERSION=3.4.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=8643d50ed40c759f5412a3af4e353cffbce4fdf3b5cf321cb72cacf06b2d825e TERMUX_PKG_SRCURL=https://github.com/libarchive/libarchive/releases/download/v$TERMUX_PKG_VERSION/libarchive-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="libbz2, libiconv, liblzma, libxml2, openssl, zlib" +TERMUX_PKG_BREAKS="libarchive-dev" +TERMUX_PKG_REPLACES="libarchive-dev" # --without-nettle to use openssl instead: TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/libass/build.sh b/packages/libass/build.sh index dd7c42da8..c6f4be3b2 100644 --- a/packages/libass/build.sh +++ b/packages/libass/build.sh @@ -3,6 +3,9 @@ TERMUX_PKG_DESCRIPTION="A portable library for SSA/ASS subtitles rendering" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=0.14.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/libass/libass/releases/download/$TERMUX_PKG_VERSION/libass-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=881f2382af48aead75b7a0e02e65d88c5ebd369fe46bc77d9270a94aa8fd38a2 TERMUX_PKG_DEPENDS="fontconfig, fribidi, glib, harfbuzz" +TERMUX_PKG_BREAKS="libass-dev" +TERMUX_PKG_REPLACES="libass-dev" diff --git a/packages/libassuan/build.sh b/packages/libassuan/build.sh index 826040438..65485614c 100644 --- a/packages/libassuan/build.sh +++ b/packages/libassuan/build.sh @@ -2,7 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnupg.org/related_software/libassuan/ TERMUX_PKG_DESCRIPTION="Library implementing the Assuan IPC protocol used between most newer GnuPG components" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.5.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702 TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/libassuan-config" TERMUX_PKG_DEPENDS="libgpg-error" +TERMUX_PKG_BREAKS="libassuan-dev" +TERMUX_PKG_REPLACES="libassuan-dev" diff --git a/packages/libbsd/build.sh b/packages/libbsd/build.sh index 8463c4009..c90798686 100644 --- a/packages/libbsd/build.sh +++ b/packages/libbsd/build.sh @@ -2,6 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://libbsd.freedesktop.org TERMUX_PKG_DESCRIPTION="utility functions from BSD systems" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=0.9.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://libbsd.freedesktop.org/releases/libbsd-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=56d835742327d69faccd16955a60b6dcf30684a8da518c4eca0ac713b9e0a7a4 +TERMUX_PKG_BREAKS="libbsd-dev" +TERMUX_PKG_REPLACES="libbsd-dev" TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/libbz2/build.sh b/packages/libbz2/build.sh index 3261ff649..a88298f01 100644 --- a/packages/libbz2/build.sh +++ b/packages/libbz2/build.sh @@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://www.bzip.org/ TERMUX_PKG_DESCRIPTION="BZ2 format compression library" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=1.0.8 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/bzip2-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=47fd74b2ff83effad0ddf62074e6fad1f6b4a77a96e121ab421c20a216371a1f +TERMUX_PKG_BREAKS="libbz2-dev" +TERMUX_PKG_REPLACES="libbz2-dev" TERMUX_PKG_ESSENTIAL=yes TERMUX_PKG_EXTRA_MAKE_ARGS="PREFIX=$TERMUX_PREFIX" TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/libcaca/build.sh b/packages/libcaca/build.sh index 5b9e19589..fac7f23cb 100644 --- a/packages/libcaca/build.sh +++ b/packages/libcaca/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://caca.zoy.org/wiki/libcaca TERMUX_PKG_DESCRIPTION="Graphics library that outputs text instead of pixels" TERMUX_PKG_LICENSE="WTFPL" TERMUX_PKG_VERSION=0.99.beta19 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=http://fossies.org/linux/privat/libcaca-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=128b467c4ed03264c187405172a4e83049342cc8cc2f655f53a2d0ee9d3772f4 TERMUX_PKG_DEPENDS="libc++, ncurses, zlib" +TERMUX_PKG_BREAKS="libcaca-dev" +TERMUX_PKG_REPLACES="libcaca-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-python --disable-java --disable-ruby --disable-doc" termux_step_post_configure() { diff --git a/packages/libcairo/build.sh b/packages/libcairo/build.sh index b66e3c278..93e7db775 100644 --- a/packages/libcairo/build.sh +++ b/packages/libcairo/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://cairographics.org TERMUX_PKG_DESCRIPTION="Cairo 2D vector graphics library" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.16.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331 TERMUX_PKG_SRCURL=https://cairographics.org/releases/cairo-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_DEPENDS="libandroid-support, libpixman, fontconfig, freetype, libpng" +TERMUX_PKG_BREAKS="libcairo-dev" +TERMUX_PKG_REPLACES="libcairo-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_lib_lzo2_lzo2a_decompress=no --disable-gtk-doc-html diff --git a/packages/libcap/build.sh b/packages/libcap/build.sh index c8c43e03c..0fcda4f82 100644 --- a/packages/libcap/build.sh +++ b/packages/libcap/build.sh @@ -3,9 +3,12 @@ TERMUX_PKG_DESCRIPTION="POSIX 1003.1e capabilities" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=2.27 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=dac1792d0118bee6aae6ba7fb93ff1602c6a9bda812fd63916eee1435b9c486a TERMUX_PKG_DEPENDS="attr" +TERMUX_PKG_BREAKS="libcap-dev" +TERMUX_PKG_REPLACES="libcap-dev" TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { diff --git a/packages/libcln/build.sh b/packages/libcln/build.sh index a23eea5c1..d64496db2 100644 --- a/packages/libcln/build.sh +++ b/packages/libcln/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.ginac.de/CLN/ TERMUX_PKG_DESCRIPTION="CLN is a library for efficient computations with all kinds of numbers in arbitrary precision" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.3.4 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://fossies.org/linux/privat/cln-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=c32e59b6afbcf8b84075ab454c42982429c6ea9675aee2bbda176cb85293e38f TERMUX_PKG_DEPENDS="libc++, libgmp" +TERMUX_PKG_BREAKS="libcln-dev" +TERMUX_PKG_REPLACES="libcln-dev" TERMUX_PKG_BUILD_IN_SRC=yes termux_step_pre_configure() { diff --git a/packages/libcoap/build.sh b/packages/libcoap/build.sh index 4e1d6e44d..1f97ae71d 100644 --- a/packages/libcoap/build.sh +++ b/packages/libcoap/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://libcoap.net/ TERMUX_PKG_DESCRIPTION="Implementation of CoAP, a lightweight protocol for resource constrained devices" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_VERSION=4.2.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=9523e38da6ee8b2a8f5ce83ded64107dd1e514c7ad00cd74ccfe3454b679c271 TERMUX_PKG_SRCURL=https://github.com/obgm/libcoap/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="openssl" +TERMUX_PKG_BREAKS="libcoap-dev" +TERMUX_PKG_REPLACES="libcoap-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-openssl --disable-doxygen" termux_step_pre_configure() { diff --git a/packages/libconfig/build.sh b/packages/libconfig/build.sh index 84940687a..c6a957ee7 100644 --- a/packages/libconfig/build.sh +++ b/packages/libconfig/build.sh @@ -3,10 +3,12 @@ TERMUX_PKG_DESCRIPTION="C/C++ Configuration File Library" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=1.7.2 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/hyperrealm/libconfig/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=f67ac44099916ae260a6c9e290a90809e7d782d96cdd462cac656ebc5b685726 TERMUX_PKG_DEPENDS="libc++" +TERMUX_PKG_BREAKS="libconfig-dev" +TERMUX_PKG_REPLACES="libconfig-dev" termux_step_pre_configure() { autoreconf -fi diff --git a/packages/libconfuse/build.sh b/packages/libconfuse/build.sh index 003331d0e..bbc9e888a 100644 --- a/packages/libconfuse/build.sh +++ b/packages/libconfuse/build.sh @@ -2,5 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/martinh/libconfuse TERMUX_PKG_DESCRIPTION="Small configuration file parser library for C" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=3.2.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=71316b55592f8d0c98924242c98dbfa6252153a8b6e7d89e57fe6923934d77d0 +TERMUX_PKG_BREAKS="libconfuse-dev" +TERMUX_PKG_REPLACES="libconfuse-dev" TERMUX_PKG_SRCURL=https://github.com/martinh/libconfuse/releases/download/v$TERMUX_PKG_VERSION/confuse-$TERMUX_PKG_VERSION.tar.gz diff --git a/packages/libcroco/build.sh b/packages/libcroco/build.sh index dc066e6bf..298d99ef6 100644 --- a/packages/libcroco/build.sh +++ b/packages/libcroco/build.sh @@ -2,7 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/GNOME/libcroco TERMUX_PKG_DESCRIPTION="CSS parsing and manipulation library" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=0.6.13 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4 TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/gnome/sources/libcroco/${TERMUX_PKG_VERSION:0:3}/libcroco-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_DEPENDS="glib,liblzma,libxml2" +TERMUX_PKG_BREAKS="libcroco-dev" +TERMUX_PKG_REPLACES="libcroco-dev" diff --git a/packages/libcrypt/build.sh b/packages/libcrypt/build.sh index 04a9b19df..77713f735 100644 --- a/packages/libcrypt/build.sh +++ b/packages/libcrypt/build.sh @@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://michael.dipperstein.com/crypt/ TERMUX_PKG_DESCRIPTION="A crypt(3) implementation" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_VERSION=0.2 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_DEPENDS="openssl" +TERMUX_PKG_BREAKS="libcrypt-dev" +TERMUX_PKG_REPLACES="libcrypt-dev" termux_step_make_install() { $CC $CFLAGS $CPPFLAGS $LDFLAGS -Wall -Wextra -fPIC -shared $TERMUX_PKG_BUILDER_DIR/crypt3.c -lcrypto -o $TERMUX_PREFIX/lib/libcrypt.so diff --git a/packages/libcue/build.sh b/packages/libcue/build.sh index 85297a2bf..189777fe3 100644 --- a/packages/libcue/build.sh +++ b/packages/libcue/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/lipnitsk/libcue/ TERMUX_PKG_DESCRIPTION="CUE Sheet Parser Library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.2.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=f27bc3ebb2e892cd9d32a7bee6d84576a60f955f29f748b9b487b173712f1200 +TERMUX_PKG_BREAKS="libcue-dev" +TERMUX_PKG_REPLACES="libcue-dev" TERMUX_PKG_SRCURL=https://github.com/lipnitsk/libcue/archive/v${TERMUX_PKG_VERSION}.tar.gz # To avoid picking up cross-compiled flex and bison: TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/libcurl/build.sh b/packages/libcurl/build.sh index 0f17ea3a6..a121a2c2a 100644 --- a/packages/libcurl/build.sh +++ b/packages/libcurl/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://curl.haxx.se/ TERMUX_PKG_DESCRIPTION="Easy-to-use client-side URL transfer library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=7.65.3 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://curl.haxx.se/download/curl-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=0a855e83be482d7bc9ea00e05bdb1551a44966076762f9650959179c89fce509 TERMUX_PKG_DEPENDS="libnghttp2, openssl (>= 1.1.1), zlib" +TERMUX_PKG_BREAKS="libcurl-dev" +TERMUX_PKG_REPLACES="libcurl-dev" TERMUX_PKG_ESSENTIAL=yes TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" @@ -19,7 +21,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-ssl " -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/curl-config share/man/man1/curl-config.1" # Starting with version 7.62 curl started enabling http/2 by default. # Support for http/2 as added in version 1.4.8-8 of the apt package, so we diff --git a/packages/libdb/build.sh b/packages/libdb/build.sh index a165eab73..ca2fa5e28 100644 --- a/packages/libdb/build.sh +++ b/packages/libdb/build.sh @@ -3,8 +3,10 @@ TERMUX_PKG_DESCRIPTION="The Berkeley DB embedded database system (library)" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" TERMUX_PKG_VERSION=18.1.32 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=fa1fe7de9ba91ad472c25d026f931802597c29f28ae951960685cde487c8d654 +TERMUX_PKG_BREAKS="libdb-dev" +TERMUX_PKG_REPLACES="libdb-dev" TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/db-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-hash diff --git a/packages/libduktape/build.sh b/packages/libduktape/build.sh index 006f8fa5e..6943239d0 100644 --- a/packages/libduktape/build.sh +++ b/packages/libduktape/build.sh @@ -2,11 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.duktape.org/ TERMUX_PKG_DESCRIPTION="An embeddable Javascript engine with a focus on portability and compact footprint" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=2.3.0 -TERMUX_PKG_REVISION=4 -TERMUX_PKG_REPLACES="duktape (<< 2.3.0-1)" -TERMUX_PKG_BREAKS="duktape (<< 2.3.0-1)" -TERMUX_PKG_DEVPACKAGE_BREAKS="duktape-dev" -TERMUX_PKG_DEVPACKAGE_REPLACES="duktape-dev" +TERMUX_PKG_REVISION=5 +TERMUX_PKG_REPLACES="duktape (<< 2.3.0-1), libduktape-dev" +TERMUX_PKG_BREAKS="duktape (<< 2.3.0-1), libduktape-dev" TERMUX_PKG_BUILD_IN_SRC=yes termux_step_extract_package() { diff --git a/packages/libedit/build.sh b/packages/libedit/build.sh index 5baefe58f..834df11f1 100644 --- a/packages/libedit/build.sh +++ b/packages/libedit/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://thrysoee.dk/editline/ TERMUX_PKG_DESCRIPTION="Library providing line editing, history, and tokenization functions" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=20190324-3.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=ac8f0f51c1cf65492e4d1e3ed2be360bda41e54633444666422fbf393bba1bae TERMUX_PKG_SRCURL=https://thrysoee.dk/editline/libedit-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libandroid-support, ncurses" +TERMUX_PKG_BREAKS="libedit-dev" +TERMUX_PKG_REPLACES="libedit-dev" TERMUX_PKG_RM_AFTER_INSTALL="share/man/man7/editline.7 share/man/man3/history.3" termux_step_pre_configure() { diff --git a/packages/libelf/build.sh b/packages/libelf/build.sh index 20593d30a..65819f867 100644 --- a/packages/libelf/build.sh +++ b/packages/libelf/build.sh @@ -4,14 +4,15 @@ TERMUX_PKG_LICENSE="GPL-2.0" # NOTE: We only build the libelf part of elfutils for now, # as other parts are not clang compatible. TERMUX_PKG_VERSION=0.176 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=eb5747c371b0af0f71e86215a5ebb88728533c3a104a43d4231963f308cd1023 TERMUX_PKG_SRCURL=ftp://sourceware.org/pub/elfutils/${TERMUX_PKG_VERSION}/elfutils-${TERMUX_PKG_VERSION}.tar.bz2 # libandroid-support for langinfo. TERMUX_PKG_DEPENDS="libandroid-support, zlib" TERMUX_PKG_BUILD_DEPENDS="argp" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_c99=yes --disable-symbol-versioning" -TERMUX_PKG_CONFLICTS=elfutils -TERMUX_PKG_REPLACES=elfutils +TERMUX_PKG_CONFLICTS="elfutils, libelf-dev" +TERMUX_PKG_REPLACES="elfutils, libelf-dev" termux_step_pre_configure() { CFLAGS+=" -Wno-error=unused-value -Wno-error=format-nonliteral -Wno-error" diff --git a/packages/libev/build.sh b/packages/libev/build.sh index 563b93496..e8d201033 100644 --- a/packages/libev/build.sh +++ b/packages/libev/build.sh @@ -2,5 +2,8 @@ TERMUX_PKG_HOMEPAGE=http://software.schmorp.de/pkg/libev.html TERMUX_PKG_DESCRIPTION="Full-featured and high-performance event loop library" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_VERSION=4.27 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=2d5526fc8da4f072dd5c73e18fbb1666f5ef8ed78b73bba12e195cfdd810344e +TERMUX_PKG_BREAKS="libev-dev" +TERMUX_PKG_REPLACES="libev-dev" TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/libev-$TERMUX_PKG_VERSION.tar.gz diff --git a/packages/libevent/build.sh b/packages/libevent/build.sh index 4ff077d55..0594cd7fa 100644 --- a/packages/libevent/build.sh +++ b/packages/libevent/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://libevent.org/ TERMUX_PKG_DESCRIPTION="Library that provides asynchronous event notification" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=2.1.10 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=52c9db0bc5b148f146192aa517db0762b2a5b3060ccc63b2c470982ec72b9a79 +TERMUX_PKG_BREAKS="libevent-dev" +TERMUX_PKG_REPLACES="libevent-dev" TERMUX_PKG_SRCURL=https://github.com/libevent/libevent/archive/release-${TERMUX_PKG_VERSION}-stable.tar.gz # Strip away libevent core, extra and openssl libraries until someone uses them TERMUX_PKG_RM_AFTER_INSTALL="bin/event_rpcgen.py lib/libevent_*" diff --git a/packages/libexif/build.sh b/packages/libexif/build.sh index 5107f712f..75ade61c6 100644 --- a/packages/libexif/build.sh +++ b/packages/libexif/build.sh @@ -2,6 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://libexif.github.io/ TERMUX_PKG_DESCRIPTION="Library for reading and writing EXIF image metadata" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=0.6.21 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/libexif/libexif/${TERMUX_PKG_VERSION}/libexif-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a +TERMUX_PKG_BREAKS="libexif-dev" +TERMUX_PKG_REPLACES="libexif-dev" diff --git a/packages/libexpat/build.sh b/packages/libexpat/build.sh index 34b375a52..8c71a9730 100644 --- a/packages/libexpat/build.sh +++ b/packages/libexpat/build.sh @@ -2,6 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://libexpat.github.io/ TERMUX_PKG_DESCRIPTION="XML parsing C library" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=2.2.7 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=cbc9102f4a31a8dafd42d642e9a3aa31e79a0aedaa1f6efd2795ebc83174ec18 +TERMUX_PKG_BREAKS="libexpat-dev" +TERMUX_PKG_REPLACES="libexpat-dev" TERMUX_PKG_SRCURL=https://github.com/libexpat/libexpat/releases/download/R_${TERMUX_PKG_VERSION//./_}/expat-$TERMUX_PKG_VERSION.tar.bz2 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-xmlwf --without-docbook" diff --git a/packages/libffi/build.sh b/packages/libffi/build.sh index 3b3bdde35..1e43bfb88 100644 --- a/packages/libffi/build.sh +++ b/packages/libffi/build.sh @@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://sourceware.org/libffi/ TERMUX_PKG_DESCRIPTION="Library providing a portable, high level programming interface to various calling conventions" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=3.2.1 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=ftp://sourceware.org/pub/libffi/libffi-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37 +TERMUX_PKG_BREAKS="libffi-dev" +TERMUX_PKG_REPLACES="libffi-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-multi-os-directory" TERMUX_PKG_RM_AFTER_INSTALL="lib/libffi-${TERMUX_PKG_VERSION}/include" diff --git a/packages/libflac/build.sh b/packages/libflac/build.sh index 7d13bd411..3d7354f19 100644 --- a/packages/libflac/build.sh +++ b/packages/libflac/build.sh @@ -2,7 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://xiph.org/flac/ TERMUX_PKG_DESCRIPTION="FLAC (Free Lossless Audio Codec) library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.3.2 -TERMUX_PKG_REVISION=9 +TERMUX_PKG_REVISION=10 TERMUX_PKG_SRCURL=http://downloads.xiph.org/releases/flac/flac-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f TERMUX_PKG_DEPENDS="libc++, libogg" +TERMUX_PKG_BREAKS="libflac-dev" +TERMUX_PKG_REPLACES="libflac-dev" diff --git a/packages/libgc/build.sh b/packages/libgc/build.sh index 24de4fc2f..93021bcd8 100644 --- a/packages/libgc/build.sh +++ b/packages/libgc/build.sh @@ -3,10 +3,13 @@ TERMUX_PKG_DESCRIPTION="Library providing the Boehm-Demers-Weiser conservative g TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=(8.0.4 7.6.10) +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=(436a0ddc67b1ac0b0405b61a9675bca9e075c8156f4debd1d06f3a56c7cd289d 587edf60817f56daf1e1ab38a4b3c729b8e846ff67b4f62a6157183708f099af) TERMUX_PKG_SRCURL=(https://github.com/ivmai/bdwgc/releases/download/v$TERMUX_PKG_VERSION/gc-$TERMUX_PKG_VERSION.tar.gz https://github.com/ivmai/libatomic_ops/releases/download/v${TERMUX_PKG_VERSION[1]}/libatomic_ops-${TERMUX_PKG_VERSION[1]}.tar.gz) +TERMUX_PKG_BREAKS="libgc-dev" +TERMUX_PKG_REPLACES="libgc-dev" TERMUX_PKG_RM_AFTER_INSTALL="share/gc" termux_step_post_extract_package() { diff --git a/packages/libgcrypt/build.sh b/packages/libgcrypt/build.sh index 269e377f4..e26f9654a 100644 --- a/packages/libgcrypt/build.sh +++ b/packages/libgcrypt/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/libgcrypt/ TERMUX_PKG_DESCRIPTION="General purpose cryptographic library based on the code from GnuPG" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.8.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227 TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_DEPENDS="libgpg-error" -TERMUX_PKG_DEVPACKAGE_DEPENDS="libgpg-error-dev" +TERMUX_PKG_BREAKS="libgcrypt-dev" +TERMUX_PKG_REPLACES="libgcrypt-dev" # configure tries to detect pthreads by linking with -lpthread, which does not exist on Android: TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_lib_pthread_pthread_create=yes diff --git a/packages/libgd/build.sh b/packages/libgd/build.sh index cc233fd2f..cab6dcd69 100644 --- a/packages/libgd/build.sh +++ b/packages/libgd/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://libgd.github.io/ TERMUX_PKG_DESCRIPTION="GD is an open source code library for the dynamic creation of images by programmers" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=2.2.5 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SHA256=a66111c9b4a04e818e9e2a37d7ae8d4aae0939a100a36b0ffb52c706a09074b5 TERMUX_PKG_SRCURL=https://github.com/libgd/libgd/releases/download/gd-${TERMUX_PKG_VERSION}/libgd-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="freetype, fontconfig, libiconv, libjpeg-turbo, libpng, libtiff, libwebp, zlib" +TERMUX_PKG_BREAKS="libgd-dev" +TERMUX_PKG_REPLACES="libgd-dev" # Disable vpx support for now, look at https://github.com/gagern/libgd/commit/d41eb72cd4545c394578332e5c102dee69e02ee8 # for enabling: diff --git a/packages/libgit2/build.sh b/packages/libgit2/build.sh index 1950a663b..60a39c9d0 100644 --- a/packages/libgit2/build.sh +++ b/packages/libgit2/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://libgit2.github.com/ TERMUX_PKG_DESCRIPTION="C library implementing Git core methods" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=0.28.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/libgit2/libgit2/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=42b5f1e9b9159d66d86fff0394215c5733b6ef8f9b9d054cdd8c73ad47177fc3 TERMUX_PKG_DEPENDS="libcurl, openssl, libssh2, zlib" +TERMUX_PKG_BREAKS="libgit2-dev" +TERMUX_PKG_REPLACES="libgit2-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_CLAR=OFF" diff --git a/packages/libgmime/build.sh b/packages/libgmime/build.sh index 6a78322c5..c6803e55e 100644 --- a/packages/libgmime/build.sh +++ b/packages/libgmime/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://spruce.sourceforge.net/gmime/ TERMUX_PKG_DESCRIPTION="MIME message parser and creator" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=3.2.3 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/gmime/${TERMUX_PKG_VERSION:0:3}/gmime-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=6a0875eeb552ab447dd54853a68ced62217d863631048737dd97eaa2713e7311 TERMUX_PKG_DEPENDS="glib, libffi, libiconv, libidn2, zlib" +TERMUX_PKG_BREAKS="libgmime-dev" +TERMUX_PKG_REPLACES="libgmime-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_have_iconv_detect_h=yes diff --git a/packages/libgmp/build.sh b/packages/libgmp/build.sh index 87079afe3..1d38e2b37 100644 --- a/packages/libgmp/build.sh +++ b/packages/libgmp/build.sh @@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://gmplib.org/ TERMUX_PKG_DESCRIPTION="Library for arbitrary precision arithmetic" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_VERSION=6.1.2 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gmp/gmp-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912 +TERMUX_PKG_BREAKS="libgmp-dev" +TERMUX_PKG_REPLACES="libgmp-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-cxx" termux_step_pre_configure() { diff --git a/packages/libgnutls/build.sh b/packages/libgnutls/build.sh index 15bf96995..cb8a71137 100644 --- a/packages/libgnutls/build.sh +++ b/packages/libgnutls/build.sh @@ -1,12 +1,15 @@ TERMUX_PKG_HOMEPAGE=https://www.gnutls.org/ TERMUX_PKG_DESCRIPTION="Secure communications library implementing the SSL, TLS and DTLS protocols and technologies around them" TERMUX_PKG_LICENSE="LGPL-2.1" -TERMUX_PKG_DEPENDS="libgmp, libnettle, ca-certificates, libidn2, libunistring" TERMUX_PKG_VERSION=3.6.9 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/gnutls/v${TERMUX_PKG_VERSION:0:3}/gnutls-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=4331fca55817ecdd74450b908a6c29b4f05bb24dd13144c6284aa34d872e1fcb -TERMUX_PKG_DEVPACKAGE_DEPENDS="libidn2-dev, libnettle-dev" +TERMUX_PKG_DEPENDS="libgmp, libnettle, ca-certificates, libidn2, libunistring" +TERMUX_PKG_BREAKS="libgnutls-dev" +TERMUX_PKG_REPLACES="libgnutls-dev" TERMUX_PKG_BUILD_IN_SRC=yes + TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-cxx --disable-hardware-acceleration diff --git a/packages/libgpg-error/build.sh b/packages/libgpg-error/build.sh index dd6720c5b..5aaa4f614 100644 --- a/packages/libgpg-error/build.sh +++ b/packages/libgpg-error/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.gnupg.org/related_software/libgpg-error/ TERMUX_PKG_DESCRIPTION="Small library that defines common error values for all GnuPG components" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.36 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c +TERMUX_PKG_BREAKS="libgpg-error-dev" +TERMUX_PKG_REPLACES="libgpg-error-dev" TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_RM_AFTER_INSTALL="share/common-lisp" diff --git a/packages/libgraphite/build.sh b/packages/libgraphite/build.sh index e03b2d65a..6e55ec90b 100644 --- a/packages/libgraphite/build.sh +++ b/packages/libgraphite/build.sh @@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/silnrsi/graphite TERMUX_PKG_DESCRIPTION="Font system for multiple languages" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.3.13 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/silnrsi/graphite/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=2f9f609deeddfe2b193502adc8df3b0396694b799a433c36e85fd1242e654cd9 TERMUX_PKG_DEPENDS="libc++" +TERMUX_PKG_BREAKS="libgraphite-dev" +TERMUX_PKG_REPLACES="libgraphite-dev" TERMUX_PKG_RM_AFTER_INSTALL="bin/gr2fonttest" diff --git a/packages/libgrpc/build.sh b/packages/libgrpc/build.sh index b00d87a23..b3e2077b1 100644 --- a/packages/libgrpc/build.sh +++ b/packages/libgrpc/build.sh @@ -3,7 +3,10 @@ TERMUX_PKG_DESCRIPTION="High performance, open source, general RPC framework tha TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" TERMUX_PKG_VERSION=1.22.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_DEPENDS="libc++, openssl, protobuf, c-ares, zlib" +TERMUX_PKG_BREAKS="libgrpc-dev" +TERMUX_PKG_REPLACES="libgrpc-dev" TERMUX_PKG_BUILD_DEPENDS="libprotobuf" TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/libgsasl/build.sh b/packages/libgsasl/build.sh index e01888e95..f476aa510 100644 --- a/packages/libgsasl/build.sh +++ b/packages/libgsasl/build.sh @@ -2,7 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gsasl TERMUX_PKG_DESCRIPTION="GNU SASL library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.8.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=3adfb49f9c92a719dea855fd1840d698cde55d4648d332a69032ba8bea207720 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gsasl/libgsasl-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="libidn" +TERMUX_PKG_BREAKS="libgsasl-dev" +TERMUX_PKG_REPLACES="libgsasl-dev" diff --git a/packages/libical/build.sh b/packages/libical/build.sh index b3ef4d515..f6b4eb581 100644 --- a/packages/libical/build.sh +++ b/packages/libical/build.sh @@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://libical.github.io/libical/ TERMUX_PKG_DESCRIPTION="Libical is an Open Source implementation of the iCalendar protocols and protocol data units" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=3.0.5 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/libical/libical/releases/download/v$TERMUX_PKG_VERSION/libical-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=7ad550c8c49c9b9983658e3ab3e68b1eee2439ec17b169a6b1e6ecb5274e78e6 TERMUX_PKG_DEPENDS="libc++, libxml2" +TERMUX_PKG_BREAKS="libical-dev" +TERMUX_PKG_REPLACES="libical-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DSHARED_ONLY=true -DICAL_GLIB=false -DUSE_BUILTIN_TZDATA=true -DPERL_EXECUTABLE=/usr/bin/perl" diff --git a/packages/libiconv/build.sh b/packages/libiconv/build.sh index 689413c77..4cd9b1fbe 100644 --- a/packages/libiconv/build.sh +++ b/packages/libiconv/build.sh @@ -2,13 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/libiconv/ TERMUX_PKG_DESCRIPTION="An implementation of iconv()" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.16 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://ftp.gnu.org/pub/gnu/libiconv/libiconv-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04 -TERMUX_PKG_BREAKS="libandroid-support (<= 24)" -TERMUX_PKG_REPLACES="libandroid-support (<= 24)" -TERMUX_PKG_DEVPACKAGE_BREAKS="ndk-sysroot (<< 19b-4)" -TERMUX_PKG_DEVPACKAGE_REPLACES="ndk-sysroot (<< 19b-4)" +TERMUX_PKG_BREAKS="libandroid-support (<= 24), libiconv-dev" +TERMUX_PKG_REPLACES="libandroid-support (<= 24), libiconv-dev" # Enable extra encodings (such as CP437) needed by some programs: TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-extra-encodings" diff --git a/packages/libicu/build.sh b/packages/libicu/build.sh index f44c81e08..018fd1d2f 100644 --- a/packages/libicu/build.sh +++ b/packages/libicu/build.sh @@ -3,11 +3,12 @@ TERMUX_PKG_DESCRIPTION='International Components for Unicode library' TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" TERMUX_PKG_VERSION=64.2 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/icu4c-${TERMUX_PKG_VERSION//./_}-src.tar.xz TERMUX_PKG_SHA256=09762184afa33c3b1042715192da1777f9fda31688cab5b03b8b71fad1dcd0c7 TERMUX_PKG_DEPENDS="libc++" -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/icu-config share/man/man1/icu-config.1 lib/icu share/icu" +TERMUX_PKG_BREAKS="libicu-dev" +TERMUX_PKG_REPLACES="libicu-dev" TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="--disable-samples --disable-tests" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-samples --disable-tests --with-cross-build=$TERMUX_PKG_HOSTBUILD_DIR" diff --git a/packages/libid3tag/build.sh b/packages/libid3tag/build.sh index d38d45eb4..867002ae1 100644 --- a/packages/libid3tag/build.sh +++ b/packages/libid3tag/build.sh @@ -2,7 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://www.underbit.com/products/mad/ TERMUX_PKG_DESCRIPTION="MAD ID3 tag manipulation library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=0.15.1b -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=ftp://ftp.mars.org/pub/mpeg/libid3tag-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151 TERMUX_PKG_DEPENDS="zlib" +TERMUX_PKG_BREAKS="libid3tag-dev" +TERMUX_PKG_REPLACES="libid3tag-dev" diff --git a/packages/libidn/build.sh b/packages/libidn/build.sh index 3fe53cc80..d00a29478 100644 --- a/packages/libidn/build.sh +++ b/packages/libidn/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/libidn/ TERMUX_PKG_DESCRIPTION="GNU Libidn library, implementation of IETF IDN specifications" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=1.35 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/libidn/libidn-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libiconv" +TERMUX_PKG_BREAKS="libidn-dev" +TERMUX_PKG_REPLACES="libidn-dev" # Remove the idn tool for now, add it as subpackage if desired:: TERMUX_PKG_RM_AFTER_INSTALL="bin/idn share/man/man1/idn.1 share/emacs" diff --git a/packages/libidn2/build.sh b/packages/libidn2/build.sh index 98ea90019..44fb5c91a 100644 --- a/packages/libidn2/build.sh +++ b/packages/libidn2/build.sh @@ -3,6 +3,9 @@ TERMUX_PKG_DESCRIPTION="Free software implementation of IDNA2008, Punycode and T TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="lokesh @hax4us" TERMUX_PKG_VERSION=2.2.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/libidn/libidn2-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=fc734732b506d878753ec6606982bf7b936e868c25c30ddb0d83f7d7056381fe TERMUX_PKG_DEPENDS="libunistring, libandroid-support" +TERMUX_PKG_BREAKS="libidn2-dev" +TERMUX_PKG_REPLACES="libidn2-dev" diff --git a/packages/libisl/build.sh b/packages/libisl/build.sh index 482eec5fe..56287e0c6 100644 --- a/packages/libisl/build.sh +++ b/packages/libisl/build.sh @@ -2,6 +2,9 @@ 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_LICENSE="MIT" TERMUX_PKG_VERSION=0.21 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=777058852a3db9500954361e294881214f6ecd4b594c00da5eee974cd6a54960 TERMUX_PKG_SRCURL=http://isl.gforge.inria.fr/isl-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_DEPENDS="libgmp" +TERMUX_PKG_BREAKS="libisl-dev" +TERMUX_PKG_REPLACES="libisl-dev" diff --git a/packages/libjansson/build.sh b/packages/libjansson/build.sh index 9afa6f8e6..d02a6dd0c 100644 --- a/packages/libjansson/build.sh +++ b/packages/libjansson/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://www.digip.org/jansson/ TERMUX_PKG_DESCRIPTION="C library for encoding, decoding and manipulating JSON data" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=2.12 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=76260d30e9bbd0ef392798525e8cd7fe59a6450c54ca6135672e3cd6a1642941 +TERMUX_PKG_BREAKS="libjansson-dev" +TERMUX_PKG_REPLACES="libjansson-dev" TERMUX_PKG_SRCURL=https://github.com/akheron/jansson/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/libjasper/build.sh b/packages/libjasper/build.sh index 1a31b0c82..2b29ed2c5 100644 --- a/packages/libjasper/build.sh +++ b/packages/libjasper/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://www.ece.uvic.ca/~frodo/jasper/ TERMUX_PKG_DESCRIPTION="Library for manipulating JPEG-2000 files" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=2.0.16 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SHA256=f1d8b90f231184d99968f361884e2054a1714fdbbd9944ba1ae4ebdcc9bbfdb1 TERMUX_PKG_SRCURL=https://github.com/mdadams/jasper/archive/version-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libjpeg-turbo" +TERMUX_PKG_BREAKS="libjasper-dev" +TERMUX_PKG_REPLACES="libjasper-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -H$TERMUX_PKG_SRCDIR -B$TERMUX_PKG_BUILDDIR diff --git a/packages/libjpeg-turbo/build.sh b/packages/libjpeg-turbo/build.sh index a3d7f3f48..c66c51086 100644 --- a/packages/libjpeg-turbo/build.sh +++ b/packages/libjpeg-turbo/build.sh @@ -2,7 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://libjpeg-turbo.virtualgl.org TERMUX_PKG_DESCRIPTION="Library for reading and writing JPEG image files" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=2.0.2 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/libjpeg-turbo/${TERMUX_PKG_VERSION}/libjpeg-turbo-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=acb8599fe5399af114287ee5907aea4456f8f2c1cc96d26c28aebfdf5ee82fed +TERMUX_PKG_BREAKS="libjpeg-turbo-dev" +TERMUX_PKG_REPLACES="libjpeg-turbo-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DWITH_JPEG8=1" diff --git a/packages/libksba/build.sh b/packages/libksba/build.sh index 1ddb35d97..d5db78842 100644 --- a/packages/libksba/build.sh +++ b/packages/libksba/build.sh @@ -2,8 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gnupg.org/related_software/libksba/ TERMUX_PKG_DESCRIPTION="Library for using X.509 certificates and CMS (Cryptographic Message Syntax) easily accessible" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.3.5 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/libksba/libksba-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340 TERMUX_PKG_DEPENDS="libgpg-error" -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE=bin/ksba-config +TERMUX_PKG_BREAKS="libksba-dev" +TERMUX_PKG_REPLACES="libksba-dev" diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh index afe628d02..dea29b40d 100644 --- a/packages/libllvm/build.sh +++ b/packages/libllvm/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://clang.llvm.org/ TERMUX_PKG_DESCRIPTION="Modular compiler and toolchain technologies library" TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_VERSION=8.0.0 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_REVISION=7 TERMUX_PKG_SHA256=(8872be1b12c61450cacc82b3d153eab02be2546ef34fa3580ed14137bb26224c 084c115aab0084e63b23eee8c233abb6739c399e29966eaeccfc6e088e0b736b 9caec8ec922e32ffa130f0fb08e4c5a242d7e68ce757631e425e9eba2e1a6e37 @@ -25,7 +25,8 @@ TERMUX_PKG_DEPENDS="binutils, libc++, ncurses, ndk-sysroot, libffi, zlib" # Replace gcc since gcc is deprecated by google on android and is not maintained upstream. # Conflict with clang versions earlier than 3.9.1-3 since they bundled llvm. TERMUX_PKG_CONFLICTS="gcc, clang (<< 3.9.1-3)" -TERMUX_PKG_REPLACES=gcc +TERMUX_PKG_BREAKS="libclang, libclang-dev, libllvm-dev" +TERMUX_PKG_REPLACES="gcc, libclang, libclang-dev, libllvm-dev" # See http://llvm.org/docs/CMake.html: TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DPYTHON_EXECUTABLE=$(which python3) @@ -51,7 +52,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DLLVM_ENABLE_FFI=ON " TERMUX_PKG_FORCE_CMAKE=yes -TERMUX_PKG_KEEP_STATIC_LIBRARIES=true TERMUX_PKG_HAS_DEBUG=no # Debug build succeeds but make install with: # cp: cannot stat '../src/projects/openmp/runtime/exports/common.min.50.ompt.optional/include/omp.h': No such file or directory diff --git a/packages/libllvm/libclang-dev.subpackage.sh b/packages/libllvm/libclang-dev.subpackage.sh deleted file mode 100644 index 6d7abd0a1..000000000 --- a/packages/libllvm/libclang-dev.subpackage.sh +++ /dev/null @@ -1,2 +0,0 @@ -TERMUX_SUBPKG_INCLUDE="lib/libLLVM*.a lib/libclang*.a lib/LTO.so include/clang" -TERMUX_SUBPKG_DESCRIPTION="C language frontend library for LLVM" diff --git a/packages/libllvm/libclang.subpackage.sh b/packages/libllvm/libclang.subpackage.sh deleted file mode 100644 index fd6d75a6d..000000000 --- a/packages/libllvm/libclang.subpackage.sh +++ /dev/null @@ -1,2 +0,0 @@ -TERMUX_SUBPKG_INCLUDE="lib/clang lib/libclang.so" -TERMUX_SUBPKG_DESCRIPTION="C language frontend library for LLVM" diff --git a/packages/liblua/build.sh b/packages/liblua/build.sh index b79d350eb..0e5efcf97 100644 --- a/packages/liblua/build.sh +++ b/packages/liblua/build.sh @@ -2,13 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://www.lua.org/ TERMUX_PKG_DESCRIPTION="Shared library for the Lua interpreter" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=5.3.5 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SHA256=0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac TERMUX_PKG_SRCURL=https://www.lua.org/ftp/lua-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_MAKE_ARGS=linux TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_CONFLICTS=libluajit -TERMUX_PKG_REPLACES=libluajit +TERMUX_PKG_BREAKS="liblua-dev" +TERMUX_PKG_REPLACES="liblua-dev" TERMUX_PKG_BUILD_DEPENDS="readline" termux_step_pre_configure() { diff --git a/packages/liblua52/build.sh b/packages/liblua52/build.sh index 3a1b5cd94..4f0d38169 100644 --- a/packages/liblua52/build.sh +++ b/packages/liblua52/build.sh @@ -3,9 +3,11 @@ TERMUX_PKG_DESCRIPTION="Shared library for the Lua interpreter (v5.2.x)" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=5.2.4 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://www.lua.org/ftp/lua-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b +TERMUX_PKG_BREAKS="liblua52-dev" +TERMUX_PKG_REPLACES="liblua52-dev" TERMUX_PKG_BUILD_DEPENDS="readline" TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/liblz4/build.sh b/packages/liblz4/build.sh index 11ce791f6..549ea2dde 100644 --- a/packages/liblz4/build.sh +++ b/packages/liblz4/build.sh @@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://lz4.github.io/lz4/ TERMUX_PKG_DESCRIPTION="Fast LZ compression algorithm library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.9.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=f8377c89dad5c9f266edc0be9b73595296ecafd5bfa1000de148096c50052dc4 +TERMUX_PKG_BREAKS="liblz4-dev" +TERMUX_PKG_REPLACES="liblz4-dev" TERMUX_PKG_SRCURL=https://github.com/lz4/lz4/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/liblzma/build.sh b/packages/liblzma/build.sh index 8c226d24c..d52b7b05f 100644 --- a/packages/liblzma/build.sh +++ b/packages/liblzma/build.sh @@ -2,7 +2,9 @@ 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=3 +TERMUX_PKG_REVISION=4 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_ESSENTIAL=yes diff --git a/packages/liblzo/build.sh b/packages/liblzo/build.sh index 0d03cfa43..43e853669 100644 --- a/packages/liblzo/build.sh +++ b/packages/liblzo/build.sh @@ -2,6 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://www.oberhumer.com/opensource/lzo TERMUX_PKG_DESCRIPTION="Portable lossless data compression library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.10 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/lzo-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" TERMUX_PKG_SHA256=37ed4369e45944c53306b0d6a36b66f03e5b6aede8849c9b6388f4b62b20b443 +TERMUX_PKG_BREAKS="liblzo-dev" +TERMUX_PKG_REPLACES="liblzo-dev" diff --git a/packages/libmad/build.sh b/packages/libmad/build.sh index 58e9f8176..d641532df 100644 --- a/packages/libmad/build.sh +++ b/packages/libmad/build.sh @@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://www.underbit.com/products/mad/ TERMUX_PKG_DESCRIPTION="MAD is a high-quality MPEG audio decoder" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=0.15.1b -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=ftp://ftp.mars.org/pub/mpeg/libmad-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690 +TERMUX_PKG_BREAKS="libmad-dev" +TERMUX_PKG_REPLACES="libmad-dev" termux_step_pre_configure() { if [ $TERMUX_ARCH = arm ]; then diff --git a/packages/libmaxminddb/build.sh b/packages/libmaxminddb/build.sh index d80d3e13b..fc4a6d08a 100644 --- a/packages/libmaxminddb/build.sh +++ b/packages/libmaxminddb/build.sh @@ -3,9 +3,11 @@ TERMUX_PKG_DESCRIPTION="MaxMind GeoIP2 database - library and utilities" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=1.3.2 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_REVISION=7 TERMUX_PKG_SRCURL=https://github.com/maxmind/libmaxminddb/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=c0785521c7e5515f1169db90ed6e51bc2a5a000377d0fbad87e4d5a791a6e364 +TERMUX_PKG_BREAKS="libmaxminddb-dev" +TERMUX_PKG_REPLACES="libmaxminddb-dev" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-tests" diff --git a/packages/libmesode/build.sh b/packages/libmesode/build.sh index 168560555..93d538720 100644 --- a/packages/libmesode/build.sh +++ b/packages/libmesode/build.sh @@ -2,10 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://github.com/boothj5/libmesode TERMUX_PKG_DESCRIPTION="Minimal XMPP library written for use with Profanity XMPP client" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=0.9.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli" TERMUX_PKG_SRCURL=https://github.com/boothj5/libmesode/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=79bdf92e287d8891a8eb89d84a8b1bb1c3f61ded322630f583ec1d1c00d99123 TERMUX_PKG_DEPENDS="openssl,libexpat" +TERMUX_PKG_BREAKS="libmesode-dev" +TERMUX_PKG_REPLACES="libmesode-dev" TERMUX_PKG_BUILD_IN_SRC=yes termux_step_pre_configure() { diff --git a/packages/libmnl/build.sh b/packages/libmnl/build.sh index 80979e33f..9e750782a 100644 --- a/packages/libmnl/build.sh +++ b/packages/libmnl/build.sh @@ -2,5 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://www.netfilter.org/projects/libmnl/ TERMUX_PKG_DESCRIPTION="a minimalistic user-space library oriented to Netlink developers" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_VERSION=1.0.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://netfilter.org/projects/libmnl/files/libmnl-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81 +TERMUX_PKG_BREAKS="libmnl-dev" +TERMUX_PKG_REPLACES="libmnl-dev" diff --git a/packages/libmosquitto/build.sh b/packages/libmosquitto/build.sh index 33ee0a302..74138c106 100644 --- a/packages/libmosquitto/build.sh +++ b/packages/libmosquitto/build.sh @@ -3,9 +3,12 @@ TERMUX_PKG_DESCRIPTION="MQTT library" TERMUX_PKG_LICENSE="EPL-1.0" TERMUX_PKG_MAINTAINER="Nathaniel Wesley Filardo @nwf" TERMUX_PKG_VERSION=1.6.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=9ef5cc75f4fe31d7bf50654ddf4728ad9e1ae2e5609a4b42ecbbcb4a209ed17e TERMUX_PKG_SRCURL=https://mosquitto.org/files/source/mosquitto-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="c-ares, libc++, libwebsockets, openssl" +TERMUX_PKG_BREAKS="libmosquitto-dev" +TERMUX_PKG_REPLACES="libmosquitto-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DWITH_THREADING=OFF -DWITH_TLS_PSK=OFF diff --git a/packages/libmp3lame/build.sh b/packages/libmp3lame/build.sh index d91a2405d..c8488b44e 100644 --- a/packages/libmp3lame/build.sh +++ b/packages/libmp3lame/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://lame.sourceforge.net/ TERMUX_PKG_DESCRIPTION="High quality MPEG Audio Layer III (MP3) encoder" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=3.100 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e +TERMUX_PKG_BREAKS="libmp3lame-dev" +TERMUX_PKG_REPLACES="libmp3lame-dev" TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/lame/lame/${TERMUX_PKG_VERSION}/lame-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-frontend" TERMUX_PKG_RM_AFTER_INSTALL="share/man" diff --git a/packages/libmp3splt/build.sh b/packages/libmp3splt/build.sh index 5a86ccbb0..85a839c81 100644 --- a/packages/libmp3splt/build.sh +++ b/packages/libmp3splt/build.sh @@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://mp3splt.sourceforge.net TERMUX_PKG_DESCRIPTION="Utility to split MP3, Ogg Vorbis and native FLAC files without decoding" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=0.9.2 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=http://prdownloads.sourceforge.net/mp3splt/libmp3splt-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=30eed64fce58cb379b7cc6a0d8e545579cb99d0f0f31eb00b9acc8aaa1b035dc TERMUX_PKG_DEPENDS="libmad, libid3tag, libvorbis, libflac, pcre, libtool" +TERMUX_PKG_BREAKS="libmp3splt-dev" +TERMUX_PKG_REPLACES="libmp3splt-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-cutter" diff --git a/packages/libmpc/build.sh b/packages/libmpc/build.sh index 6f7af05fd..c4cb5f9b2 100644 --- a/packages/libmpc/build.sh +++ b/packages/libmpc/build.sh @@ -2,6 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://www.multiprecision.org/ TERMUX_PKG_DESCRIPTION="Library for the arithmetic of complex numbers with arbitrarily high precision" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_DEPENDS="libgmp, libmpfr" +TERMUX_PKG_BREAKS="libmpc-dev" +TERMUX_PKG_REPLACES="libmpc-dev" TERMUX_PKG_VERSION=1.1.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/mpc/mpc-$TERMUX_PKG_VERSION.tar.gz diff --git a/packages/libmpdclient/build.sh b/packages/libmpdclient/build.sh index a0175a21b..0114e6126 100644 --- a/packages/libmpdclient/build.sh +++ b/packages/libmpdclient/build.sh @@ -3,7 +3,9 @@ TERMUX_PKG_DESCRIPTION="Asynchronous API library for interfacing MPD in the C, C TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="Matthew Klein @mklein994" TERMUX_PKG_VERSION=2.16 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=6651898489b69d2f2f8e94f0ed6ddcc0dd2cdbcf99b02131b790551922558d6c +TERMUX_PKG_BREAKS="libmpdclient-dev" +TERMUX_PKG_REPLACES="libmpdclient-dev" TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/libmpdclient/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -D default_socket==${TERMUX_PREFIX}/var/run/mpd/socket" diff --git a/packages/libmpfr/build.sh b/packages/libmpfr/build.sh index a95a8e3af..8fb41fef9 100644 --- a/packages/libmpfr/build.sh +++ b/packages/libmpfr/build.sh @@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.mpfr.org/ TERMUX_PKG_DESCRIPTION="C library for multiple-precision floating-point computations with correct rounding" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_DEPENDS="libgmp" +TERMUX_PKG_BREAKS="libmpfr-dev" +TERMUX_PKG_REPLACES="libmpfr-dev" TERMUX_PKG_VERSION=4.0.2 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/mpfr/mpfr-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_header_locale_h=no" diff --git a/packages/libmsgpack/build.sh b/packages/libmsgpack/build.sh index 66d628459..5f909ed91 100644 --- a/packages/libmsgpack/build.sh +++ b/packages/libmsgpack/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/msgpack/msgpack-c/ TERMUX_PKG_DESCRIPTION="MessagePack implementation for C and C++" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=3.2.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=fbaa28c363a316fd7523f31d1745cf03eab0d1e1ea5a1c60aa0dffd4ce551afe +TERMUX_PKG_BREAKS="libmsgpack-dev" +TERMUX_PKG_REPLACES="libmsgpack-dev" TERMUX_PKG_SRCURL=https://github.com/msgpack/msgpack-c/releases/download/cpp-${TERMUX_PKG_VERSION}/msgpack-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/libnettle/build.sh b/packages/libnettle/build.sh index aa7158afe..41bcd8ed3 100644 --- a/packages/libnettle/build.sh +++ b/packages/libnettle/build.sh @@ -2,7 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://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_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=3.5.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/nettle/nettle-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libgmp" +TERMUX_PKG_BREAKS="libnettle-dev" +TERMUX_PKG_REPLACES="libnettle-dev" diff --git a/packages/libnfs/build.sh b/packages/libnfs/build.sh index 377a6d830..80bb6e6fd 100644 --- a/packages/libnfs/build.sh +++ b/packages/libnfs/build.sh @@ -3,9 +3,11 @@ TERMUX_PKG_DESCRIPTION="NFS client library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=4.0.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/sahlberg/libnfs/archive/libnfs-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d +TERMUX_PKG_BREAKS="libnfs-dev" +TERMUX_PKG_REPLACES="libnfs-dev" termux_step_pre_configure() { autoreconf -fi diff --git a/packages/libnghttp2/build.sh b/packages/libnghttp2/build.sh index b573aff7f..1ba50410d 100644 --- a/packages/libnghttp2/build.sh +++ b/packages/libnghttp2/build.sh @@ -2,8 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://nghttp2.org/ TERMUX_PKG_DESCRIPTION="nghttp HTTP 2.0 library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=1.39.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/nghttp2/nghttp2/releases/download/v${TERMUX_PKG_VERSION}/nghttp2-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=679160766401f474731fd60c3aca095f88451e3cc4709b72306e4c34cf981448 +TERMUX_PKG_BREAKS="libnghttp2-dev" +TERMUX_PKG_REPLACES="libnghttp2-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-lib-only" # The tools are not built due to --enable-lib-only: TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1 share/nghttp2/fetch-ocsp-response" diff --git a/packages/libnl/build.sh b/packages/libnl/build.sh index 58bd6efff..c1ad4af2b 100644 --- a/packages/libnl/build.sh +++ b/packages/libnl/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/thom311/libnl TERMUX_PKG_DESCRIPTION="Collection of libraries providing APIs to netlink protocol based Linux kernel interfaces" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=3.4.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf +TERMUX_PKG_BREAKS="libnl-dev" +TERMUX_PKG_REPLACES="libnl-dev" TERMUX_PKG_SRCURL=https://github.com/thom311/libnl/releases/download/libnl${TERMUX_PKG_VERSION//./_}/libnl-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-pthreads --disable-cli" diff --git a/packages/libnpth/build.sh b/packages/libnpth/build.sh index 1519b44db..ea14988f6 100644 --- a/packages/libnpth/build.sh +++ b/packages/libnpth/build.sh @@ -2,5 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://www.gnupg.org/related_software/npth/ TERMUX_PKG_DESCRIPTION="New GNU Portable Threads Library" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.6 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1 +TERMUX_PKG_BREAKS="libnpth-dev" +TERMUX_PKG_REPLACES="libnpth-dev" TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/npth/npth-${TERMUX_PKG_VERSION}.tar.bz2 diff --git a/packages/libogg/build.sh b/packages/libogg/build.sh index 732dfa1f3..23aaa62da 100644 --- a/packages/libogg/build.sh +++ b/packages/libogg/build.sh @@ -2,5 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://xiph.org/ogg/ TERMUX_PKG_DESCRIPTION="Library for working with the Ogg multimedia container format" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=1.3.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 +TERMUX_PKG_BREAKS="libogg-dev" +TERMUX_PKG_REPLACES="libogg-dev" TERMUX_PKG_SRCURL=https://downloads.xiph.org/releases/ogg/libogg-${TERMUX_PKG_VERSION}.tar.gz diff --git a/packages/liboggz/build.sh b/packages/liboggz/build.sh index da2612361..5f2910be5 100644 --- a/packages/liboggz/build.sh +++ b/packages/liboggz/build.sh @@ -2,7 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.xiph.org/oggz/ TERMUX_PKG_DESCRIPTION="Command and library to inspect, tweak, edit and validate Ogg files" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=1.1.1 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=http://downloads.xiph.org/releases/liboggz/liboggz-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=6bafadb1e0a9ae4ac83304f38621a5621b8e8e32927889e65a98706d213d415a TERMUX_PKG_DEPENDS="libogg" +TERMUX_PKG_BREAKS="liboggz-dev" +TERMUX_PKG_REPLACES="liboggz-dev" diff --git a/packages/libopus/build.sh b/packages/libopus/build.sh index 1ac0cc1c0..77916df98 100644 --- a/packages/libopus/build.sh +++ b/packages/libopus/build.sh @@ -2,6 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://www.opus-codec.org/ TERMUX_PKG_DESCRIPTION="Reference implementation of the Opus codec" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=1.3.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://archive.mozilla.org/pub/opus/opus-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +TERMUX_PKG_BREAKS="libopus-dev" +TERMUX_PKG_REPLACES="libopus-dev" diff --git a/packages/libopusenc/build.sh b/packages/libopusenc/build.sh index a9e705b9e..74aaa88ee 100644 --- a/packages/libopusenc/build.sh +++ b/packages/libopusenc/build.sh @@ -2,6 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/xiph/libopusenc TERMUX_PKG_DESCRIPTION="High-level API for encoding .opus files" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=0.2.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=8298db61a8d3d63e41c1a80705baa8ce9ff3f50452ea7ec1c19a564fe106cbb9 TERMUX_PKG_SRCURL=https://archive.mozilla.org/pub/opus/libopusenc-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="libopus" +TERMUX_PKG_BREAKS="libopusenc-dev" +TERMUX_PKG_REPLACES="libopusenc-dev" diff --git a/packages/libotr/build.sh b/packages/libotr/build.sh index 98e125eab..cdb8470e2 100644 --- a/packages/libotr/build.sh +++ b/packages/libotr/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://otr.cypherpunks.ca TERMUX_PKG_DESCRIPTION="Off-the-Record (OTR) Messaging allows you to have private conversations over instant messaging by providing: Encryption, Authentication, Deniability, Perfect forward secrecy" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=4.1.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli" TERMUX_PKG_SRCURL=https://otr.cypherpunks.ca/libotr-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=8b3b182424251067a952fb4e6c7b95a21e644fbb27fbd5f8af2b2ed87ca419f5 TERMUX_PKG_DEPENDS="libgcrypt" +TERMUX_PKG_BREAKS="libotr-dev" +TERMUX_PKG_REPLACES="libotr-dev" TERMUX_PKG_BUILD_DEPENDS="libgpg-error" TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/libpcap/build.sh b/packages/libpcap/build.sh index b8b821e33..6559aa853 100644 --- a/packages/libpcap/build.sh +++ b/packages/libpcap/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.tcpdump.org TERMUX_PKG_DESCRIPTION="Library for network traffic capture" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=1.9.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=b4f87ce52bba24111faf048d3f6450f116b42fe849bc1b997e494f605b3d2735 +TERMUX_PKG_BREAKS="libpcap-dev" +TERMUX_PKG_REPLACES="libpcap-dev" # The main tcpdump.org was down 2017-04-12, so we're using a mirror: TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/libpcap-${TERMUX_PKG_VERSION}.tar.xz # ac_cv_lib_nl_3_nl_socket_alloc=no to avoid linking against libnl: diff --git a/packages/libpipeline/build.sh b/packages/libpipeline/build.sh index 1c2c5035f..44b4a7aa1 100644 --- a/packages/libpipeline/build.sh +++ b/packages/libpipeline/build.sh @@ -2,5 +2,8 @@ TERMUX_PKG_HOMEPAGE=http://libpipeline.nongnu.org/ TERMUX_PKG_DESCRIPTION="C library for manipulating pipelines of subprocesses in a flexible and convenient way" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.5.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=d633706b7d845f08b42bc66ddbe845d57e726bf89298e2cee29f09577e2f902f +TERMUX_PKG_BREAKS="libpipeline-dev" +TERMUX_PKG_REPLACES="libpipeline-dev" TERMUX_PKG_SRCURL=http://download.savannah.gnu.org/releases/libpipeline/libpipeline-${TERMUX_PKG_VERSION}.tar.gz diff --git a/packages/libpixman/build.sh b/packages/libpixman/build.sh index a1f5492b9..40ada43df 100644 --- a/packages/libpixman/build.sh +++ b/packages/libpixman/build.sh @@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://www.pixman.org/ TERMUX_PKG_DESCRIPTION="Low-level library for pixel manipulation" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=0.38.4 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://cairographics.org/releases/pixman-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=da66d6fd6e40aee70f7bd02e4f8f76fc3f006ec879d346bae6a723025cfbdde7 +TERMUX_PKG_BREAKS="libpixman-dev" +TERMUX_PKG_REPLACES="libpixman-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-libpng" termux_step_pre_configure() { diff --git a/packages/libpng/build.sh b/packages/libpng/build.sh index 6fdb3a528..5d675643d 100644 --- a/packages/libpng/build.sh +++ b/packages/libpng/build.sh @@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://www.libpng.org/pub/png/libpng.html TERMUX_PKG_DESCRIPTION="Official PNG reference library" TERMUX_PKG_LICENSE="Libpng" TERMUX_PKG_VERSION=1.6.37 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/libpng-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_DEPENDS="zlib" -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/libpng-config bin/libpng16-config" +TERMUX_PKG_BREAKS="libpng-dev" +TERMUX_PKG_REPLACES="libpng-dev" TERMUX_PKG_RM_AFTER_INSTALL="bin/png-fix-itxt bin/pngfix" diff --git a/packages/libpopt/build.sh b/packages/libpopt/build.sh index 10eeb6264..4ec8f8aa7 100644 --- a/packages/libpopt/build.sh +++ b/packages/libpopt/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://www.linuxfromscratch.org/blfs/view/svn/general/popt.h TERMUX_PKG_DESCRIPTION="Library for parsing cmdline parameters" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=1.16 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/popt-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8 TERMUX_PKG_DEPENDS="libandroid-glob" +TERMUX_PKG_BREAKS="libpopt-dev" +TERMUX_PKG_REPLACES="libpopt-dev" termux_step_pre_configure() { LDFLAGS+=" -landroid-glob" diff --git a/packages/libprotobuf-c/build.sh b/packages/libprotobuf-c/build.sh index d6b059133..640d78790 100644 --- a/packages/libprotobuf-c/build.sh +++ b/packages/libprotobuf-c/build.sh @@ -7,3 +7,5 @@ TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/protobuf-c/protobuf-c/releases/download/v${TERMUX_PKG_VERSION}/protobuf-c-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=51472d3a191d6d7b425e32b612e477c06f73fe23e07f6a6a839b11808e9d2267 TERMUX_PKG_DEPENDS="libc++, libprotobuf, protobuf" +TERMUX_PKG_BREAKS="libprotobuf-c-dev" +TERMUX_PKG_REPLACES="libprotobuf-c-dev" diff --git a/packages/libprotobuf/build.sh b/packages/libprotobuf/build.sh index 443740dac..bfa208aa4 100644 --- a/packages/libprotobuf/build.sh +++ b/packages/libprotobuf/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://github.com/google/protobuf TERMUX_PKG_DESCRIPTION="Protocol buffers C++ library" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=3.9.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/google/protobuf/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=2ee9dcec820352671eb83e081295ba43f7a4157181dad549024d7070d079cf65 TERMUX_PKG_DEPENDS="libc++, zlib" +TERMUX_PKG_BREAKS="libprotobuf-dev" +TERMUX_PKG_REPLACES="libprotobuf-dev" TERMUX_PKG_FORCE_CMAKE=yes TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dprotobuf_BUILD_TESTS=OFF diff --git a/packages/libpsl/build.sh b/packages/libpsl/build.sh index ae7cf40d5..8e535540e 100644 --- a/packages/libpsl/build.sh +++ b/packages/libpsl/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://github.com/rockdaboot/libpsl TERMUX_PKG_DESCRIPTION="Public Suffix List library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=0.21.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/rockdaboot/libpsl/releases/download/libpsl-${TERMUX_PKG_VERSION}/libpsl-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=41bd1c75a375b85c337b59783f5deb93dbb443fb0a52d257f403df7bd653ee12 TERMUX_PKG_DEPENDS="libidn2, libunistring" -#TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_BREAKS="libpsl-dev" +TERMUX_PKG_REPLACES="libpsl-dev" termux_step_pre_configure() { autoreconf -fiv diff --git a/packages/libpulseaudio/build.sh b/packages/libpulseaudio/build.sh index 2c6384be3..ea203a323 100644 --- a/packages/libpulseaudio/build.sh +++ b/packages/libpulseaudio/build.sh @@ -2,12 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio TERMUX_PKG_DESCRIPTION="A featureful, general-purpose sound server - shared libraries" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=12.2 -TERMUX_PKG_REVISION=19 +TERMUX_PKG_REVISION=20 TERMUX_PKG_SHA256=809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055 TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/pulseaudio/releases/pulseaudio-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_DEPENDS="libltdl, libsndfile, libandroid-glob, libsoxr, speexdsp" +TERMUX_PKG_BREAKS="libpulseaudio-dev" +TERMUX_PKG_REPLACES="libpulseaudio-dev" TERMUX_PKG_BUILD_DEPENDS="libtool" -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/vala" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-neon-opt --disable-alsa --disable-esound diff --git a/packages/libqrencode/build.sh b/packages/libqrencode/build.sh index af244bb2a..fc1c1187f 100644 --- a/packages/libqrencode/build.sh +++ b/packages/libqrencode/build.sh @@ -3,8 +3,10 @@ TERMUX_PKG_DESCRIPTION="Libqrencode is a fast and compact library for encoding d TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" TERMUX_PKG_VERSION=4.0.2 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=43091fea4752101f0fe61a957310ead10a7cb4b81e170ce61e5baa73a6291ac2 TERMUX_PKG_SRCURL=https://github.com/fukuchi/libqrencode/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="libandroid-support, libpng, zlib" +TERMUX_PKG_BREAKS="libqrencode-dev" +TERMUX_PKG_REPLACES="libqrencode-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_SHARED_LIBS=ON" diff --git a/packages/librsvg/build.sh b/packages/librsvg/build.sh index 33f74fef4..a9a87e3b4 100644 --- a/packages/librsvg/build.sh +++ b/packages/librsvg/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://wiki.gnome.org/action/show/Projects/LibRsvg TERMUX_PKG_DESCRIPTION="Library to render SVG files using cairo" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=2.45.8 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/GNOME/sources/librsvg/${TERMUX_PKG_VERSION:0:4}/librsvg-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=3fa09b8e4d3f2d397c6dd26f1078795203f05f609672d31c11e8bae1e5a152f1 TERMUX_PKG_DEPENDS="libcroco, pango, gdk-pixbuf, libcairo-gobject, zlib" +TERMUX_PKG_BREAKS="librsvg-dev" +TERMUX_PKG_REPLACES="librsvg-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-introspection --disable-pixbuf-loader" termux_step_pre_configure() { diff --git a/packages/librsync/build.sh b/packages/librsync/build.sh index 68f9dfa9b..2ccd1ccd4 100644 --- a/packages/librsync/build.sh +++ b/packages/librsync/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://github.com/librsync/librsync TERMUX_PKG_DESCRIPTION="Remote delta-compression library" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=2.0.2 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=e67b9520ee84f7239be6e948795803bd95495091cc00bf6d0e8c6976032a4af1 TERMUX_PKG_SRCURL=https://github.com/librsync/librsync/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libbz2" +TERMUX_PKG_BREAKS="librsync-dev" +TERMUX_PKG_REPLACES="librsync-dev" TERMUX_PKG_BUILD_DEPENDS="libpopt" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DPERL_EXECUTABLE=$(which perl)" diff --git a/packages/libsasl/build.sh b/packages/libsasl/build.sh index f10c5f450..6a15c2250 100644 --- a/packages/libsasl/build.sh +++ b/packages/libsasl/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.cyrusimap.org/sasl/ TERMUX_PKG_DESCRIPTION="Cyrus SASL - authentication abstraction library" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=2.1.27 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=6eaf75ce1e73be63894fb04d1fd0bfa9f54f33e88269743dd8f2ff54e27ea043 +TERMUX_PKG_BREAKS="libsasl-dev" +TERMUX_PKG_REPLACES="libsasl-dev" TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/cyrus-sasl-$TERMUX_PKG_VERSION.tar.xz # Seems to be race issues in build (symlink creation):: TERMUX_MAKE_PROCESSES=1 diff --git a/packages/libsndfile/build.sh b/packages/libsndfile/build.sh index f1600a0db..3baffb40b 100644 --- a/packages/libsndfile/build.sh +++ b/packages/libsndfile/build.sh @@ -3,10 +3,12 @@ TERMUX_PKG_DESCRIPTION="Library for reading/writing audio files" TERMUX_PKG_LICENSE="LGPL-2.0" # Use a git master snapshot until 1.0.29 is released: TERMUX_PKG_VERSION=1.0.29~pre1 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/erikd/libsndfile/archive/826d5296da54c016e3cb0f7f00de3b9e295b9c4a.zip TERMUX_PKG_SHA256=84651201a8468c448f1fd172a48ccf47f3761d23fd0f59bcaaf908050e9eeb7c TERMUX_PKG_DEPENDS="libflac, libvorbis" +TERMUX_PKG_BREAKS="libsndfile-dev" +TERMUX_PKG_REPLACES="libsndfile-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-sqlite --disable-alsa" TERMUX_PKG_RM_AFTER_INSTALL="bin/ share/man/man1/" diff --git a/packages/libsodium/build.sh b/packages/libsodium/build.sh index fbcad94c1..7a7afbcc3 100644 --- a/packages/libsodium/build.sh +++ b/packages/libsodium/build.sh @@ -2,5 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://libsodium.org/ TERMUX_PKG_DESCRIPTION="Network communication, cryptography and signaturing library" TERMUX_PKG_LICENSE="ISC" TERMUX_PKG_VERSION=1.0.18 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/jedisct1/libsodium/archive/${TERMUX_PKG_VERSION}-RELEASE.tar.gz TERMUX_PKG_SHA256=b7292dd1da67a049c8e78415cd498ec138d194cfdb302e716b08d26b80fecc10 +TERMUX_PKG_BREAKS="libsodium-dev" +TERMUX_PKG_REPLACES="libsodium-dev" diff --git a/packages/libsoup/build.sh b/packages/libsoup/build.sh index 4c49bb7a0..e9b9f85d3 100644 --- a/packages/libsoup/build.sh +++ b/packages/libsoup/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://wiki.gnome.org/action/show/Projects/libsoup TERMUX_PKG_DESCRIPTION="HTTP client and server library" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=2.66.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/GNOME/sources/libsoup/${TERMUX_PKG_VERSION:0:4}/libsoup-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=bd2ea602eba642509672812f3c99b77cbec2f3de02ba1cc8cb7206bf7de0ae2a TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-Dvapi=false -Dgssapi=false" TERMUX_PKG_DEPENDS="glib, libpsl, libsqlite, libxml2" +TERMUX_PKG_BREAKS="libsoup-dev" +TERMUX_PKG_REPLACES="libsoup-dev" diff --git a/packages/libsoxr/build.sh b/packages/libsoxr/build.sh index e4ef156ed..dbc7daaed 100644 --- a/packages/libsoxr/build.sh +++ b/packages/libsoxr/build.sh @@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://sourceforge.net/projects/soxr/ TERMUX_PKG_DESCRIPTION="High quality, one-dimensional sample-rate conversion library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=0.1.3 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://sourceforge.net/projects/soxr/files/soxr-$TERMUX_PKG_VERSION-Source.tar.xz TERMUX_PKG_SHA256=b111c15fdc8c029989330ff559184198c161100a59312f5dc19ddeb9b5a15889 +TERMUX_PKG_BREAKS="libsoxr-dev" +TERMUX_PKG_REPLACES="libsoxr-dev" TERMUX_PKG_BUILD_IN_SRC=yes termux_step_configure() { diff --git a/packages/libsqlite/build.sh b/packages/libsqlite/build.sh index 748b7cc0a..3719ebd6b 100644 --- a/packages/libsqlite/build.sh +++ b/packages/libsqlite/build.sh @@ -7,15 +7,17 @@ _SQLITE_MINOR=29 _SQLITE_PATCH=0 TERMUX_PKG_SHA256=8e7c1e2950b5b04c5944a981cb31fffbf9d2ddda939d536838ebc854481afd5b TERMUX_PKG_VERSION=${_SQLITE_MAJOR}.${_SQLITE_MINOR}.${_SQLITE_PATCH} +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.sqlite.org/2019/sqlite-autoconf-${_SQLITE_MAJOR}${_SQLITE_MINOR}0${_SQLITE_PATCH}00.tar.gz TERMUX_PKG_DEPENDS="zlib" +TERMUX_PKG_BREAKS="libsqlite-dev" +TERMUX_PKG_REPLACES="libsqlite-dev" # ac_cv_func_strerror_r=no as strerror_r() with the # GNU signature is only # available in android-23: TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_func_strerror_r=no --enable-readline " -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="src/libsqlite/tclsqlite3.c" termux_step_pre_configure() { CPPFLAGS+=" -Werror -DSQLITE_ENABLE_DBSTAT_VTAB=1" diff --git a/packages/libssh/build.sh b/packages/libssh/build.sh index 2d95fe553..107c348b3 100644 --- a/packages/libssh/build.sh +++ b/packages/libssh/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.libssh.org/ TERMUX_PKG_DESCRIPTION="Tiny C SSH library" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=0.9.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.libssh.org/files/${TERMUX_PKG_VERSION:0:3}/libssh-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=25303c2995e663cd169fdd902bae88106f48242d7e96311d74f812023482c7a5 TERMUX_PKG_DEPENDS="openssl, zlib" +TERMUX_PKG_BREAKS="libssh-dev" +TERMUX_PKG_REPLACES="libssh-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DHAVE_ARGP_H=OFF -DWITH_GSSAPI=OFF diff --git a/packages/libssh2/build.sh b/packages/libssh2/build.sh index 5212a9f3b..dd7ef9f16 100644 --- a/packages/libssh2/build.sh +++ b/packages/libssh2/build.sh @@ -2,6 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.libssh2.org TERMUX_PKG_DESCRIPTION="Client-side library implementing the SSH2 protocol" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=1.9.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd TERMUX_PKG_SRCURL=https://www.libssh2.org/download/libssh2-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="openssl, zlib" +TERMUX_PKG_BREAKS="libssh2-dev" +TERMUX_PKG_REPLACES="libssh2-dev" diff --git a/packages/libtalloc/build.sh b/packages/libtalloc/build.sh index d921c475f..554310f7a 100644 --- a/packages/libtalloc/build.sh +++ b/packages/libtalloc/build.sh @@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://talloc.samba.org/talloc/doc/html/index.html TERMUX_PKG_DESCRIPTION="Hierarchical, reference counted memory pool system with destructors" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=2.1.14 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=b185602756a628bac507fa8af8b9df92ace69d27c0add5dab93190ad7c3367ce +TERMUX_PKG_BREAKS="libtalloc-dev" +TERMUX_PKG_REPLACES="libtalloc-dev" TERMUX_PKG_SRCURL=https://www.samba.org/ftp/talloc/talloc-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC="yes" diff --git a/packages/libtermkey/build.sh b/packages/libtermkey/build.sh index 8c5e18eda..cf9617ff7 100644 --- a/packages/libtermkey/build.sh +++ b/packages/libtermkey/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://www.leonerd.org.uk/code/libtermkey/ TERMUX_PKG_DESCRIPTION="Library for processing of keyboard entry for terminal-based programs" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=0.22 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=6945bd3c4aaa83da83d80a045c5563da4edd7d0374c62c0d35aec09eb3014600 TERMUX_PKG_SRCURL=http://www.leonerd.org.uk/code/libtermkey/libtermkey-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libunibilium" +TERMUX_PKG_BREAKS="libtermkey-dev" +TERMUX_PKG_REPLACES="libtermkey-dev" TERMUX_PKG_BUILD_IN_SRC=yes termux_step_make() { diff --git a/packages/libtiff/build.sh b/packages/libtiff/build.sh index cfba215c2..3866401bc 100644 --- a/packages/libtiff/build.sh +++ b/packages/libtiff/build.sh @@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://www.simplesystems.org/libtiff/ # Note that http://lib TERMUX_PKG_DESCRIPTION="Support for the Tag Image File Format (TIFF) for storing image data" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=4.0.10 -TERMUX_PKG_REVISION=9 +TERMUX_PKG_REVISION=10 TERMUX_PKG_SRCURL=http://download.osgeo.org/libtiff/tiff-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4 TERMUX_PKG_DEPENDS="libc++, libjpeg-turbo, liblzma, zlib" +TERMUX_PKG_BREAKS="libtiff-dev" +TERMUX_PKG_REPLACES="libtiff-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-cxx --disable-webp" diff --git a/packages/libtool/build.sh b/packages/libtool/build.sh index 9c667942b..9670fbb7e 100644 --- a/packages/libtool/build.sh +++ b/packages/libtool/build.sh @@ -2,11 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/libtool/ TERMUX_PKG_DESCRIPTION="Generic library support script hiding the complexity of using shared libraries behind a consistent, portable interface" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.4.6 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_REVISION=7 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/libtool/libtool-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3 TERMUX_PKG_DEPENDS="bash,grep,sed,libltdl" -TERMUX_PKG_NO_DEVELSPLIT=yes TERMUX_PKG_CONFLICTS="libtool-dev" TERMUX_PKG_REPLACES="libtool-dev" diff --git a/packages/libunibilium/build.sh b/packages/libunibilium/build.sh index ec927baf8..44edf3191 100644 --- a/packages/libunibilium/build.sh +++ b/packages/libunibilium/build.sh @@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/mauke/unibilium TERMUX_PKG_DESCRIPTION="Terminfo parsing library" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_VERSION=2.0.0 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=78997d38d4c8177c60d3d0c1aa8c53fd0806eb21825b7b335b1768d7116bc1c1 +TERMUX_PKG_BREAKS="libunibilium-dev" +TERMUX_PKG_REPLACES="libunibilium-dev" TERMUX_PKG_SRCURL=https://github.com/mauke/unibilium/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/libunistring/build.sh b/packages/libunistring/build.sh index e5de664ff..aac8c986d 100644 --- a/packages/libunistring/build.sh +++ b/packages/libunistring/build.sh @@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/libunistring/ TERMUX_PKG_DESCRIPTION="Library providing functions for manipulating Unicode strings" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=0.9.10 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=a82e5b333339a88ea4608e4635479a1cfb2e01aafb925e1290b65710d43f610b TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/libunistring/libunistring-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libandroid-support, libiconv" +TERMUX_PKG_BREAKS="libunistring-dev" +TERMUX_PKG_REPLACES="libunistring-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_uselocale=no am_cv_langinfo_codeset=yes" diff --git a/packages/libunwind/build.sh b/packages/libunwind/build.sh index 5ba48e3b0..7f43016a4 100644 --- a/packages/libunwind/build.sh +++ b/packages/libunwind/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://www.nongnu.org/libunwind/ TERMUX_PKG_DESCRIPTION="Library to determine the call-chain of a program" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.3.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8 +TERMUX_PKG_BREAKS="libunwind-dev" +TERMUX_PKG_REPLACES="libunwind-dev" TERMUX_PKG_SRCURL=https://github.com/libunwind/libunwind/releases/download/v$TERMUX_PKG_VERSION/libunwind-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-tests diff --git a/packages/libuuid/build.sh b/packages/libuuid/build.sh index 68cda46f8..5075a151a 100644 --- a/packages/libuuid/build.sh +++ b/packages/libuuid/build.sh @@ -2,6 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://sourceforge.net/projects/libuuid/ TERMUX_PKG_DESCRIPTION="Portable uuid C library" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=1.0.3 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/libuuid/libuuid-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=46af3275291091009ad7f1b899de3d0cea0252737550e7919d17237997db5644 +TERMUX_PKG_BREAKS="libuuid-dev" +TERMUX_PKG_REPLACES="libuuid-dev" diff --git a/packages/libuv/build.sh b/packages/libuv/build.sh index bb4db4dc8..6a97bcef3 100644 --- a/packages/libuv/build.sh +++ b/packages/libuv/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://libuv.org TERMUX_PKG_DESCRIPTION="Support library with a focus on asynchronous I/O" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=1.30.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=468316fa841d114114f167b45d1f43d46a2a1852d8464336a4abbbf5b88b478b +TERMUX_PKG_BREAKS="libuv-dev" +TERMUX_PKG_REPLACES="libuv-dev" TERMUX_PKG_SRCURL=https://dist.libuv.org/dist/v${TERMUX_PKG_VERSION}/libuv-v${TERMUX_PKG_VERSION}.tar.gz termux_step_pre_configure() { diff --git a/packages/libvorbis/build.sh b/packages/libvorbis/build.sh index 93efa10be..692b6805e 100644 --- a/packages/libvorbis/build.sh +++ b/packages/libvorbis/build.sh @@ -2,8 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://www.vorbis.com/ TERMUX_PKG_DESCRIPTION="Library for using the Ogg Vorbis compressed audio format" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=1.3.6 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=http://downloads.xiph.org/releases/vorbis/libvorbis-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415 TERMUX_PKG_DEPENDS="libogg" -TERMUX_PKG_DEVPACKAGE_DEPENDS="libogg-dev" +TERMUX_PKG_BREAKS="libvorbis-dev" +TERMUX_PKG_REPLACES="libvorbis-dev" diff --git a/packages/libvpx/build.sh b/packages/libvpx/build.sh index 34ce64693..9108fef91 100644 --- a/packages/libvpx/build.sh +++ b/packages/libvpx/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.webmproject.org TERMUX_PKG_DESCRIPTION="VP8 & VP9 Codec SDK" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=1.8.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/webmproject/libvpx/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=df19b8f24758e90640e1ab228ab4a4676ec3df19d23e4593375e6f3847dee03e TERMUX_PKG_DEPENDS="libc++" +TERMUX_PKG_BREAKS="libvpx-dev" +TERMUX_PKG_REPLACES="libvpx-dev" termux_step_configure() { # Force fresh install of header files: diff --git a/packages/libvterm/build.sh b/packages/libvterm/build.sh index efb4ef213..13bcdee7a 100644 --- a/packages/libvterm/build.sh +++ b/packages/libvterm/build.sh @@ -3,8 +3,11 @@ TERMUX_PKG_DESCRIPTION="Terminal emulator library" TERMUX_PKG_LICENSE="MIT" # libvterm does not do releases, take a specific commit for now: TERMUX_PKG_VERSION=18.11.26 +TERMUX_PKG_REVISION=1 _COMMIT=7a3913a4f465fbf4f59a049f43da8d97fc573a97 TERMUX_PKG_SHA256=1da101b5b5885acc83e9f84e2ac2d93d97ac85e09122af3d5dd2606d8fe93b10 +TERMUX_PKG_BREAKS="libvterm-dev" +TERMUX_PKG_REPLACES="libvterm-dev" TERMUX_PKG_SRCURL=https://github.com/neovim/libvterm/archive/$_COMMIT.zip TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/libwebp/build.sh b/packages/libwebp/build.sh index 3e2819b3b..c3b3dcefe 100644 --- a/packages/libwebp/build.sh +++ b/packages/libwebp/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/webmproject/libwebp TERMUX_PKG_DESCRIPTION="Library to encode and decode images in WebP format" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=1.0.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=082d114bcb18a0e2aafc3148d43367c39304f86bf18ba0b2e766447e111a4a91 +TERMUX_PKG_BREAKS="libwebp-dev" +TERMUX_PKG_REPLACES="libwebp-dev" TERMUX_PKG_SRCURL=https://github.com/webmproject/libwebp/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-gif diff --git a/packages/libwebsockets/build.sh b/packages/libwebsockets/build.sh index 54dde4618..816e6039b 100644 --- a/packages/libwebsockets/build.sh +++ b/packages/libwebsockets/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://libwebsockets.org TERMUX_PKG_DESCRIPTION="Lightweight C websockets library" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=3.1.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=db948be74c78fc13f1f1a55e76707d7baae3a1c8f62b625f639e8f2736298324 TERMUX_PKG_SRCURL=https://github.com/warmcat/libwebsockets/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="openssl" +TERMUX_PKG_BREAKS="libwebsockets-dev" +TERMUX_PKG_REPLACES="libwebsockets-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DLWS_WITHOUT_TESTAPPS=ON -DLWS_WITH_STATIC=OFF" TERMUX_PKG_RM_AFTER_INSTALL="lib/pkgconfig/libwebsockets_static.pc" diff --git a/packages/libx264/build.sh b/packages/libx264/build.sh index d4546b2b3..e0b0f4f54 100644 --- a/packages/libx264/build.sh +++ b/packages/libx264/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.videolan.org/developers/x264.html TERMUX_PKG_DESCRIPTION="Library for encoding video streams into the H.264/MPEG-4 AVC format" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=20190215 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=731c26a106dd97509feaaba2e6b57b27c754031d48186af6e1474cc0e1eee582 +TERMUX_PKG_BREAKS="libx264-dev" +TERMUX_PKG_REPLACES="libx264-dev" TERMUX_PKG_SRCURL=http://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${TERMUX_PKG_VERSION}-2245-stable.tar.bz2 # Avoid linking against ffmpeg libraries to avoid circular dependency: TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/libx265/build.sh b/packages/libx265/build.sh index 250cdd4a6..5e2a752a3 100644 --- a/packages/libx265/build.sh +++ b/packages/libx265/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://x265.org/ TERMUX_PKG_DESCRIPTION="H.265/HEVC video stream encoder library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=3.1.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://ftp.videolan.org/pub/videolan/x265/x265_${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=827900c7cc0a0105b8a96460fab7cd22b97afa7b2835b5cb979c44bddaa3c8d0 TERMUX_PKG_DEPENDS="libc++" +TERMUX_PKG_BREAKS="libx265-dev" +TERMUX_PKG_REPLACES="libx265-dev" termux_step_pre_configure() { if [ $TERMUX_ARCH = "i686" ]; then diff --git a/packages/libxapian/build.sh b/packages/libxapian/build.sh index 4a32b0ca4..783a58ef6 100644 --- a/packages/libxapian/build.sh +++ b/packages/libxapian/build.sh @@ -2,10 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://xapian.org TERMUX_PKG_DESCRIPTION="Xapian search engine library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.4.11 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=http://oligarchy.co.uk/xapian/${TERMUX_PKG_VERSION}/xapian-core-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=9f16b2f3e2351a24034d7636f73566ab74c3f0729e9e0492934e956b25c5bc07 # Note that we cannot /proc/sys/kernel/random/uuid (permission denied on # new android versions) so need libuuid. TERMUX_PKG_DEPENDS="libc++, libuuid, zlib" -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/xapian-config share/man/man1/xapian-config.1" +TERMUX_PKG_BREAKS="libxapian-dev" +TERMUX_PKG_REPLACES="libxapian-dev" diff --git a/packages/libxml2/build.sh b/packages/libxml2/build.sh index 33ed4966d..8af42bce5 100644 --- a/packages/libxml2/build.sh +++ b/packages/libxml2/build.sh @@ -2,10 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://www.xmlsoft.org TERMUX_PKG_DESCRIPTION="Library for parsing XML documents" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=2.9.9 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=ftp://xmlsoft.org/libxml2/libxml2-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-python" TERMUX_PKG_RM_AFTER_INSTALL="share/gtk-doc" -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/xml2-config share/man/man1/xml2-config.1 lib/cmake lib/xml2Conf.sh" TERMUX_PKG_DEPENDS="libiconv, liblzma, zlib" +TERMUX_PKG_BREAKS="libxml2-dev" +TERMUX_PKG_REPLACES="libxml2-dev" diff --git a/packages/libxslt/build.sh b/packages/libxslt/build.sh index 4db962700..a73eaca61 100644 --- a/packages/libxslt/build.sh +++ b/packages/libxslt/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://xmlsoft.org/libxslt/ TERMUX_PKG_DESCRIPTION="XSLT processing library" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=1.1.33 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8 TERMUX_PKG_SRCURL=ftp://xmlsoft.org/libxslt/libxslt-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-python" TERMUX_PKG_DEPENDS="libxml2, libgcrypt, libgpg-error, zlib" -TERMUX_PKG_DEVPACKAGE_DEPENDS="libxml2-dev" -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/xslt-config lib/xsltConf.sh" +TERMUX_PKG_BREAKS="libxslt-dev" +TERMUX_PKG_REPLACES="libxslt-dev" diff --git a/packages/libyaml/build.sh b/packages/libyaml/build.sh index beccd9f3c..733724df0 100644 --- a/packages/libyaml/build.sh +++ b/packages/libyaml/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://pyyaml.org/wiki/LibYAML TERMUX_PKG_DESCRIPTION="LibYAML is a YAML 1.1 parser and emitter written in C" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=0.2.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=46bca77dc8be954686cff21888d6ce10ca4016b360ae1f56962e6882a17aa1fe +TERMUX_PKG_BREAKS="libyaml-dev" +TERMUX_PKG_REPLACES="libyaml-dev" TERMUX_PKG_SRCURL=https://github.com/yaml/libyaml/archive/$TERMUX_PKG_VERSION.tar.gz termux_step_pre_configure() { diff --git a/packages/libzip/build.sh b/packages/libzip/build.sh index 26c31a1eb..4cb1ee822 100644 --- a/packages/libzip/build.sh +++ b/packages/libzip/build.sh @@ -3,7 +3,9 @@ TERMUX_PKG_DESCRIPTION="Library for reading, creating, and modifying zip archive TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=1.5.2 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://libzip.org/download/libzip-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=be694a4abb2ffe5ec02074146757c8b56084dbcebf329123c84b205417435e15 TERMUX_PKG_DEPENDS="libbz2, openssl, zlib" +TERMUX_PKG_BREAKS="libzip-dev" +TERMUX_PKG_REPLACES="libzip-dev" diff --git a/packages/libzmq/build.sh b/packages/libzmq/build.sh index e7b48696c..7ff194c8b 100644 --- a/packages/libzmq/build.sh +++ b/packages/libzmq/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://zeromq.org/ TERMUX_PKG_DESCRIPTION="Fast messaging system built on sockets. C and C++ bindings. aka 0MQ, ZMQ." TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=4.3.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=ebd7b5c830d6428956b67a0454a7f8cbed1de74b3b01e5c33c5378e22740f763 TERMUX_PKG_SRCURL=https://github.com/zeromq/libzmq/releases/download/v${TERMUX_PKG_VERSION}/zeromq-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libc++, libsodium" +TERMUX_PKG_BREAKS="libzmq-dev" +TERMUX_PKG_REPLACES="libzmq-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-libsodium --disable-libunwind --disable-Werror" termux_step_post_extract_package() { diff --git a/packages/libzopfli/build.sh b/packages/libzopfli/build.sh index 8422abb6c..6371b6ffd 100644 --- a/packages/libzopfli/build.sh +++ b/packages/libzopfli/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://github.com/google/zopfli TERMUX_PKG_DESCRIPTION="New zlib compatible compressor library" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=1.0.2 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://github.com/google/zopfli/archive/zopfli-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=4a570307c37172d894ec4ef93b6e8e3aacc401e78cbcc51cf85b212dbc379a55 TERMUX_PKG_DEPENDS="libc++" +TERMUX_PKG_BREAKS="libzopfli-dev" +TERMUX_PKG_REPLACES="libzopfli-dev" TERMUX_PKG_BUILD_IN_SRC=yes termux_step_post_make_install() { diff --git a/packages/littlecms/build.sh b/packages/littlecms/build.sh index 4c60cc17c..342a8e720 100644 --- a/packages/littlecms/build.sh +++ b/packages/littlecms/build.sh @@ -2,6 +2,8 @@ TERMUX_PKG_HOMEPAGE=http://www.littlecms.com/ TERMUX_PKG_DESCRIPTION="Color management library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=2.9 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20 +TERMUX_PKG_BREAKS="littlecms-dev" +TERMUX_PKG_REPLACES="littlecms-dev" TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/lcms/lcms/${TERMUX_PKG_VERSION}/lcms2-${TERMUX_PKG_VERSION}.tar.gz diff --git a/packages/lldb/build.sh b/packages/lldb/build.sh index 1121fe267..a0506c553 100644 --- a/packages/lldb/build.sh +++ b/packages/lldb/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://lldb.llvm.org TERMUX_PKG_DESCRIPTION="LLVM based debugger" TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_VERSION=8.0.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://releases.llvm.org/${TERMUX_PKG_VERSION}/lldb-$TERMUX_PKG_VERSION.src.tar.xz TERMUX_PKG_SHA256=49918b9f09816554a20ac44c5f85a32dc0a7a00759b3259e78064d674eac0373 TERMUX_PKG_DEPENDS="libc++, libedit, libllvm, libxml2, ncurses-ui-libs" +TERMUX_PKG_BREAKS="lldb-dev" +TERMUX_PKG_REPLACES="lldb-dev" TERMUX_PKG_HAS_DEBUG=no TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DLLDB_DISABLE_CURSES=0 diff --git a/packages/luarocks/build.sh b/packages/luarocks/build.sh index dce8c7fb8..02d802a44 100644 --- a/packages/luarocks/build.sh +++ b/packages/luarocks/build.sh @@ -2,10 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://luarocks.org/ TERMUX_PKG_DESCRIPTION="Deployment and management system for Lua modules" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=3.1.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://luarocks.org/releases/luarocks-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=c573435f495aac159e34eaa0a3847172a2298eb6295fcdc35d565f9f9b990513 TERMUX_PKG_DEPENDS="curl, lua" -TERMUX_PKG_BUILD_DEPENDS="liblua-dev" +TERMUX_PKG_BUILD_DEPENDS="liblua" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_PLATFORM_INDEPENDENT=yes TERMUX_PKG_EXTRA_MAKE_ARGS="LUA=/usr/bin/lua5.3" @@ -17,6 +18,6 @@ termux_step_configure() { --lua-version=5.3 } termux_step_post_massage() { - sed -i "1 s|$|lua|" bin/luarocks + sed -i "1 s|$|lua|" bin/luarocks sed -i "1 s|$|lua|" bin/luarocks-admin } diff --git a/packages/make/build.sh b/packages/make/build.sh index efbb3e743..8093c50f4 100644 --- a/packages/make/build.sh +++ b/packages/make/build.sh @@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/make/ TERMUX_PKG_DESCRIPTION="Tool to control the generation of non-source files from source files" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=4.2.1 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7 +TERMUX_PKG_BREAKS="make-dev" +TERMUX_PKG_REPLACES="make-dev" TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/make/make-${TERMUX_PKG_VERSION}.tar.gz # Prevent linking against libelf: TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_lib_elf_elf_begin=no" diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh index 03a27febd..f97294f3c 100644 --- a/packages/mariadb/build.sh +++ b/packages/mariadb/build.sh @@ -3,9 +3,12 @@ TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" TERMUX_PKG_VERSION=10.4.6 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://ftp.osuosl.org/pub/mariadb/mariadb-$TERMUX_PKG_VERSION/source/mariadb-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=a270fe6169a1aaf6f2cbbc945de2c954d818c48e1a0fc02fbed92ecb94678e70 TERMUX_PKG_DEPENDS="libc++, libiconv, liblzma, ncurses, libedit, openssl, pcre, libcrypt, libandroid-support, libandroid-glob, zlib" +TERMUX_PKG_BREAKS="mariadb-dev" +TERMUX_PKG_REPLACES="mariadb-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DBISON_EXECUTABLE=$(which bison) diff --git a/packages/mbedtls/build.sh b/packages/mbedtls/build.sh index 1c88eb0e1..499f102d3 100644 --- a/packages/mbedtls/build.sh +++ b/packages/mbedtls/build.sh @@ -3,7 +3,10 @@ TERMUX_PKG_DESCRIPTION="Light-weight cryptographic and SSL/TLS library" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Andy Li @andyli" TERMUX_PKG_VERSION=2.17.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=321a2c0220d9f75703e929c01dabba7b77da4cf2e39944897fc41d888bb1ef0d +TERMUX_PKG_BREAKS="mbedtls-dev" +TERMUX_PKG_REPLACES="mbedtls-dev" TERMUX_PKG_SRCURL=https://github.com/ARMmbed/mbedtls/archive/mbedtls-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DUSE_STATIC_MBEDTLS_LIBRARY=OFF diff --git a/packages/memcached/build.sh b/packages/memcached/build.sh index 26ac37c88..3e13c706c 100644 --- a/packages/memcached/build.sh +++ b/packages/memcached/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://memcached.org/ TERMUX_PKG_DESCRIPTION="Free & open source, high-performance, distributed memory object caching system" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.5.16 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.memcached.org/files/memcached-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=45a22c890dc1edb27db567fb4c9c25b91bfd578477c08c5fb10dca93cc62cc5a TERMUX_PKG_DEPENDS="libevent, libsasl" +TERMUX_PKG_BREAKS="memcached-dev" +TERMUX_PKG_REPLACES="memcached-dev" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-sasl --disable-coverage" diff --git a/packages/ncurses/build.sh b/packages/ncurses/build.sh index 47c3a5c04..430ebffed 100644 --- a/packages/ncurses/build.sh +++ b/packages/ncurses/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=(6.1.20190511 9.22 15) -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SHA256=(fdbd39234fc7e7f8e5fd08d2329014e085fa5c8d0a9cc9a919e94bbc9d411c0e e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd 3ae9ebef28aad081c6c11351f086776e2fd9547563b2f900732b41c376bec05a) @@ -12,11 +12,10 @@ TERMUX_PKG_SRCURL=(https://dl.bintray.com/termux/upstream/ncurses-${TERMUX_PKG_V https://fossies.org/linux/misc/rxvt-unicode-${TERMUX_PKG_VERSION[1]}.tar.bz2 https://github.com/thestinger/termite/archive/v${TERMUX_PKG_VERSION[2]}.tar.gz) -# tset/reset/clear are moved to package 'ncurses'. -TERMUX_PKG_BREAKS="ncurses-utils (<< 6.1.20190511-4)" -TERMUX_PKG_REPLACES="ncurses-utils (<< 6.1.20190511-4)" +# ncurses-utils: tset/reset/clear are moved to package 'ncurses'. +TERMUX_PKG_BREAKS="ncurses-dev, ncurses-utils (<< 6.1.20190511-4)" +TERMUX_PKG_REPLACES="ncurses-dev, ncurses-utils (<< 6.1.20190511-4)" -# --without-normal disables static libraries: # --disable-stripping to disable -s argument to install which does not work when cross compiling: TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_header_locale_h=no @@ -32,16 +31,13 @@ ac_cv_header_locale_h=no --without-ada --without-cxx-binding --without-debug ---without-normal ---without-static --without-tests +--with-normal +--with-static --with-shared --with-termpath=$TERMUX_PREFIX/etc/termcap:$TERMUX_PREFIX/share/misc/termcap " -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE=" -share/man/man1/ncursesw6-config.1* -bin/ncursesw6-config -" + TERMUX_PKG_RM_AFTER_INSTALL=" share/man/man5 share/man/man7 @@ -59,15 +55,19 @@ termux_step_post_make_install() { for file in lib${lib}w.so*; do ln -s $file ${file/w./.} done + for file in lib${lib}w.a; do + ln -s $file ${file/w./.} + done (cd pkgconfig; ln -sf ${lib}w.pc $lib.pc) done # Compatibility symlinks (libcurses, libtic, libtinfo) for lib in curses tic tinfo; do - rm -f lib${lib}.so* + rm -f lib${lib}.so* lib${lib}.a ln -sfr libncursesw.so.${TERMUX_PKG_VERSION:0:3} lib${lib}.so.${TERMUX_PKG_VERSION:0:3} ln -sfr libncursesw.so.${TERMUX_PKG_VERSION:0:3} lib${lib}.so.${TERMUX_PKG_VERSION:0:1} ln -sfr libncursesw.so.${TERMUX_PKG_VERSION:0:3} lib${lib}.so + ln -sfr libncursesw.a lib${lib}.a (cd pkgconfig; ln -sfr ncursesw.pc ${lib}.pc) done diff --git a/packages/ncurses/ncurses-ui-libs-static.subpackage.sh b/packages/ncurses/ncurses-ui-libs-static.subpackage.sh new file mode 100644 index 000000000..29fcda135 --- /dev/null +++ b/packages/ncurses/ncurses-ui-libs-static.subpackage.sh @@ -0,0 +1,2 @@ +TERMUX_SUBPKG_INCLUDE="lib/libform*.a lib/libmenu*.a lib/libpanel*.a" +TERMUX_SUBPKG_DESCRIPTION="Static libraries for terminal user interfaces based on ncurses" diff --git a/packages/ncurses/ncurses-ui-libs.subpackage.sh b/packages/ncurses/ncurses-ui-libs.subpackage.sh index 29520c700..6cf1ffa0b 100644 --- a/packages/ncurses/ncurses-ui-libs.subpackage.sh +++ b/packages/ncurses/ncurses-ui-libs.subpackage.sh @@ -1,2 +1,2 @@ -TERMUX_SUBPKG_INCLUDE="lib/libform* lib/libmenu* lib/libpanel*" +TERMUX_SUBPKG_INCLUDE="lib/libform*.so* lib/libmenu*.so* lib/libpanel*.so*" TERMUX_SUBPKG_DESCRIPTION="Libraries for terminal user interfaces based on ncurses" diff --git a/packages/ndk-multilib/build.sh b/packages/ndk-multilib/build.sh index 0d8d31033..a07bcc130 100644 --- a/packages/ndk-multilib/build.sh +++ b/packages/ndk-multilib/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html TERMUX_PKG_DESCRIPTION="Multilib binaries for cross-compilation" TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION -TERMUX_PKG_REVISION=0 -TERMUX_PKG_NO_DEVELSPLIT=yes -TERMUX_PKG_KEEP_STATIC_LIBRARIES="true" +TERMUX_PKG_REVISION=1 TERMUX_PKG_PLATFORM_INDEPENDENT=true +TERMUX_PKG_NO_STATICSPLIT=yes prepare_libs() { local ARCH="$1" diff --git a/packages/ndk-sysroot/build.sh b/packages/ndk-sysroot/build.sh index db5c772a6..1de99599f 100644 --- a/packages/ndk-sysroot/build.sh +++ b/packages/ndk-sysroot/build.sh @@ -2,13 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://developer.android.com/tools/sdk/ndk/index.html TERMUX_PKG_DESCRIPTION="System header and library files from the Android NDK needed for compiling C programs" TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION -TERMUX_PKG_REVISION=0 -TERMUX_PKG_NO_DEVELSPLIT=yes -TERMUX_PKG_KEEP_STATIC_LIBRARIES="true" +TERMUX_PKG_REVISION=1 # This package has taken over from the previous libutil-dev # and iconv.h from libandroid-support-dev: TERMUX_PKG_CONFLICTS="libutil-dev, libgcc, libandroid-support-dev" TERMUX_PKG_REPLACES="libutil-dev, libgcc, libandroid-support-dev, ndk-stl" +TERMUX_PKG_NO_STATICSPLIT=yes termux_step_extract_into_massagedir() { mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib \ @@ -41,7 +40,7 @@ termux_step_extract_into_massagedir() { if [ $TERMUX_ARCH = "arm" ]; then rm thumb -rf cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/libunwind.a . - fi + fi ln -f -s $_SYSTEM_LIBDIR/libc.so librt.so ln -f -s $_SYSTEM_LIBDIR/libc.so libpthread.so } diff --git a/packages/netpbm/build.sh b/packages/netpbm/build.sh index 3d119cd2f..42e8964e1 100644 --- a/packages/netpbm/build.sh +++ b/packages/netpbm/build.sh @@ -6,10 +6,12 @@ TERMUX_PKG_LICENSE="LGPL-2.0" # Only Super Stable is distributed as a tar ball, but is outdated and does not compile with modern libpng. # So use revisions from http://svn.code.sf.net/p/netpbm/code/advanced for packages. TERMUX_PKG_VERSION=3094 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=2f4d8c245f174e391a4cf2418075c06532aee8a5fcc8dbbb8f2e7012cd9d52a4 TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/netpbm-advanced-r${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libpng, libxml2, libjpeg-turbo, libtiff, zlib" +TERMUX_PKG_BREAKS="netpbm-dev" +TERMUX_PKG_REPLACES="netpbm-dev" TERMUX_PKG_BUILD_IN_SRC=yes termux_step_configure() { diff --git a/packages/nodejs-lts/build.sh b/packages/nodejs-lts/build.sh index 99d4e583f..a9c3a718e 100644 --- a/packages/nodejs-lts/build.sh +++ b/packages/nodejs-lts/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://nodejs.org/ TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=10.16.0 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=18e37f891d10ea7fbc8f6410c444c2b1d9cc3cbbb1d35aa9c41f761816956608 # Note that we do not use a shared libuv to avoid an issue with the Android @@ -12,6 +12,8 @@ TERMUX_PKG_DEPENDS="libc++, openssl, c-ares, libicu, zlib" TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make.bat share/systemtap lib/dtrace" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_CONFLICTS="nodejs" +TERMUX_PKG_BREAKS="nodejs-lts-dev" +TERMUX_PKG_REPLACES="nodejs-lts-dev" termux_step_configure() { local DEST_CPU diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh index b4991a1d7..b8fd51a66 100644 --- a/packages/nodejs/build.sh +++ b/packages/nodejs/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://nodejs.org/ TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=12.4.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=20b52366d3502c60d4aec0bd5052c841a94bf1cd5d74b2ea1e498c1a2ada8ce3 # Note that we do not use a shared libuv to avoid an issue with the Android @@ -12,7 +12,8 @@ TERMUX_PKG_DEPENDS="libc++, openssl, c-ares, libicu, zlib" TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make.bat share/systemtap lib/dtrace" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_CONFLICTS="nodejs-lts, nodejs-current" -TERMUX_PKG_REPLACES="nodejs-current" +TERMUX_PKG_BREAKS="nodejs-dev" +TERMUX_PKG_REPLACES="nodejs-current, nodejs-dev" termux_step_configure() { local DEST_CPU diff --git a/packages/notmuch/build.sh b/packages/notmuch/build.sh index 89bf4354c..260513b81 100644 --- a/packages/notmuch/build.sh +++ b/packages/notmuch/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://notmuchmail.org TERMUX_PKG_DESCRIPTION="Thread-based email index, search and tagging system" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=0.29.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=9846fc8e32d415cee41f6644581a4de7b0d2e6bc98e1ba86db918f061fcfe365 TERMUX_PKG_SRCURL=https://notmuchmail.org/releases/notmuch-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_DEPENDS="glib, libc++, libgmime, libtalloc, libxapian, zlib" +TERMUX_PKG_BREAKS="notmuch-dev" +TERMUX_PKG_REPLACES="notmuch-dev" TERMUX_PKG_BUILD_IN_SRC=yes termux_step_configure() { diff --git a/packages/oathtool/build.sh b/packages/oathtool/build.sh index ca1f062e0..6e521637a 100644 --- a/packages/oathtool/build.sh +++ b/packages/oathtool/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://www.nongnu.org/oath-toolkit/ TERMUX_PKG_DESCRIPTION="One-time password components" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=2.6.2 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=http://download.savannah.nongnu.org/releases/oath-toolkit/oath-toolkit-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=b03446fa4b549af5ebe4d35d7aba51163442d255660558cd861ebce536824aa0 TERMUX_PKG_DEPENDS="xmlsec, zlib" +TERMUX_PKG_BREAKS="oathtool-dev" +TERMUX_PKG_REPLACES="oathtool-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-pam" termux_step_pre_configure() { diff --git a/packages/ocrad/build.sh b/packages/ocrad/build.sh index 83b0b31df..6a5065e52 100644 --- a/packages/ocrad/build.sh +++ b/packages/ocrad/build.sh @@ -2,7 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/ocrad/ocrad.html TERMUX_PKG_DESCRIPTION="Optical Character Recognition program based on a feature extraction method" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=0.27 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/ocrad/ocrad-${TERMUX_PKG_VERSION}.tar.lz TERMUX_PKG_SHA256=a9bfe67e9a040907aff5640dca56392476b6a89e48e37dc94ba846c5b6733b36 TERMUX_PKG_DEPENDS="libc++" +TERMUX_PKG_BREAKS="ocrad-dev" +TERMUX_PKG_REPLACES="ocrad-dev" diff --git a/packages/openal-soft/build.sh b/packages/openal-soft/build.sh index 1252bde97..e70ae41ff 100644 --- a/packages/openal-soft/build.sh +++ b/packages/openal-soft/build.sh @@ -2,8 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://openal-soft.org/ TERMUX_PKG_DESCRIPTION="Software implementation of the OpenAL API" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.19.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/kcat/openal-soft/archive/openal-soft-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=9f3536ab2bb7781dbafabc6a61e0b34b17edd16bd6c2eaf2ae71bc63078f98c7 +TERMUX_PKG_BREAKS="openal-soft-dev" +TERMUX_PKG_REPLACES="openal-soft-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF diff --git a/packages/openjpeg/build.sh b/packages/openjpeg/build.sh index 235326854..82aac03c6 100644 --- a/packages/openjpeg/build.sh +++ b/packages/openjpeg/build.sh @@ -2,12 +2,13 @@ TERMUX_PKG_HOMEPAGE=http://www.openjpeg.org/ TERMUX_PKG_DESCRIPTION="JPEG 2000 image compression library" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_VERSION=2.3.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9 +TERMUX_PKG_BREAKS="openjpeg-dev" +TERMUX_PKG_REPLACES="openjpeg-dev" TERMUX_PKG_SRCURL=https://github.com/uclouvain/openjpeg/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_STATIC_LIBS=OFF" # for fast building packages that depend on openjpeg with cmake -TERMUX_PKG_DEVPACKAGE_DEPENDS="openjpeg-tools" termux_step_pre_configure() { # Force symlinks to be overwritten: diff --git a/packages/openssl/build.sh b/packages/openssl/build.sh index c245292eb..a9ed22151 100644 --- a/packages/openssl/build.sh +++ b/packages/openssl/build.sh @@ -3,15 +3,15 @@ TERMUX_PKG_DESCRIPTION="Library implementing the SSL and TLS protocols as well a TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_DEPENDS="ca-certificates" TERMUX_PKG_VERSION=1.1.1c -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90 TERMUX_PKG_SRCURL=https://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION/\~/-}.tar.gz TERMUX_PKG_CONFFILES="etc/tls/openssl.cnf" TERMUX_PKG_RM_AFTER_INSTALL="bin/c_rehash etc/ssl/misc" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_CONFLICTS="libcurl (<< 7.61.0-1)" -TERMUX_PKG_BREAKS="openssl-tool (<< 1.1.1b-1)" -TERMUX_PKG_REPLACES="openssl-tool (<< 1.1.1b-1)" +TERMUX_PKG_BREAKS="openssl-tool (<< 1.1.1b-1), openssl-dev" +TERMUX_PKG_REPLACES="openssl-tool (<< 1.1.1b-1), openssl-dev" termux_step_configure() { CFLAGS+=" -DNO_SYSLOG" diff --git a/packages/opusfile/build.sh b/packages/opusfile/build.sh index 66b89b953..266e09927 100644 --- a/packages/opusfile/build.sh +++ b/packages/opusfile/build.sh @@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.opus-codec.org/ TERMUX_PKG_DESCRIPTION="A high-level API for decoding and seeking within .opus files" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=0.11 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=74ce9b6cf4da103133e7b5c95df810ceb7195471e1162ed57af415fabf5603bf TERMUX_PKG_SRCURL=https://downloads.xiph.org/releases/opus/opusfile-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_DEPENDS="libopus, libogg" -TERMUX_PKG_DEVPACKAGE_DEPENDS="libopus-dev, libogg-dev" +TERMUX_PKG_BREAKS="opusfile-dev" +TERMUX_PKG_REPLACES="opusfile-dev" diff --git a/packages/ossp-uuid/build.sh b/packages/ossp-uuid/build.sh index 28a11bea4..bd2f9730f 100644 --- a/packages/ossp-uuid/build.sh +++ b/packages/ossp-uuid/build.sh @@ -2,8 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://www.ossp.org/pkg/lib/uuid/ TERMUX_PKG_DESCRIPTION="ISO-C:1999 uuid generator supporting DCE 1.1, ISO/IEC 11578:1996 and RFC 4122." TERMUX_PKG_LICENSE="ISC" TERMUX_PKG_VERSION=1.6.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://www.mirrorservice.org/sites/ftp.ossp.org/pkg/lib/uuid/uuid-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0 +TERMUX_PKG_BREAKS="ossp-uuid-dev" +TERMUX_PKG_REPLACES="ossp-uuid-dev" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--includedir=$TERMUX_PREFIX/include/ossp-uuid" diff --git a/packages/pango/build.sh b/packages/pango/build.sh index 64f37ae7e..c4d9f534f 100644 --- a/packages/pango/build.sh +++ b/packages/pango/build.sh @@ -2,11 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.pango.org/ TERMUX_PKG_DESCRIPTION="Library for laying out and rendering text" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.42.4 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/GNOME/sources/pango/${TERMUX_PKG_VERSION:0:4}/pango-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d TERMUX_PKG_DEPENDS="fontconfig, fribidi, glib, harfbuzz, libcairo, libffi" -TERMUX_PKG_DEVPACKAGE_DEPENDS="libcairo-dev, libpixman-dev, fontconfig-dev, harfbuzz-dev" +TERMUX_PKG_BREAKS="pango-dev" +TERMUX_PKG_REPLACES="pango-dev" termux_step_post_make_install() { install -Dm600 $TERMUX_PKG_BUILDER_DIR/pango-view.1 \ diff --git a/packages/parted/build.sh b/packages/parted/build.sh index 863e214ce..01db7a59e 100644 --- a/packages/parted/build.sh +++ b/packages/parted/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/parted/ TERMUX_PKG_DESCRIPTION="Versatile partition editor" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=3.2 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/parted/parted-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 TERMUX_PKG_DEPENDS="libiconv, libuuid, readline" +TERMUX_PKG_BREAKS="parted-dev" +TERMUX_PKG_REPLACES="parted-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-device-mapper " diff --git a/packages/pcre/build.sh b/packages/pcre/build.sh index 7bb5a9033..e90a9b63a 100644 --- a/packages/pcre/build.sh +++ b/packages/pcre/build.sh @@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.pcre.org TERMUX_PKG_DESCRIPTION="Library implementing regular expression pattern matching using the same syntax and semantics as Perl 5" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=8.43 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://ftp.pcre.org/pub/pcre/pcre-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/pcre-config" +TERMUX_PKG_BREAKS="pcre-dev" +TERMUX_PKG_REPLACES="pcre-dev" TERMUX_PKG_RM_AFTER_INSTALL="bin/pcregrep bin/pcretest share/man/man1/pcre*.1" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-cpp --enable-jit --enable-utf8 --enable-unicode-properties" diff --git a/packages/pcre2/build.sh b/packages/pcre2/build.sh index 438bd454a..c6d9794c4 100644 --- a/packages/pcre2/build.sh +++ b/packages/pcre2/build.sh @@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://www.pcre.org TERMUX_PKG_DESCRIPTION="Perl 5 compatible regular expression library" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=10.33 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=35514dff0ccdf02b55bd2e9fa586a1b9d01f62332c3356e379eabb75f789d8aa +TERMUX_PKG_BREAKS="pcre2-dev" +TERMUX_PKG_REPLACES="pcre2-dev" TERMUX_PKG_SRCURL=https://ftp.pcre.org/pub/pcre/pcre2-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/pcre2-config" TERMUX_PKG_RM_AFTER_INSTALL=" bin/pcre2grep bin/pcre2test diff --git a/packages/perl/build.sh b/packages/perl/build.sh index ba73bcfe3..c9ad9e2f3 100644 --- a/packages/perl/build.sh +++ b/packages/perl/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Capable, feature-rich programming language" TERMUX_PKG_LICENSE="Artistic-License-2.0" TERMUX_PKG_VERSION=(5.30.0 1.3) +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=(851213c754d98ccff042caa40ba7a796b2cee88c5325f121be5cbb61bbf975f2 49edea1ea2cd6c5c47386ca71beda8d150c748835781354dbe7f75b1df27e703) TERMUX_PKG_SRCURL=(http://www.cpan.org/src/5.0/perl-${TERMUX_PKG_VERSION}.tar.gz @@ -10,7 +11,6 @@ TERMUX_PKG_SRCURL=(http://www.cpan.org/src/5.0/perl-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC="yes" TERMUX_MAKE_PROCESSES=1 TERMUX_PKG_RM_AFTER_INSTALL="bin/perl${TERMUX_PKG_VERSION}" -TERMUX_PKG_NO_DEVELSPLIT=yes termux_step_post_extract_package() { # This port uses perl-cross: http://arsv.github.io/perl-cross/ diff --git a/packages/php/build.sh b/packages/php/build.sh index d10b871ef..a3f1827a0 100644 --- a/packages/php/build.sh +++ b/packages/php/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://php.net TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language" TERMUX_PKG_LICENSE="PHP-3.0" TERMUX_PKG_VERSION=7.3.7 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://secure.php.net/distributions/php-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=ba067200ba649956b3a92ec8b71a6ed8ce8a099921212443c1bcf3260a29274c # Build native php for phar to build (see pear-Makefile.frag.patch): @@ -11,8 +11,8 @@ TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="--disable-libxml --disable-dom --disable-simplexml --disable-xml --disable-xmlreader --disable-xmlwriter --without-pear" TERMUX_PKG_DEPENDS="libiconv, libandroid-glob, libxml2, liblzma, openssl, pcre2, libbz2, libcrypt, libcurl, libgd, readline, freetype, libandroid-support, zlib" # mysql modules were initially shared libs -TERMUX_PKG_CONFLICTS="php-mysql" -TERMUX_PKG_REPLACES="php-mysql" +TERMUX_PKG_CONFLICTS="php-mysql, php-dev" +TERMUX_PKG_REPLACES="php-mysql, php-dev" TERMUX_PKG_RM_AFTER_INSTALL="php/php/fpm" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/poppler/build.sh b/packages/poppler/build.sh index a6954e107..74ece5682 100644 --- a/packages/poppler/build.sh +++ b/packages/poppler/build.sh @@ -2,11 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://poppler.freedesktop.org/ TERMUX_PKG_DESCRIPTION="PDF rendering library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=0.79.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://poppler.freedesktop.org/poppler-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=f985a4608fe592d2546d9d37d4182e502ff6b4c42f8db4be0a021a1c369528c8 # libcairo and littlecms is used by pdftocairo: TERMUX_PKG_DEPENDS="libc++, libiconv, fontconfig, glib, libcairo, libpng, libjpeg-turbo, libtiff, littlecms, openjpeg, freetype, libcurl" +TERMUX_PKG_BREAKS="poppler-dev" +TERMUX_PKG_REPLACES="poppler-dev" #texlive needs the xpdf headers TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DENABLE_GLIB=ON diff --git a/packages/postgresql/build.sh b/packages/postgresql/build.sh index 0095b457e..a102c3edf 100644 --- a/packages/postgresql/build.sh +++ b/packages/postgresql/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Object-relational SQL database" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER='Vishal Biswas @vishalbiswas' TERMUX_PKG_VERSION=11.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=02802ddffd1590805beddd1e464dd28a46a41a5f1e1df04bab4f46663195cc8b TERMUX_PKG_SRCURL=https://ftp.postgresql.org/pub/source/v$TERMUX_PKG_VERSION/postgresql-$TERMUX_PKG_VERSION.tar.bz2 TERMUX_PKG_DEPENDS="openssl, libcrypt, readline, libandroid-shmem, libuuid, libxml2, libicu, zlib" @@ -26,8 +27,8 @@ ZIC=$TERMUX_PKG_HOSTBUILD_DIR/src/timezone/zic TERMUX_PKG_EXTRA_MAKE_ARGS=" -s" TERMUX_PKG_RM_AFTER_INSTALL="lib/libecpg* bin/ecpg share/man/man1/ecpg.1" TERMUX_PKG_HOSTBUILD=yes -TERMUX_PKG_BREAKS="postgresql-contrib (<= 10.3-1)" -TERMUX_PKG_REPLACES="postgresql-contrib (<= 10.3-1)" +TERMUX_PKG_BREAKS="postgresql-contrib (<= 10.3-1), postgresql-dev" +TERMUX_PKG_REPLACES="postgresql-contrib (<= 10.3-1), postgresql-dev" termux_step_host_build() { # Build a native zic binary which we have patched to diff --git a/packages/procps/build.sh b/packages/procps/build.sh index c29a4cf16..34be5c37b 100644 --- a/packages/procps/build.sh +++ b/packages/procps/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://gitlab.com/procps-ng/procps TERMUX_PKG_DESCRIPTION="Utilities that give information about processes using the /proc filesystem" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=3.3.15 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/procps-ng-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465 TERMUX_PKG_DEPENDS="ncurses" +TERMUX_PKG_BREAKS="procps-dev" +TERMUX_PKG_REPLACES="procps-dev" TERMUX_PKG_BUILD_IN_SRC=yes # error.h and stdio_ext.h in unified headers does diff --git a/packages/profanity/build.sh b/packages/profanity/build.sh index fa26b310f..d6404e280 100644 --- a/packages/profanity/build.sh +++ b/packages/profanity/build.sh @@ -3,12 +3,14 @@ TERMUX_PKG_DESCRIPTION="Profanity is a console based XMPP client written in C us TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli" TERMUX_PKG_VERSION=0.6.0 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=http://profanity.im/profanity-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=f1b2773b79eb294297686f3913e9489c20effae5e3a335c8956db18f6ee2f660 TERMUX_PKG_DEPENDS="libandroid-support, libffi, ncurses, glib, libmesode, libcurl, readline, libuuid, libotr, gpgme, python, libassuan, libgpg-error, zlib" +TERMUX_PKG_BREAKS="profanity-dev" +TERMUX_PKG_REPLACES="profanity-dev" # openssl, libexpat needed by libmesode, pcre needed by glib: -TERMUX_PKG_BUILD_DEPENDS="openssl, libexpat, pcre, libgcrypt-dev, libcrypt-dev" +TERMUX_PKG_BUILD_DEPENDS="openssl, libexpat, pcre, libgcrypt, libcrypt" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-python-plugins" TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/python/build.sh b/packages/python/build.sh index 2decdaceb..a75475216 100644 --- a/packages/python/build.sh +++ b/packages/python/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Python 3 programming language intended to enable clear p TERMUX_PKG_LICENSE="PythonPL" TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libbz2, libsqlite, gdbm, ncurses-ui-libs, libcrypt, liblzma, zlib" # Python.h includes crypt.h: -TERMUX_PKG_DEVPACKAGE_DEPENDS="libcrypt-dev" _MAJOR_VERSION=3.7 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=fb799134b868199930b75f26678f18932214042639cd52b16da7fd134cd9b13f TERMUX_PKG_SRCURL=https://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz @@ -39,7 +39,8 @@ lib/python${_MAJOR_VERSION}/test lib/python${_MAJOR_VERSION}/*/test lib/python${_MAJOR_VERSION}/*/tests " -TERMUX_PKG_BREAKS="python2 (<= 2.7.15)" +TERMUX_PKG_BREAKS="python2 (<= 2.7.15), python-dev" +TERMUX_PKG_REPLACES="python-dev" termux_step_pre_configure() { # Needed when building with clang, as setup.py only probes diff --git a/packages/python2/build.sh b/packages/python2/build.sh index e0df8e9f0..e1ef4396c 100644 --- a/packages/python2/build.sh +++ b/packages/python2/build.sh @@ -6,13 +6,14 @@ TERMUX_PKG_LICENSE="PythonPL" # libbz2 for the bz2 module. # ncurses-ui-libs for the curses.panel module. TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libbz2, libsqlite, gdbm, ncurses-ui-libs, libcrypt, zlib" +TERMUX_PKG_BREAKS="python2-dev" +TERMUX_PKG_REPLACES="python2-dev" # Python.h includes crypt.h: -TERMUX_PKG_DEVPACKAGE_DEPENDS="libcrypt-dev" TERMUX_PKG_HOSTBUILD=true _MAJOR_VERSION=2.7 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.16 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SHA256=f222ef602647eecb6853681156d32de4450a2c39f4de93bd5b20235f2e660ed7 TERMUX_PKG_SRCURL=https://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz diff --git a/packages/qalc/build.sh b/packages/qalc/build.sh index 310e84d7e..24cef61c6 100644 --- a/packages/qalc/build.sh +++ b/packages/qalc/build.sh @@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://qalculate.github.io/ TERMUX_PKG_DESCRIPTION="Powerful and easy to use command line calculator" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.8.1 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_REVISION=7 TERMUX_PKG_SRCURL=https://github.com/Qalculate/libqalculate/releases/download/v$TERMUX_PKG_VERSION/libqalculate-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=a901be570bbfad80f1fccb1839ef2d03f6f2b7a02b051df35d5b687a08396105 TERMUX_PKG_DEPENDS="libc++, libiconv, libcurl, libmpfr, libxml2, readline, libgmp, zlib" +TERMUX_PKG_BREAKS="qalc-dev" +TERMUX_PKG_REPLACES="qalc-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-icu" diff --git a/packages/qpdf/build.sh b/packages/qpdf/build.sh index 05dc5998f..0d5374769 100644 --- a/packages/qpdf/build.sh +++ b/packages/qpdf/build.sh @@ -3,10 +3,12 @@ TERMUX_PKG_DESCRIPTION="Content-Preserving PDF Transformation System" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" TERMUX_PKG_VERSION=8.4.2 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/qpdf/qpdf/archive/release-qpdf-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=741a171295e561eadf0285ae6b0b821632f9773b8db0daa95df4dc565bf566bb TERMUX_PKG_DEPENDS="libc++, libjpeg-turbo, zlib" +TERMUX_PKG_BREAKS="qpdf-dev" +TERMUX_PKG_REPLACES="qpdf-dev" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-random=/dev/urandom" diff --git a/packages/radare2/build.sh b/packages/radare2/build.sh index 42acb79d9..f1c616b9a 100644 --- a/packages/radare2/build.sh +++ b/packages/radare2/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://rada.re TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=3.6.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=a763d3812a4cec74fd39d67a2559a4e0073e9e8d1d55481e5feb3f00bbe19b02 TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="libuv" +TERMUX_PKG_BREAKS="radare2-dev" +TERMUX_PKG_REPLACES="radare2-dev" TERMUX_PKG_BUILD_IN_SRC="yes" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-compiler=termux-host" diff --git a/packages/readline/build.sh b/packages/readline/build.sh index 22cb99518..3a72bdfd7 100644 --- a/packages/readline/build.sh +++ b/packages/readline/build.sh @@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html" TERMUX_PKG_DESCRIPTION="Library that allow users to edit command lines as they are typed in" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_DEPENDS="libandroid-support, ncurses" -TERMUX_PKG_BREAKS="bash (<< 5.0)" +TERMUX_PKG_BREAKS="bash (<< 5.0), readline-dev" +TERMUX_PKG_REPLACES="readline-dev" TERMUX_PKG_VERSION="8.0" -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/readline/readline-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-curses --enable-multibyte bash_cv_wcwidth_broken=no" diff --git a/packages/rhash/build.sh b/packages/rhash/build.sh index ddd4cb5ae..029a83f40 100644 --- a/packages/rhash/build.sh +++ b/packages/rhash/build.sh @@ -2,14 +2,17 @@ TERMUX_PKG_HOMEPAGE=https://github.com/rhash/RHash TERMUX_PKG_DESCRIPTION="Console utility for calculation and verification of magnet links and a wide range of hash sums" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=1.3.8 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=be536a56acfefc87dbc8b1db30fc639020e41edf05518185ea98630e3df7c04c +TERMUX_PKG_BREAKS="rhash-dev" +TERMUX_PKG_REPLACES="rhash-dev" TERMUX_PKG_SRCURL=https://github.com/rhash/RHash/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="openssl" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" -TERMUX_PKG_CONFLICTS=librhash -TERMUX_PKG_REPLACES=librhash +TERMUX_PKG_CONFLICTS="librhash, rhash-dev" +TERMUX_PKG_REPLACES="librhash, rhash-dev" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-static --enable-lib-static --enable-lib-shared" termux_step_make() { CFLAGS="-DOPENSSL_RUNTIME $CPPFLAGS $CFLAGS" diff --git a/packages/rtmpdump/build.sh b/packages/rtmpdump/build.sh index 435c16260..5f001c62c 100644 --- a/packages/rtmpdump/build.sh +++ b/packages/rtmpdump/build.sh @@ -4,9 +4,11 @@ TERMUX_PKG_LICENSE="LGPL-2.1" # NOTE: Special handling of unofficial support for openssl 1.1 from # https://gitlab.com/JudgeZarbi/RTMPDump-OpenSSL-1.1 TERMUX_PKG_VERSION=2.4 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://gitlab.com/JudgeZarbi/RTMPDump-OpenSSL-1.1/-/archive/019592918b0f961104eaf71b56c1db0fa26ed497/RTMPDump-OpenSSL-1.1-019592918b0f961104eaf71b56c1db0fa26ed497.tar.bz2 TERMUX_PKG_SHA256=42978d5b1cfe9fe4e01305f81c183935056a6c1ad46b9cd2e582f9147196fa87 TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_DEPENDS="openssl, zlib" +TERMUX_PKG_BREAKS="rtmpdump-dev" +TERMUX_PKG_REPLACES="rtmpdump-dev" TERMUX_PKG_MAINTAINER="Pierre Rudloff @Rudloff" diff --git a/packages/ruby/build.sh b/packages/ruby/build.sh index d46259cf5..b29cd8c8e 100644 --- a/packages/ruby/build.sh +++ b/packages/ruby/build.sh @@ -3,11 +3,13 @@ TERMUX_PKG_DESCRIPTION="Dynamic programming language with a focus on simplicity TERMUX_PKG_LICENSE="BSD 2-Clause" _MAJOR_VERSION=2.6 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SHA256=11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc2b54171e1 TERMUX_PKG_SRCURL=https://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="libandroid-support, libffi, libgmp, readline, openssl, libyaml, zlib" +TERMUX_PKG_BREAKS="ruby-dev" +TERMUX_PKG_REPLACES="ruby-dev" # Needed to fix compilation on android: TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_setgroups=no ac_cv_func_setresuid=no ac_cv_func_setreuid=no --enable-rubygems" # The gdbm module seems to be very little used: diff --git a/packages/serf/build.sh b/packages/serf/build.sh index 554d919c1..883be5fd9 100644 --- a/packages/serf/build.sh +++ b/packages/serf/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://serf.apache.org/ TERMUX_PKG_DESCRIPTION="High performance C-based HTTP client library" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=1.3.9 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://archive.apache.org/dist/serf/serf-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc TERMUX_PKG_DEPENDS="apr, apr-util, openssl, libuuid, libexpat, zlib" +TERMUX_PKG_BREAKS="serf-dev" +TERMUX_PKG_REPLACES="serf-dev" TERMUX_PKG_BUILD_IN_SRC=yes termux_step_make_install() { diff --git a/packages/sox/build.sh b/packages/sox/build.sh index c07ab6ad7..c840a4e42 100644 --- a/packages/sox/build.sh +++ b/packages/sox/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://sox.sourceforge.net/ TERMUX_PKG_DESCRIPTION="Command line utility for converting between and applying effects to various audio files formats" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_VERSION=14.4.2 -TERMUX_PKG_REVISION=12 +TERMUX_PKG_REVISION=13 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/sox/sox/${TERMUX_PKG_VERSION}/sox-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=81a6956d4330e75b5827316e44ae381e6f1e8928003c6aa45896da9041ea149c TERMUX_PKG_DEPENDS="file, libpng, libmp3lame, libvorbis, libandroid-glob, libflac, libid3tag, libmad, libpulseaudio, opusfile, libsndfile, zlib" +TERMUX_PKG_BREAKS="sox-dev" +TERMUX_PKG_REPLACES="sox-dev" termux_step_pre_configure() { LDFLAGS+=" -landroid-glob" diff --git a/packages/speexdsp/build.sh b/packages/speexdsp/build.sh index 0c3b355a6..cd79e2d75 100644 --- a/packages/speexdsp/build.sh +++ b/packages/speexdsp/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://speex.org/ TERMUX_PKG_DESCRIPTION="Speex audio processing library" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=1.2.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://downloads.xiph.org/releases/speex/speexdsp-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=682042fc6f9bee6294ec453f470dadc26c6ff29b9c9e9ad2ffc1f4312fd64771 +TERMUX_PKG_BREAKS="speexdsp-dev" +TERMUX_PKG_REPLACES="speexdsp-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-neon" TERMUX_PKG_RM_AFTER_INSTALL="share/doc/speexdsp/manual.pdf" diff --git a/packages/stfl/build.sh b/packages/stfl/build.sh index f5e89b3bf..bfafd8f90 100644 --- a/packages/stfl/build.sh +++ b/packages/stfl/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://www.clifford.at/stfl TERMUX_PKG_DESCRIPTION="Structured Terminal Forms Language/Library" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=0.24 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=http://www.clifford.at/stfl/stfl-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=d4a7aa181a475aaf8a8914a8ccb2a7ff28919d4c8c0f8a061e17a0c36869c090 TERMUX_PKG_DEPENDS="libandroid-support, libiconv, ncurses" +TERMUX_PKG_BREAKS="stfl-dev" +TERMUX_PKG_REPLACES="stfl-dev" TERMUX_PKG_BUILD_IN_SRC=yes termux_step_configure() { diff --git a/packages/subversion/build.sh b/packages/subversion/build.sh index 13ec0f6b3..3be003237 100644 --- a/packages/subversion/build.sh +++ b/packages/subversion/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://subversion.apache.org TERMUX_PKG_DESCRIPTION="Centralized version control system characterized by its simplicity" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=1.12.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=7fae7c73d8a007c107c0ae5eb372bc0bb013dbfe966fcd5c59cd5a195a5e2edf TERMUX_PKG_SRCURL=https://www.apache.org/dist/subversion/subversion-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_DEPENDS="apr, apr-util, serf, libexpat, libsqlite, liblz4, utf8proc, zlib" +TERMUX_PKG_BREAKS="subversion-dev" +TERMUX_PKG_REPLACES="subversion-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" svn_cv_pycfmt_apr_int64_t=UNUSED_REMOVE_AFTER_NEXT_UPDATE --without-sasl diff --git a/packages/tcl/build.sh b/packages/tcl/build.sh index 2c629474d..7f6e87ec8 100644 --- a/packages/tcl/build.sh +++ b/packages/tcl/build.sh @@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.tcl.tk/ TERMUX_PKG_DESCRIPTION="Powerful but easy to learn dynamic programming language" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_DEPENDS="libsqlite, zlib" +TERMUX_PKG_BREAKS="tcl-dev" +TERMUX_PKG_REPLACES="tcl-dev" TERMUX_PKG_VERSION=8.6.9 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SHA256=ad0cd2de2c87b9ba8086b43957a0de3eb2eb565c7159d5f53ccbba3feb915f4e TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/tcl/Tcl/${TERMUX_PKG_VERSION}/tcl${TERMUX_PKG_VERSION}-src.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" @@ -19,8 +21,6 @@ tcl_cv_strtoul_unbroken=ok --enable-man-symlinks --mandir=$TERMUX_PREFIX/share/man " -TERMUX_PKG_KEEP_STATIC_LIBRARIES=yes -TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="lib/*.a lib/itcl*/*.a lib/tdbc*/libtdbcstub*.a" termux_step_pre_configure() { TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/unix diff --git a/packages/teckit/build.sh b/packages/teckit/build.sh index 8cad7641d..da42a608e 100644 --- a/packages/teckit/build.sh +++ b/packages/teckit/build.sh @@ -3,10 +3,12 @@ TERMUX_PKG_DESCRIPTION="TECkit is a library for encoding conversion" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" TERMUX_PKG_VERSION=2.5.9 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/silnrsi/teckit/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=9c9f77ed40e2fcfbbb82e88b78fee2233c58e2ecfd3f3201bfa4b13ea6b5c970 TERMUX_PKG_DEPENDS="libc++, zlib" +TERMUX_PKG_BREAKS="teckit-dev" +TERMUX_PKG_REPLACES="teckit-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_lib_expat_XML_ExpatVersion=no" termux_step_pre_configure() { diff --git a/packages/telepathy-glib/build.sh b/packages/telepathy-glib/build.sh index 53428e703..c9b976a0c 100644 --- a/packages/telepathy-glib/build.sh +++ b/packages/telepathy-glib/build.sh @@ -3,7 +3,10 @@ TERMUX_PKG_DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="Tristan Ross " TERMUX_PKG_VERSION=0.24.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=9e0df1d8f857e0270cf0b32e2d1ca5a24aa7282873361785d573f72ad7f7d5eb TERMUX_PKG_DEPENDS="dbus-glib" +TERMUX_PKG_BREAKS="telepathy-glib-dev" +TERMUX_PKG_REPLACES="telepathy-glib-dev" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/termux-auth/build.sh b/packages/termux-auth/build.sh index 9fc96a549..0c7f733f4 100644 --- a/packages/termux-auth/build.sh +++ b/packages/termux-auth/build.sh @@ -3,6 +3,9 @@ TERMUX_PKG_DESCRIPTION="Password authentication library and utility for Termux" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=1.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/termux/termux-auth/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=fd6fab1808b1e98dc865c47db8b4719f887273f95fe0f4dad26af016c28fa915 TERMUX_PKG_DEPENDS="openssl" +TERMUX_PKG_BREAKS="termux-auth-dev" +TERMUX_PKG_REPLACES="termux-auth-dev" diff --git a/packages/tesseract/build.sh b/packages/tesseract/build.sh index 8866cb48c..49517a2f8 100644 --- a/packages/tesseract/build.sh +++ b/packages/tesseract/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://github.com/tesseract-ocr/tesseract TERMUX_PKG_DESCRIPTION="Tesseract is probably the most accurate open source OCR engine available" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=4.1.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/tesseract-ocr/tesseract/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=5c5ed5f1a76888dc57a83704f24ae02f8319849f5c4cf19d254296978a1a1961 TERMUX_PKG_DEPENDS="libc++, libtool, libuuid, leptonica, libandroid-glob" +TERMUX_PKG_BREAKS="tesseract-dev" +TERMUX_PKG_REPLACES="tesseract-dev" termux_step_pre_configure() { export LIBS="-landroid-glob" diff --git a/packages/texlive-bin/build.sh b/packages/texlive-bin/build.sh index 817191def..35e345d9a 100644 --- a/packages/texlive-bin/build.sh +++ b/packages/texlive-bin/build.sh @@ -3,17 +3,16 @@ TERMUX_PKG_DESCRIPTION="TeX Live is a distribution of the TeX typesetting system TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" TERMUX_PKG_VERSION=20190410 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://github.com/TeX-Live/texlive-source/archive/build-svn50882.tar.gz TERMUX_PKG_SHA256=a7462f8e29163faa52ad2ac658727b60f95241449832f1a4dac8d8a406d18233 TERMUX_PKG_DEPENDS="libc++, libiconv, freetype, libpng, libgd, libgmp, libmpfr, libicu, liblua, poppler, libgraphite, harfbuzz, harfbuzz-icu, teckit, libpixman, libcairo, zlib" # libpcre, glib, fonconfig are dependencies to libcairo. pkg-config gives an error if they are missing # libuuid, libxml2 are needed by fontconfig -TERMUX_PKG_BUILD_DEPENDS="icu-devtools, pcre-dev, glib-dev, fontconfig, libuuid-dev, libxml2-dev" -TERMUX_PKG_BREAKS="texlive (<< 20180414)" -TERMUX_PKG_REPLACES="texlive (<< 20170524-3)" +TERMUX_PKG_BUILD_DEPENDS="icu-devtools, pcre, glib, fontconfig, libuuid, libxml2" +TERMUX_PKG_BREAKS="texlive (<< 20180414), texlive-bin-dev" +TERMUX_PKG_REPLACES="texlive (<< 20170524-3), texlive-bin-dev" TERMUX_PKG_RECOMMENDS="texlive" -TERMUX_PKG_NO_DEVELSPLIT=yes TERMUX_PKG_HOSTBUILD=true TL_ROOT=$TERMUX_PREFIX/share/texlive diff --git a/packages/texlive-bin/texlive-bin-dev.subpackage.sh b/packages/texlive-bin/texlive-bin-dev.subpackage.sh deleted file mode 100644 index 6a9747500..000000000 --- a/packages/texlive-bin/texlive-bin-dev.subpackage.sh +++ /dev/null @@ -1,4 +0,0 @@ -TERMUX_SUBPKG_INCLUDE="include lib/pkgconfig" -TERMUX_SUBPKG_DESCRIPTION="Development files for texlive" -TERMUX_SUBPKG_REPLACES="texlive-dev" -TERMUX_SUBPKG_CONFLICTS="texlive-dev" diff --git a/packages/tidy/build.sh b/packages/tidy/build.sh index 9584c3e05..7cf3254aa 100644 --- a/packages/tidy/build.sh +++ b/packages/tidy/build.sh @@ -3,9 +3,12 @@ TERMUX_PKG_DESCRIPTION="A tool to tidy down your HTML code to a clean style" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=5.7.28 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/htacg/tidy-html5/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=5caa2c769204f506e24ea4986a45abe23f71d14f0fe968314f20065f342ffdba TERMUX_PKG_DEPENDS="libxslt" +TERMUX_PKG_BREAKS="tidy-dev" +TERMUX_PKG_REPLACES="tidy-dev" TERMUX_PKG_HOSTBUILD=true termux_step_host_build() { diff --git a/packages/utf8cpp/build.sh b/packages/utf8cpp/build.sh index 2cb89574f..0928adca9 100644 --- a/packages/utf8cpp/build.sh +++ b/packages/utf8cpp/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/nemtrif/utfcpp TERMUX_PKG_DESCRIPTION="UTF8-CPP: UTF-8 with C++ in a Portable Way" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=2.3.5 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=f3ffe0ef6c02f48ebafe42369cbd741e844143baad27c13baad1cd14b863983d TERMUX_PKG_SRCURL=https://github.com/nemtrif/utfcpp/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_NO_DEVELSPLIT=yes termux_step_configure() { return 0; diff --git a/packages/utf8proc/build.sh b/packages/utf8proc/build.sh index 8c430a3d5..44244c5f8 100644 --- a/packages/utf8proc/build.sh +++ b/packages/utf8proc/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/JuliaLang/utf8proc TERMUX_PKG_DESCRIPTION="Library for processing UTF-8 Unicode data" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=2.4.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=b2e5d547c1d94762a6d03a7e05cea46092aab68636460ff8648f1295e2cdfbd7 +TERMUX_PKG_BREAKS="utf8proc-dev" +TERMUX_PKG_REPLACES="utf8proc-dev" TERMUX_PKG_SRCURL=https://github.com/JuliaLang/utf8proc/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/util-linux/build.sh b/packages/util-linux/build.sh index c8c09735b..cd921cf25 100644 --- a/packages/util-linux/build.sh +++ b/packages/util-linux/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://en.wikipedia.org/wiki/Util-linux TERMUX_PKG_DESCRIPTION="Miscellaneous system utilities" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.34 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://www.kernel.org/pub/linux/utils/util-linux/v${TERMUX_PKG_VERSION:0:4}/util-linux-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5 TERMUX_PKG_DEPENDS="ncurses, libcrypt, zlib" +TERMUX_PKG_BREAKS="util-linux-dev" +TERMUX_PKG_REPLACES="util-linux-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_func_setns=yes ac_cv_func_unshare=yes diff --git a/packages/valac/build.sh b/packages/valac/build.sh index c23a8ad39..63b13a5e9 100644 --- a/packages/valac/build.sh +++ b/packages/valac/build.sh @@ -3,9 +3,12 @@ TERMUX_PKG_DESCRIPTION="C# like language for the GObject system" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" TERMUX_PKG_VERSION=0.44.6 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/vala/${TERMUX_PKG_VERSION:0:4}/vala-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=ab9f1756af7460aa1e39c9a7388f5492a4252a3cd9c76b02f2033f1dedcd793a -TERMUX_PKG_DEPENDS="clang, glib-dev, pkg-config" +TERMUX_PKG_DEPENDS="clang, glib, pkg-config" +TERMUX_PKG_BREAKS="valac-dev" +TERMUX_PKG_REPLACES="valac-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-cgraph=no" termux_step_post_make_install() { diff --git a/packages/valgrind/build.sh b/packages/valgrind/build.sh index a66b4484a..692470f37 100644 --- a/packages/valgrind/build.sh +++ b/packages/valgrind/build.sh @@ -2,8 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://valgrind.org/ TERMUX_PKG_DESCRIPTION="Instrumentation framework for building dynamic analysis tools" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=3.15.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1 +TERMUX_PKG_BREAKS="valgrind-dev" +TERMUX_PKG_REPLACES="valgrind-dev" TERMUX_PKG_SRCURL=ftp://sourceware.org/pub/valgrind/valgrind-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-tmpdir=$TERMUX_PREFIX/tmp" diff --git a/packages/weechat/build.sh b/packages/weechat/build.sh index afbf4499b..78d2e05b8 100644 --- a/packages/weechat/build.sh +++ b/packages/weechat/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://weechat.org/ TERMUX_PKG_DESCRIPTION="Fast, light and extensible IRC chat client" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.5 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.weechat.org/files/src/weechat-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=4c772c949c59949ff4156560c66900c5aaa9ab2da4439ee278b7c21b24daf191 TERMUX_PKG_DEPENDS="libiconv, ncurses, libgcrypt, libcurl, libgnutls, libandroid-support, zlib" +TERMUX_PKG_BREAKS="weechat-dev" +TERMUX_PKG_REPLACES="weechat-dev" TERMUX_PKG_RM_AFTER_INSTALL="bin/weechat-curses share/man/man1/weechat-headless.1 share/icons" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/xmlsec/build.sh b/packages/xmlsec/build.sh index fae88c277..93484fbb9 100644 --- a/packages/xmlsec/build.sh +++ b/packages/xmlsec/build.sh @@ -2,9 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://www.aleksey.com/xmlsec/ TERMUX_PKG_DESCRIPTION="XML Security Library" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=1.2.28 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4 TERMUX_PKG_SRCURL=http://www.aleksey.com/xmlsec/download/xmlsec1-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="libxslt, openssl, libgcrypt, libgpg-error, libxml2" +TERMUX_PKG_BREAKS="xmlsec-dev" +TERMUX_PKG_REPLACES="xmlsec-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-crypto-dl --without-gnutls diff --git a/packages/xvidcore/build.sh b/packages/xvidcore/build.sh index 5a89691ea..57bfe2241 100644 --- a/packages/xvidcore/build.sh +++ b/packages/xvidcore/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://www.xvid.org/ TERMUX_PKG_DESCRIPTION="High performance and high quality MPEG-4 library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.3.5 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=165ba6a2a447a8375f7b06db5a3c91810181f2898166e7c8137401d7fc894cf0 +TERMUX_PKG_BREAKS="xvidcore-dev" +TERMUX_PKG_REPLACES="xvidcore-dev" TERMUX_PKG_SRCURL=http://downloads.xvid.org/downloads/xvidcore-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/yajl/build.sh b/packages/yajl/build.sh index 373d5b430..96d2b422c 100644 --- a/packages/yajl/build.sh +++ b/packages/yajl/build.sh @@ -3,9 +3,11 @@ TERMUX_PKG_DESCRIPTION="Yet Another JSON Library" TERMUX_PKG_LICENSE="ISC" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=2.1.0 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/lloyd/yajl/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a +TERMUX_PKG_BREAKS="yajl-dev" +TERMUX_PKG_REPLACES="yajl-dev" TERMUX_PKG_FORCE_CMAKE=true termux_step_post_make_install() { diff --git a/packages/yasm/build.sh b/packages/yasm/build.sh index ed7c86e0c..752b5b83d 100644 --- a/packages/yasm/build.sh +++ b/packages/yasm/build.sh @@ -2,6 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://yasm.tortall.net/ TERMUX_PKG_DESCRIPTION="Assembler supporting the x86 and AMD64 instruction sets" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_VERSION=1.3.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://www.tortall.net/projects/yasm/releases/yasm-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f +TERMUX_PKG_BREAKS="yasm-dev" +TERMUX_PKG_REPLACES="yasm-dev" diff --git a/packages/zbar/build.sh b/packages/zbar/build.sh index e8e214a5a..f450ea079 100644 --- a/packages/zbar/build.sh +++ b/packages/zbar/build.sh @@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://zbar.sourceforge.net TERMUX_PKG_DESCRIPTION="Software suite for reading bar codes from various sources" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=0.10 -TERMUX_PKG_REVISION=9 +TERMUX_PKG_REVISION=10 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/zbar/zbar/0.10/zbar-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6 TERMUX_PKG_DEPENDS="libiconv, imagemagick, libjpeg-turbo, zlib" +TERMUX_PKG_BREAKS="zbar-dev" +TERMUX_PKG_REPLACES="zbar-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-pthread --disable-video --without-xshm --without-xv --without-x --without-gtk --without-qt diff --git a/packages/zlib/build.sh b/packages/zlib/build.sh index ab40ec189..1b789f4bc 100644 --- a/packages/zlib/build.sh +++ b/packages/zlib/build.sh @@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://www.zlib.net/ TERMUX_PKG_DESCRIPTION="Compression library implementing the deflate compression method found in gzip and PKZIP" TERMUX_PKG_LICENSE="ZLIB" TERMUX_PKG_VERSION=1.2.11 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SHA256=4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://www.zlib.net/zlib-$TERMUX_PKG_VERSION.tar.xz -TERMUX_PKG_DEVPACKAGE_BREAKS="ndk-sysroot (<< 19b-3)" -TERMUX_PKG_DEVPACKAGE_REPLACES="ndk-sysroot (<< 19b-3)" +TERMUX_PKG_SHA256=4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 +TERMUX_PKG_BREAKS="ndk-sysroot (<< 19b-3), zlib-dev" +TERMUX_PKG_REPLACES="ndk-sysroot (<< 19b-3), zlib-dev" termux_step_configure() { "$TERMUX_PKG_SRCDIR/configure" --prefix=$TERMUX_PREFIX diff --git a/packages/zstd/build.sh b/packages/zstd/build.sh index f5239de7f..73abd6161 100644 --- a/packages/zstd/build.sh +++ b/packages/zstd/build.sh @@ -2,7 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/facebook/zstd TERMUX_PKG_DESCRIPTION="Zstandard compression." TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.4.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/facebook/zstd/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=7a6e1dad34054b35e2e847eb3289be8820a5d378228802239852f913c6dcf6a7 -TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_DEPENDS="liblzma, zlib" +TERMUX_PKG_BREAKS="zstd-dev" +TERMUX_PKG_REPLACES="zstd-dev" +TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/scripts/build/configure/termux_step_configure_autotools.sh b/scripts/build/configure/termux_step_configure_autotools.sh index 233ac9ce2..df1d289db 100644 --- a/scripts/build/configure/termux_step_configure_autotools.sh +++ b/scripts/build/configure/termux_step_configure_autotools.sh @@ -1,10 +1,9 @@ termux_step_configure_autotools() { if [ ! -e "$TERMUX_PKG_SRCDIR/configure" ]; then return; fi - local DISABLE_STATIC="--disable-static" - if [ "$TERMUX_PKG_EXTRA_CONFIGURE_ARGS" != "${TERMUX_PKG_EXTRA_CONFIGURE_ARGS/--enable-static/}" ]; then - # Do not --disable-static if package explicitly enables it (e.g. gdb needs enable-static to build) - DISABLE_STATIC="" + local ENABLE_STATIC="--enable-static" + if [ "$TERMUX_PKG_EXTRA_CONFIGURE_ARGS" != "${TERMUX_PKG_EXTRA_CONFIGURE_ARGS/--disable-static/}" ]; then + ENABLE_STATIC="" fi local DISABLE_NLS="--disable-nls" @@ -104,7 +103,7 @@ termux_step_configure_autotools() { $TERMUX_PKG_EXTRA_CONFIGURE_ARGS \ $DISABLE_NLS \ $ENABLE_SHARED \ - $DISABLE_STATIC \ + $ENABLE_STATIC \ $LIBEXEC_FLAG \ $QUIET_BUILD } diff --git a/scripts/build/termux_create_subpackages.sh b/scripts/build/termux_create_subpackages.sh index 4c59e947f..ff9f3b555 100644 --- a/scripts/build/termux_create_subpackages.sh +++ b/scripts/build/termux_create_subpackages.sh @@ -1,20 +1,12 @@ termux_create_subpackages() { # Sub packages: - if [ -d include ] && [ -z "${TERMUX_PKG_NO_DEVELSPLIT}" ]; then - # Add virtual -dev sub package if there are include files: - local _DEVEL_SUBPACKAGE_FILE=$TERMUX_PKG_TMPDIR/${TERMUX_PKG_NAME}-dev.subpackage.sh - echo TERMUX_SUBPKG_INCLUDE=\"include share/vala share/man/man3 lib/pkgconfig share/aclocal lib/cmake $TERMUX_PKG_INCLUDE_IN_DEVPACKAGE\" > "$_DEVEL_SUBPACKAGE_FILE" - echo "TERMUX_SUBPKG_DESCRIPTION=\"Development files for ${TERMUX_PKG_NAME}\"" >> "$_DEVEL_SUBPACKAGE_FILE" - if [ -n "$TERMUX_PKG_DEVPACKAGE_DEPENDS" ]; then - echo "TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_DEVPACKAGE_DEPENDS\"" >> "$_DEVEL_SUBPACKAGE_FILE" - fi - if [ -n "$TERMUX_PKG_DEVPACKAGE_BREAKS" ]; then - echo "TERMUX_SUBPKG_BREAKS=\"$TERMUX_PKG_DEVPACKAGE_BREAKS\"" >> "$_DEVEL_SUBPACKAGE_FILE" - fi - if [ -n "$TERMUX_PKG_DEVPACKAGE_REPLACES" ]; then - echo "TERMUX_SUBPKG_REPLACES=\"$TERMUX_PKG_DEVPACKAGE_REPLACES\"" >> "$_DEVEL_SUBPACKAGE_FILE" - fi + if [[ -n $(shopt -s nullglob; echo lib/*.a) ]] && [ -z "${TERMUX_PKG_NO_STATICSPLIT}" ]; then + # Add virtual -static sub package if there are include files: + local _STATIC_SUBPACKAGE_FILE=$TERMUX_PKG_TMPDIR/${TERMUX_PKG_NAME}-static.subpackage.sh + echo TERMUX_SUBPKG_INCLUDE=\"lib/*.a lib/*.la\" > "$_STATIC_SUBPACKAGE_FILE" + echo "TERMUX_SUBPKG_DESCRIPTION=\"Static libraries for ${TERMUX_PKG_NAME}\"" >> "$_STATIC_SUBPACKAGE_FILE" fi + # Now build all sub packages rm -Rf "$TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages" for subpackage in $TERMUX_PKG_BUILDER_DIR/*.subpackage.sh $TERMUX_PKG_TMPDIR/*subpackage.sh; do diff --git a/scripts/build/termux_extract_dep_info.sh b/scripts/build/termux_extract_dep_info.sh index c596edf93..af301c258 100755 --- a/scripts/build/termux_extract_dep_info.sh +++ b/scripts/build/termux_extract_dep_info.sh @@ -8,7 +8,7 @@ termux_extract_dep_info() { TERMUX_PKG_PLATFORM_INDEPENDENT="" source ${PKG_DIR}/build.sh TERMUX_SUBPKG_PLATFORM_INDEPENDENT=$TERMUX_PKG_PLATFORM_INDEPENDENT - if [ "$TERMUX_INSTALL_DEPS" = false ] || [ -n "${TERMUX_PKG_NO_DEVELSPLIT}" ] || [ "${PKG/-dev/}-dev" != "${PKG}" ]; then + if [ "$TERMUX_INSTALL_DEPS" = false ] || [ -n "${TERMUX_PKG_NO_STATICSPLIT}" ] || [ "${PKG/-static/}-static" != "${PKG}" ]; then source ${PKG_DIR}/${PKG}.subpackage.sh fi if [ "$TERMUX_SUBPKG_PLATFORM_INDEPENDENT" = yes ]; then @@ -18,9 +18,9 @@ termux_extract_dep_info() { fi ) - elif [ "${PKG/-dev/}-dev" == "${PKG}" ]; then - # dev package - PKG=${PKG/-dev/} + elif [ "${PKG/-static/}-static" == "${PKG}" ]; then + # static lib package + PKG=${PKG/-static/} fi ( # Reset TERMUX_PKG_PLATFORM_INDEPENDENT and TERMUX_PKG_REVISION since these aren't diff --git a/scripts/build/termux_step_massage.sh b/scripts/build/termux_step_massage.sh index 412ddbf83..154206a20 100644 --- a/scripts/build/termux_step_massage.sh +++ b/scripts/build/termux_step_massage.sh @@ -13,12 +13,6 @@ termux_step_massage() { # Remove old kept libraries (readline): find . -name '*.old' -delete - # Remove static libraries: - if [ $TERMUX_PKG_KEEP_STATIC_LIBRARIES = "false" ]; then - find . -name '*.a' -delete - find . -name '*.la' -delete - fi - # Move over sbin to bin: for file in sbin/*; do if test -f "$file"; then mv "$file" bin/; fi; done diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index 6dd07b83a..78f438ada 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/scripts/build/termux_step_setup_toolchain.sh @@ -112,12 +112,12 @@ termux_step_setup_toolchain() { sed -i 's/clang/clang -E/' \ $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-cpp cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang \ - $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-gcc + $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-gcc cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang++ \ $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-gcc done cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/armv7a-linux-androideabi$TERMUX_PKG_API_LEVEL-clang \ - $_TERMUX_TOOLCHAIN_TMPDIR/bin/arm-linux-androideabi-clang + $_TERMUX_TOOLCHAIN_TMPDIR/bin/arm-linux-androideabi-clang cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/armv7a-linux-androideabi$TERMUX_PKG_API_LEVEL-clang++ \ $_TERMUX_TOOLCHAIN_TMPDIR/bin/arm-linux-androideabi-clang++ cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/armv7a-linux-androideabi-cpp \ @@ -134,7 +134,7 @@ termux_step_setup_toolchain() { # langinfo.h: Inline implementation of nl_langinfo(). cp "$TERMUX_SCRIPTDIR"/ndk-patches/{ifaddrs.h,libintl.h,langinfo.h} usr/include - # Remove because it is provided by libcap-dev. + # Remove because it is provided by libcap. # Remove from the NDK in favour of that from the libandroid-shmem. # Remove as it doesn't work for non-root. # Remove as we currently provide it from libandroid-glob. diff --git a/scripts/build/termux_step_setup_variables.sh b/scripts/build/termux_step_setup_variables.sh index a51bcaad9..0220b5229 100644 --- a/scripts/build/termux_step_setup_variables.sh +++ b/scripts/build/termux_step_setup_variables.sh @@ -82,7 +82,7 @@ termux_step_setup_variables() { TERMUX_PKG_TMPDIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/tmp TERMUX_PKG_HOSTBUILD_DIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/host-build TERMUX_PKG_PLATFORM_INDEPENDENT="" - TERMUX_PKG_NO_DEVELSPLIT="" + TERMUX_PKG_NO_STATICSPLIT="" TERMUX_PKG_REVISION="0" # http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Version TERMUX_PKG_EXTRA_CONFIGURE_ARGS="" TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="" @@ -96,7 +96,6 @@ termux_step_setup_variables() { TERMUX_PKG_HOMEPAGE="" TERMUX_PKG_DESCRIPTION="FIXME:Add description" TERMUX_PKG_LICENSE_FILE="" # Relative path from $TERMUX_PKG_SRCDIR to LICENSE file. It is installed to $PREFIX/share/$TERMUX_PKG_NAME. - TERMUX_PKG_KEEP_STATIC_LIBRARIES="false" TERMUX_PKG_ESSENTIAL="" TERMUX_PKG_CONFLICTS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts TERMUX_PKG_RECOMMENDS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps @@ -104,10 +103,6 @@ termux_step_setup_variables() { TERMUX_PKG_REPLACES="" TERMUX_PKG_PROVIDES="" #https://www.debian.org/doc/debian-policy/#virtual-packages-provides TERMUX_PKG_CONFFILES="" - TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="" - TERMUX_PKG_DEVPACKAGE_DEPENDS="" - TERMUX_PKG_DEVPACKAGE_BREAKS="" - TERMUX_PKG_DEVPACKAGE_REPLACES="" # Set if a host build should be done in TERMUX_PKG_HOSTBUILD_DIR: TERMUX_PKG_HOSTBUILD="" TERMUX_PKG_FORCE_CMAKE=no # if the package has autotools as well as cmake, then set this to prefer cmake diff --git a/scripts/buildorder.py b/scripts/buildorder.py index fd00f73fd..783868613 100755 --- a/scripts/buildorder.py +++ b/scripts/buildorder.py @@ -50,10 +50,10 @@ def parse_build_file_dependencies(path): return set(dependencies) -def develsplit(path): +def staticsplit(path): with open(path, encoding="utf-8") as build_script: for line in build_script: - if line.startswith('TERMUX_PKG_NO_DEVELSPLIT'): + if line.startswith('TERMUX_PKG_NO_STATICSPLIT'): return False return True @@ -87,8 +87,8 @@ class TermuxPackage(object): self.deps.add(subpkg.name) self.deps |= subpkg.deps - if develsplit(build_sh_path): - subpkg = TermuxSubPackage(self.dir + '/' + self.name + '-dev' + '.subpackage.sh', self, virtual=True) + if staticsplit(build_sh_path): + subpkg = TermuxSubPackage(self.dir + '/' + self.name + '-static' + '.subpackage.sh', self, virtual=True) self.subpkgs.append(subpkg) self.deps.add(subpkg.name) diff --git a/scripts/package_uploader.sh b/scripts/package_uploader.sh index 9c632b680..3cf7b5025 100755 --- a/scripts/package_uploader.sh +++ b/scripts/package_uploader.sh @@ -349,9 +349,9 @@ upload_package() { debfiles_catalog["${1}_${PACKAGE_METADATA['VERSION_FULL']}_${arch}.deb"]=${arch} fi - # Development package. - if [ -f "$DEBFILES_DIR_PATH/${1}-dev_${PACKAGE_METADATA['VERSION_FULL']}_${arch}.deb" ]; then - debfiles_catalog["${1}-dev_${PACKAGE_METADATA['VERSION_FULL']}_${arch}.deb"]=${arch} + # Static library package. + if [ -f "$DEBFILES_DIR_PATH/${1}-static_${PACKAGE_METADATA['VERSION_FULL']}_${arch}.deb" ]; then + debfiles_catalog["${1}-static_${PACKAGE_METADATA['VERSION_FULL']}_${arch}.deb"]=${arch} fi # Discover subpackages.