Transition from gnustl to libc++

This will make things as std::to_string() and other C++ features
work with a modern and supported C++ library.

We package up libc++_shared.so and bump the revision of every C++
using package to make it rebuild against it.

Users who have built C++ using libraries or programs will probably
need to rebuild them if they are linked against Termux-supplied
libraries, as user code was previously linked against gnustl while
the system libraries are now using libc++, and it's not a good idea
to mix C++ standard libraries in a program.

diff --git a/build-package.sh b/build-package.sh
index 568211ada9dd9fa04092f004d8ad76355975981c..325f1fb14cb8a77f925dc1045753a89864b493cd 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -90,8 +90,8 @@ termux_setup_golang() {
 
 # Utility function for cmake-built packages to setup a current cmake.
 termux_setup_cmake() {
-       local TERMUX_CMAKE_MAJORVESION=3.8
-       local TERMUX_CMAKE_MINORVERSION=2
+       local TERMUX_CMAKE_MAJORVESION=3.9
+       local TERMUX_CMAKE_MINORVERSION="0-rc6"
        local TERMUX_CMAKE_VERSION=$TERMUX_CMAKE_MAJORVESION.$TERMUX_CMAKE_MINORVERSION
        local TERMUX_CMAKE_TARNAME=cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64.tar.gz
        local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME
@@ -99,7 +99,7 @@ termux_setup_cmake() {
        if [ ! -d "$TERMUX_CMAKE_FOLDER" ]; then
                termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \
                                "$TERMUX_CMAKE_TARFILE" \
-                               33e4851d3219b720f4b64fcf617151168f1bffdf5afad25eb4b7f5f58cee3a08
+                               68456efed8207381c7724411558e7a3ed6503932f8f3127a3ba640e624026b1a
                rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64"
                tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR"
                mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" \
@@ -295,7 +295,7 @@ termux_step_start_build() {
        TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/${TERMUX_NDK_VERSION}-${TERMUX_ARCH}-${TERMUX_PKG_API_LEVEL}"
        # Bump the below version if a change is made in toolchain setup to ensure
        # that everyone gets an updated toolchain:
-       TERMUX_STANDALONE_TOOLCHAIN+="-v8"
+       TERMUX_STANDALONE_TOOLCHAIN+="-v9"
 
        if [ -n "${TERMUX_PKG_BLACKLISTED_ARCHES:=""}" ] && [ "$TERMUX_PKG_BLACKLISTED_ARCHES" != "${TERMUX_PKG_BLACKLISTED_ARCHES/$TERMUX_ARCH/}" ]; then
                echo "Skipping building $TERMUX_PKG_NAME for arch $TERMUX_ARCH"
@@ -534,8 +534,12 @@ termux_step_setup_toolchain() {
                "$NDK/build/tools/make_standalone_toolchain.py" \
                        --api "$TERMUX_PKG_API_LEVEL" \
                        --arch $_NDK_ARCHNAME \
+                       --stl=libc++ \
                        --install-dir $_TERMUX_TOOLCHAIN_TMPDIR
 
+               # Remove android-support header wrapping not needed on android-21:
+               rm -Rf $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/local
+
                local wrapped plusplus CLANG_TARGET=$TERMUX_HOST_PLATFORM
                if [ $TERMUX_ARCH = arm ]; then CLANG_TARGET=${CLANG_TARGET/arm-/armv7a-}; fi
                for wrapped in ${TERMUX_HOST_PLATFORM}-clang clang; do
@@ -550,11 +554,7 @@ termux_step_setup_toolchain() {
                        done
                done
 
-               if [ "$TERMUX_ARCH" = "arm" ]; then
-                       # Fix to allow e.g. <bits/c++config.h> to be included:
-                       cp $_TERMUX_TOOLCHAIN_TMPDIR/include/c++/4.9.x/arm-linux-androideabi/armv7-a/bits/* \
-                               $_TERMUX_TOOLCHAIN_TMPDIR/include/c++/4.9.x/bits
-               elif [ "$TERMUX_ARCH" = "aarch64" ]; then
+               if [ "$TERMUX_ARCH" = "aarch64" ]; then
                        # Use gold by default to work around https://github.com/android-ndk/ndk/issues/148
                        cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld.gold \
                           $_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld
@@ -596,7 +596,8 @@ termux_step_setup_toolchain() {
                mv $_TERMUX_TOOLCHAIN_TMPDIR $TERMUX_STANDALONE_TOOLCHAIN
        fi
 
-       if [ ! -f $TERMUX_PREFIX/lib/libstdc++.so ]; then
+       local _STL_LIBFILE_NAME=libc++_shared.so
+       if [ ! -f $TERMUX_PREFIX/lib/libstdc++.so ] || [ `readlink $TERMUX_PREFIX/lib/libstdc++.so` != $_STL_LIBFILE_NAME ]; then
                # Setup libgnustl_shared.so in $PREFIX/lib and libstdc++.so as a symlink to it,
                # so that other C++ using packages links to it instead of the default android
                # C++ library which does not support exceptions or STL:
@@ -607,16 +608,20 @@ termux_step_setup_toolchain() {
                # which is part of the base Termux installation.
                mkdir -p "$TERMUX_PREFIX/lib"
                cd "$TERMUX_PREFIX/lib"
-               _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/libgnustl_shared.so
+
+               local _STL_LIBFILE=
                if [ "$TERMUX_ARCH" = arm ]; then
-                       _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/armv7-a/libgnustl_shared.so
+                       local _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/armv7-a/$_STL_LIBFILE_NAME
                elif [ "$TERMUX_ARCH" = x86_64 ]; then
-                       _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib64/libgnustl_shared.so
+                       local _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib64/$_STL_LIBFILE_NAME
+               else
+                       local _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/$_STL_LIBFILE_NAME
                fi
+
                cp "$_STL_LIBFILE" .
-               $STRIP --strip-unneeded libgnustl_shared.so
-               $TERMUX_ELF_CLEANER libgnustl_shared.so
-               ln -f -s libgnustl_shared.so libstdc++.so
+               $STRIP --strip-unneeded $_STL_LIBFILE_NAME
+               $TERMUX_ELF_CLEANER $_STL_LIBFILE_NAME
+               ln -f -s $_STL_LIBFILE_NAME libstdc++.so
        fi
 
        export PKG_CONFIG_LIBDIR="$TERMUX_PKG_CONFIG_LIBDIR"
@@ -771,6 +776,7 @@ termux_step_configure_cmake () {
        # pick up cross compiled binutils tool in $PREFIX/bin:
        cmake -G 'Unix Makefiles' "$TERMUX_PKG_SRCDIR" \
                -DCMAKE_AR="$(which $AR)" \
+               -DCMAKE_UNAME="$(which uname)" \
                -DCMAKE_RANLIB="$(which $RANLIB)" \
                -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
                -DCMAKE_CROSSCOMPILING=True \

diff --git a/packages/aapt/build.sh b/packages/aapt/build.sh
index 92bac76fb4d99754c8a45e73a85dec0db3ba80c8..95f55c582dbeeac32c67c29bbc418273f64cad5d 100644 (file)
--- a/packages/aapt/build.sh
+++ b/packages/aapt/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_DESCRIPTION="Android Asset Packaging Tool"
 _TAG_VERSION=7.0.0
 _TAG_REVISION=14
 TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION}
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="libexpat, libpng, libzopfli"
 
@@ -176,7 +176,9 @@ termux_step_make_install () {
        libbase_linux_src_files="\
                errors_unix.cpp"
        # __USE_BSD for DEFFILEMODE to be defined by <sys/stat.h>.
-       $CXX $CXXFLAGS $CPPFLAGS -std=c++11 \
+       $CXX $CXXFLAGS $CPPFLAGS \
+               -std=c++11 \
+               -include memory \
                -D__USE_BSD \
                -isystem $AOSP_INCLUDE_DIR \
                $libbase_src_files $libbase_linux_src_files \
@@ -234,6 +236,7 @@ termux_step_make_install () {
        sed -i 's%#include <binder/TextOutput.h>%%' ResourceTypes.cpp
        $CXX $CXXFLAGS $CPPFLAGS $LDFLAGS -isystem $AOSP_INCLUDE_DIR \
                -std=c++11 \
+               -include memory \
                $commonSources \
                -landroid-cutils \
                -landroid-utils \
@@ -254,6 +257,7 @@ termux_step_make_install () {
        sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PKG_BUILDER_DIR/aapt-Main.cpp.patch.txt | patch -p1
        $CXX $CXXFLAGS $CPPFLAGS $LDFLAGS \
                -std=c++11 \
+               -include memory \
                -DANDROID_SMP=1 \
                -DNDEBUG=1 \
                -DHAVE_ENDIAN_H=1 -DHAVE_POSIX_FILEMAP=1 -DHAVE_OFF64_T=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_PTHREADS=1 \

diff --git a/packages/apt/build.sh b/packages/apt/build.sh
index eedeac9b8115f030081b7a8c8431b9bfc816ff13..48cc9082d4c1deb274b9e6b398ef3a39443b2cb7 100644 (file)
--- a/packages/apt/build.sh
+++ b/packages/apt/build.sh
@@ -1,16 +1,16 @@
 TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt
 TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager"
-TERMUX_PKG_DEPENDS="liblzma, dpkg, gpgv"
+TERMUX_PKG_DEPENDS="liblzma, dpkg, gpgv, libc++"
 # Wait with updating to later version until the NDK supports std::to_string() and other
 # functions (hopefully in r15, https://github.com/android-ndk/ndk/issues/82).
 # Updating to apt 1.4 will also get rid of the build hacks used as apt has transitioned
 # to a clean cmake build system.
 TERMUX_PKG_VERSION=1.2.12
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 # TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SRCURL=https://launchpad.net/ubuntu/+archive/primary/+files/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=e820d27cba73476df4abcff27dadd1b5847474bfe85f7e9202a9a07526973ea6
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--no-create ac_cv_lib_bz2_BZ2_bzopen=no"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--no-create"
 TERMUX_PKG_FOLDERNAME=apt-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_ESSENTIAL=yes
@@ -25,6 +25,8 @@ termux_step_pre_configure () {
        perl -p -i -e "s/TERMUX_ARCH/$TERMUX_ARCH/" $TERMUX_PKG_SRCDIR/configure
 
        rm $TERMUX_PKG_SRCDIR/apt-pkg/{cdrom.cc,indexcopy.cc}
+
+       export ac_cv_lib_bz2_BZ2_bzopen=no
 }
 
 termux_step_make_install () {

diff --git a/packages/aria2/build.sh b/packages/aria2/build.sh
index d480cf191cb4824ede21e3544fddb8a6df4a95c8..cbc7f76f1ae9ce57ee84e7adf653d8bc71b86008 100644 (file)
--- a/packages/aria2/build.sh
+++ b/packages/aria2/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://aria2.github.io
 TERMUX_PKG_DESCRIPTION="Download utility supporting HTTP/HTTPS, FTP, BitTorrent and Metalink"
 TERMUX_PKG_VERSION=1.32.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/aria2/aria2/releases/download/release-${TERMUX_PKG_VERSION}/aria2-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=546e9194a9135d665fce572cb93c88f30fb5601d113bfa19951107ced682dc50
 TERMUX_PKG_DEPENDS="c-ares, openssl, libxml2"

diff --git a/packages/boost/build.sh b/packages/boost/build.sh
index 3e42caae0d72ce94c66463899bb2f9ec0da48d82..c251e639f7c9ebe50b0d234d560c8c9be3ff575b 100644 (file)
--- a/packages/boost/build.sh
+++ b/packages/boost/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://boost.org
 TERMUX_PKG_DESCRIPTION="Free peer-reviewed portable C++ source libraries"
 TERMUX_PKG_VERSION=1.64.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=http://sourceforge.net/projects/boost/files/boost/${TERMUX_PKG_VERSION}/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2
 TERMUX_PKG_SHA256=7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332
 TERMUX_PKG_FOLDERNAME="boost_${TERMUX_PKG_VERSION//./_}"

diff --git a/packages/cgdb/build.sh b/packages/cgdb/build.sh
index 1854eae8c8e908bb380664a49bde02c611e41db9..5a7141d76e81e9bac3307b8aaad98fafda1bd28d 100644 (file)
--- a/packages/cgdb/build.sh
+++ b/packages/cgdb/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://cgdb.github.io/
 TERMUX_PKG_DESCRIPTION="A lightweight curses (terminal-based) interface to the GNU Debugger (GDB)"
 TERMUX_PKG_DEPENDS="ncurses,readline,gdb,libutil"
 TERMUX_PKG_VERSION=0.7.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://cgdb.me/files/cgdb-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=bf7a9264668db3f9342591b08b2cc3bbb08e235ba2372877b4650b70c6fb5423
 TERMUX_PKG_FOLDERNAME=cgdb-${TERMUX_PKG_VERSION}

diff --git a/packages/cmake/build.sh b/packages/cmake/build.sh
index b12ad08f321a2376108d24fda1d3cd6fea480904..1bf54da3f825ff99bbcfc192b3089f87e5baf37b 100644 (file)
--- a/packages/cmake/build.sh
+++ b/packages/cmake/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://cmake.org/
 TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package software"
 _MAJOR_VERSION=3.8
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${_MAJOR_VERSION}/cmake-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d
 TERMUX_PKG_DEPENDS="libarchive, libcurl, libexpat, jsoncpp, libuv, librhash"

diff --git a/packages/elfutils/build.sh b/packages/elfutils/build.sh
index 7b4417d187ca2e52599db175a2459ec040ba8d99..ef6d0ef5bd2e09130cf96307c706225587327d6e 100644 (file)
--- a/packages/elfutils/build.sh
+++ b/packages/elfutils/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://sourceware.org/elfutils/
 TERMUX_PKG_DESCRIPTION="ELF object file access library"
 TERMUX_PKG_VERSION=0.168
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=ftp://sourceware.org/pub/elfutils/${TERMUX_PKG_VERSION}/elfutils-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=b88d07893ba1373c7dd69a7855974706d05377766568a7d9002706d5de72c276
 # libandroid-support for langinfo.

diff --git a/packages/fish/build.sh b/packages/fish/build.sh
index 5002419438dee4fcee6f40cea33ce95d0e32429e..9608a25a2781ed661f7e925d927856d3ea422e75 100644 (file)
--- a/packages/fish/build.sh
+++ b/packages/fish/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://fishshell.com/
 TERMUX_PKG_DESCRIPTION="Shell geared towards interactive use"
 TERMUX_PKG_VERSION=2.6.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/releases/download/$TERMUX_PKG_VERSION/fish-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=7ee5bbd671c73e5323778982109241685d58a836e52013e18ee5d9f2e638fdfb
 # fish calls 'tput' from ncurses-utils, at least when cancelling (Ctrl+C) a command line.

diff --git a/packages/fish/src-wutil.cpp.patch b/packages/fish/src-wutil.cpp.patch
new file mode 100644 (file)
index 0000000..58145d0
--- /dev/null
+++ b/packages/fish/src-wutil.cpp.patch
@@ -0,0 +1,12 @@
+diff -u -r ../fish-2.6.0/src/wutil.cpp ./src/wutil.cpp
+--- ../fish-2.6.0/src/wutil.cpp        2017-06-03 14:45:13.000000000 +0200
++++ ./src/wutil.cpp    2017-07-13 22:31:47.791569324 +0200
+@@ -290,7 +290,7 @@
+ // have to grub through sys_nerr and sys_errlist directly On GNU toolchain, this will produce a
+ // deprecation warning from the linker (!!), which appears impossible to suppress!
+ const char *safe_strerror(int err) {
+-#if defined(__UCLIBC__)
++#if defined(__UCLIBC__) || defined(__ANDROID__)
+     // uClibc does not have sys_errlist, however, its strerror is believed to be async-safe.
+     // See issue #808.
+     return strerror(err);

diff --git a/packages/gdb/build.sh b/packages/gdb/build.sh
index 891dd4db9a68c099502910045fedf5b0e26dc990..d6ceb362b1308abb66e6c0921dcf3d8e453dc1ca 100755 (executable)
--- a/packages/gdb/build.sh
+++ b/packages/gdb/build.sh
@@ -2,6 +2,7 @@ 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_DEPENDS="liblzma, libexpat, readline"
 TERMUX_PKG_VERSION=7.12.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gdb/gdb-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=4607680b973d3ec92c30ad029f1b7dbde3876869e6b3a117d8a7e90081113186
 # gdb can not build with our normal --disable-static: https://sourceware.org/bugzilla/show_bug.cgi?id=15916

diff --git a/packages/gettext/build.sh b/packages/gettext/build.sh
index ec85d3aeaaf588460e814e7ced807194d5d9be31..f60b562ca4d32ae14f762a05d276681d03c7c25b 100644 (file)
--- a/packages/gettext/build.sh
+++ b/packages/gettext/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gettext/
 TERMUX_PKG_DESCRIPTION="GNU Internationalization utilities"
 TERMUX_PKG_VERSION=0.19.8
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gettext/gettext-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=9c1781328238caa1685d7bc7a2e1dcf1c6c134e86b42ed554066734b621bd12f
 TERMUX_PKG_BUILD_IN_SRC=yes

diff --git a/packages/gnuchess/build.sh b/packages/gnuchess/build.sh
index ff792f4d0779d3057eee2a9b8b5a6ddf55339afc..56f6112cf57eb4f3d6ef7f88264751b30336c02b 100644 (file)
--- a/packages/gnuchess/build.sh
+++ b/packages/gnuchess/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/chess/
 TERMUX_PKG_DESCRIPTION="Chess-playing program"
 TERMUX_PKG_VERSION=6.2.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/chess/gnuchess-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=3c425c0264f253fc5cc2ba969abe667d77703c728770bd4b23c456cbe5e082ef
 TERMUX_PKG_DEPENDS="ncurses, readline"

diff --git a/packages/gnuplot/build.sh b/packages/gnuplot/build.sh
index e64ae5b86a7ddd880b3f44acb3a5a4b6e30d67f8..f8e68508841418d4f6b67356c1726b73fa3a3a27 100644 (file)
--- a/packages/gnuplot/build.sh
+++ b/packages/gnuplot/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://gnuplot.info/
 TERMUX_PKG_DESCRIPTION="Command-line driven graphing utility"
 TERMUX_PKG_VERSION=5.0.6
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/gnuplot/gnuplot/${TERMUX_PKG_VERSION}/gnuplot-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-x --with-lua=no --with-bitmap-terminals"

diff --git a/packages/googletest/build.sh b/packages/googletest/build.sh
index 8ba99c8e01e3a2c04d3e7a57959c38e7f9a65e91..7ad3093908f273101e57cb29898f9d84b77a9c40 100644 (file)
--- a/packages/googletest/build.sh
+++ b/packages/googletest/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/google/googletest
 TERMUX_PKG_DESCRIPTION="Google C++ testing framework"
 TERMUX_PKG_VERSION=1.8.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/google/googletest/archive/release-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8
 TERMUX_PKG_FOLDERNAME=googletest-release-$TERMUX_PKG_VERSION

diff --git a/packages/graphviz/build.sh b/packages/graphviz/build.sh
index f8ae42b9e8fdd09d493f72cdd52f2da1f7331a69..c0d1a94e5c2c30baa75fcfe6570572e9f84e89f6 100644 (file)
--- a/packages/graphviz/build.sh
+++ b/packages/graphviz/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://www.graphviz.org/
 TERMUX_PKG_DESCRIPTION="Rich set of graph drawing tools"
 TERMUX_PKG_MAINTAINER="Dustin DeWeese @HackerFoo"
 TERMUX_PKG_VERSION=2.40.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421
 TERMUX_PKG_DEPENDS="libandroid-glob,libcairo,pango,libexpat,libltdl,librsvg,libgd"

diff --git a/packages/harfbuzz/build.sh b/packages/harfbuzz/build.sh
index a4125486411240250bd11a82bf7af6cba339f671..a0c3ce087dd26b72ec289bd87bd478ba6e719941 100644 (file)
--- a/packages/harfbuzz/build.sh
+++ b/packages/harfbuzz/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz/
 TERMUX_PKG_DESCRIPTION="OpenType text shaping engine"
 TERMUX_PKG_VERSION=1.4.6
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=21a78b81cd20cbffdb04b59ac7edfb410e42141869f637ae1d6778e74928d293
 TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="freetype,glib,libbz2,libpng,libgraphite"

diff --git a/packages/ht/build.sh b/packages/ht/build.sh
index 21b87b6d6fe6b0a159f255fdbfcb33c5a9994056..e8e0eccdacda624a52468a35388025f7e93ec3c4 100755 (executable)
--- a/packages/ht/build.sh
+++ b/packages/ht/build.sh
@@ -1,9 +1,10 @@
 TERMUX_PKG_HOMEPAGE=http://hte.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="File editor/viewer/analyzer for executables"
 TERMUX_PKG_VERSION=2.1.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/hte/ht-source/ht-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=31f5e8e2ca7f85d40bb18ef518bf1a105a6f602918a0755bc649f3f407b75d70
-TERMUX_PKG_DEPENDS="ncurses"
+TERMUX_PKG_DEPENDS="ncurses, liblzo"
 
 termux_step_post_configure () {
        mkdir -p $TERMUX_PKG_BUILDDIR/tools/

diff --git a/packages/ht/htapp.cc.patch b/packages/ht/htapp.cc.patch
new file mode 100644 (file)
index 0000000..b2a45bc
--- /dev/null
+++ b/packages/ht/htapp.cc.patch
@@ -0,0 +1,12 @@
+diff -u -r ../ht-2.1.0/htapp.cc ./htapp.cc
+--- ../ht-2.1.0/htapp.cc       2014-09-14 17:55:26.000000000 +0200
++++ ./htapp.cc 2017-07-13 11:21:19.614513024 +0200
+@@ -3023,7 +3023,7 @@
+ {
+       uint a = 2;
+       uint b = u/a;
+-      while (abs(a - b) > 1) {
++      while (abs(a - (long long) b) > 1) {
+               a = (a+b)/2;
+               b = u/a;
+         }

diff --git a/packages/hunspell/build.sh b/packages/hunspell/build.sh
index 5512191c17d7bc0cdb4c04d49327fe540461c322..690b7f1a6295d0c8b992cea028c2a60468bdcf69 100644 (file)
--- a/packages/hunspell/build.sh
+++ b/packages/hunspell/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://hunspell.github.io
 TERMUX_PKG_DESCRIPTION="Spell checker"
 TERMUX_PKG_VERSION=1.6.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/hunspell/hunspell/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=30f593733c50b794016bb03d31fd2a2071e4610c6fa4708e33edad2335102c49
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ui --with-readline"

diff --git a/packages/jsoncpp/build.sh b/packages/jsoncpp/build.sh
index 4d056e3e7f3be943376ebe62ce9eec89eb39ff72..675289023f7d1615863bf21791dee754ba79b10b 100644 (file)
--- a/packages/jsoncpp/build.sh
+++ b/packages/jsoncpp/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
 TERMUX_PKG_DESCRIPTION="C++ library for interacting with JSON"
 TERMUX_PKG_VERSION=1.8.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/open-source-parsers/jsoncpp/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=5deb2462cbf0c0121c9d6c9823ec72fe71417e34242e3509bc7c003d526465bc
 TERMUX_PKG_FOLDERNAME=jsoncpp-${TERMUX_PKG_VERSION}

diff --git a/packages/ledger/build.sh b/packages/ledger/build.sh
index 608f54667867c20373f2961f042ff421b130ac03..e5c79a8722cf15dd732bc2777f5f7e8d940c4de9 100644 (file)
--- a/packages/ledger/build.sh
+++ b/packages/ledger/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://ledger-cli.org/
 TERMUX_PKG_DESCRIPTION="Powerful, double-entry accounting system"
 TERMUX_PKG_VERSION=3.1.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/ledger/ledger/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_FOLDERNAME="ledger-${TERMUX_PKG_VERSION}"
 TERMUX_PKG_SHA256=90f06561ab692b192d46d67bc106158da9c6c6813cc3848b503243a9dfd8548a

diff --git a/packages/lftp/build.sh b/packages/lftp/build.sh
index f6a16581823d6de0f453c37be092a3089e5236f4..dad4ac060c9227e2d73bda32469d87d0a2457992 100644 (file)
--- a/packages/lftp/build.sh
+++ b/packages/lftp/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://lftp.tech/
 TERMUX_PKG_DESCRIPTION="FTP/HTTP client and file transfer program"
 TERMUX_PKG_VERSION=4.8.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://lftp.tech/ftp/lftp-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=7a2880968088b4aeec43b6b6680fef0e065e1dddcce9b409390157e9766b690f
 # (1) Android has dn_expand, but lftp assumes that dn_skipname then exists, which it does not on android.

diff --git a/packages/libc++/build.sh b/packages/libc++/build.sh
new file mode 100644 (file)
index 0000000..904b10c
--- /dev/null
+++ b/packages/libc++/build.sh
@@ -0,0 +1,14 @@
+TERMUX_PKG_HOMEPAGE=https://libcxx.llvm.org/
+TERMUX_PKG_DESCRIPTION="C++ Standard Library"
+TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
+# Since every C++ package links against this by default (due
+# to the libstdc++.so -> libc++_shared.so setup in
+# build-package.sh) this package is considered essential,
+# and other packages does not need to declare explicit
+# dependency on it.
+TERMUX_PKG_ESSENTIAL=yes
+
+termux_step_post_massage () {
+       mkdir lib
+       cp $TERMUX_PREFIX/lib/libc++_shared.so lib/
+}

diff --git a/packages/libcaca/build.sh b/packages/libcaca/build.sh
index df78188720cde640ff8fcf2617b52d0116243cfc..8b21a8db9bd99a5ad113b72d4494110439ed0e2e 100644 (file)
--- a/packages/libcaca/build.sh
+++ b/packages/libcaca/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://caca.zoy.org/wiki/libcaca
 TERMUX_PKG_DESCRIPTION="Graphics library that outputs text instead of pixels"
 TERMUX_PKG_VERSION=0.99.beta19
+TERMUX_PKG_REVISION=1
 # Switched to mirror on 2014-12-22 since master was down:
 TERMUX_PKG_SRCURL=http://fossies.org/linux/privat/libcaca-${TERMUX_PKG_VERSION}.tar.gz
 #                     http://caca.zoy.org/files/libcaca/libcaca-${TERMUX_PKG_VERSION}.tar.gz

diff --git a/packages/libcln/build.sh b/packages/libcln/build.sh
index 6ad13b6711faab52c52a7ca5442990b5c931f6d5..c8566a2d281188b7f68061db3ab3b33d87964e7b 100644 (file)
--- a/packages/libcln/build.sh
+++ b/packages/libcln/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.ginac.de/CLN/
 TERMUX_PKG_DESCRIPTION="CLN is a library for efficient computations with all kinds of numbers in arbitrary precision"
 TERMUX_PKG_VERSION=1.3.4
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=http://www.ginac.de/CLN/cln-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=2d99d7c433fb60db1e28299298a98354339bdc120d31bb9a862cafc5210ab748
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-gnu-ld=no"

diff --git a/packages/libflac/build.sh b/packages/libflac/build.sh
index 57b46674e0650e8374de2d6146dcfe94799d0ab4..65ba5979b11880af2db16e8ebf6ec14642e196a9 100644 (file)
--- a/packages/libflac/build.sh
+++ b/packages/libflac/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://xiph.org/flac/
 TERMUX_PKG_DESCRIPTION="FLAC (Free Lossless Audio Codec) library"
 TERMUX_PKG_VERSION=1.3.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://downloads.xiph.org/releases/flac/flac-1.3.1.tar.xz
 TERMUX_PKG_SHA256=4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c
 TERMUX_PKG_DEPENDS="libogg"

diff --git a/packages/libgnustl/build.sh b/packages/libgnustl/build.sh
index a1ee5d62361544bf3436decc67b246988dc71b04..435de340c5b3275da7fa68481a96b068860aba9e 100644 (file)
--- a/packages/libgnustl/build.sh
+++ b/packages/libgnustl/build.sh
@@ -1,18 +1,21 @@
 TERMUX_PKG_HOMEPAGE=http://gcc.gnu.org/onlinedocs/libstdc++/
 TERMUX_PKG_DESCRIPTION="The GNU Standard C++ Library (a.k.a. libstdc++-v3), necessary on android since the system libstdc++.so is stripped down"
 TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
-# Since every C++ package links against this by default (due
-# to the libstdc++.so -> libgnustl_shared.so setup in
-# build-package.sh) this package is considered essential,
-# and other packages does not need to declare explicit
-# dependency on it.
-TERMUX_PKG_ESSENTIAL=yes
+TERMUX_PKG_REVISION=1
 
-termux_step_post_massage () {
-       # We take the library here after massage step to
-       # avoid stripping the library after running termux-elf-cleaner,
-       # which causes a broken library (program compiled on the
-       # device linking to the library will segfault, at least on aarch64).
-       mkdir lib
-       cp $TERMUX_PREFIX/lib/libgnustl_shared.so lib/
+termux_step_extract_into_massagedir() {
+       if [ "$TERMUX_ARCH" = arm ]; then
+               local _STL_LIBFILE=$NDK/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libgnustl_shared.so
+       elif [ "$TERMUX_ARCH" = i686 ]; then
+               local _STL_LIBFILE=$NDK/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/libgnustl_shared.so
+       elif [ "$TERMUX_ARCH" = aarch64 ]; then
+               local _STL_LIBFILE=$NDK/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/libgnustl_shared.so
+       elif [ "$TERMUX_ARCH" = x86_64 ]; then
+               local _STL_LIBFILE=$NDK/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/libgnustl_shared.so
+       else
+               termux_error_exit "Unsupported arch"
+       fi
+
+       mkdir -p "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib"
+       cp "$_STL_LIBFILE" "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib"
 }

diff --git a/packages/libgraphite/build.sh b/packages/libgraphite/build.sh
index e3982c4713802a2de3946d2bc8d3004423d2b5ee..19d8f59fc27e3f5b45e248785b00079322e47f8c 100644 (file)
--- a/packages/libgraphite/build.sh
+++ b/packages/libgraphite/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/silnrsi/graphite
 TERMUX_PKG_DESCRIPTION="Font system for multiple languages"
 TERMUX_PKG_VERSION=1.3.10
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/silnrsi/graphite/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=68908cf38cfe09d8aadbbb2c5197f1784e3c1df4be315a462f59e2a1f85cbbc2
 TERMUX_PKG_FOLDERNAME=graphite-$TERMUX_PKG_VERSION

diff --git a/packages/libgrpc/build.sh b/packages/libgrpc/build.sh
index acc153f402d4f4fa3d420c832467a139e341bd14..199c128ce7527c5601a65f42df0a6385c99a68df 100644 (file)
--- a/packages/libgrpc/build.sh
+++ b/packages/libgrpc/build.sh
@@ -1,4 +1,5 @@
 TERMUX_PKG_VERSION=1.4.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_DESCRIPTION="High performance, open source, general RPC framework that puts mobile and HTTP/2 first"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 TERMUX_PKG_SRCURL=https://github.com/grpc/grpc/archive/v$TERMUX_PKG_VERSION.tar.gz

diff --git a/packages/libgrpc/include-grpcpp-impl-codegen-config.h.patch b/packages/libgrpc/include-grpcpp-impl-codegen-config.h.patch
deleted file mode 100644 (file)
index c0d728a..0000000
--- a/packages/libgrpc/include-grpcpp-impl-codegen-config.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/grpc++/impl/codegen/config.h     2017-06-28 01:16:01.000000000 +0530
-+++ ../config.h        2017-07-08 22:48:38.993186926 +0530
-@@ -49,8 +49,6 @@
- 
- typedef GRPC_CUSTOM_STRING string;
- 
--using std::to_string;
--
- }  // namespace grpc
- 
- #endif  // GRPCXX_IMPL_CODEGEN_CONFIG_H

diff --git a/packages/libicu/build.sh b/packages/libicu/build.sh
index 8784636954f1dfd24f1fbf24e914941e78e33679..80bb280f95cad39bbc848a21f83896ebc87724ff 100644 (file)
--- a/packages/libicu/build.sh
+++ b/packages/libicu/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://site.icu-project.org/home
 TERMUX_PKG_DESCRIPTION='International Components for Unicode library'
 TERMUX_PKG_VERSION=59.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://download.icu-project.org/files/icu4c/${TERMUX_PKG_VERSION/_/}/icu4c-${TERMUX_PKG_VERSION//./_}-src.tgz
 TERMUX_PKG_SHA256=7132fdaf9379429d004005217f10e00b7d2319d0fea22bdfddef8991c45b75fe
 TERMUX_PKG_FOLDERNAME="icu/source"

diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh
index ab7512744cf55255cfe29801158196aed4be4f8e..dad30676172a9d0e16e78c7f603e98c0ad9de178 100644 (file)
--- a/packages/libllvm/build.sh
+++ b/packages/libllvm/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://clang.llvm.org/
 TERMUX_PKG_DESCRIPTION="Modular compiler and toolchain technologies library"
 _PKG_MAJOR_VERSION=4.0
 TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://llvm.org/releases/${TERMUX_PKG_VERSION}/llvm-${TERMUX_PKG_VERSION}.src.tar.xz
 TERMUX_PKG_SHA256=da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51
 TERMUX_PKG_HOSTBUILD=true
@@ -31,10 +32,12 @@ TERMUX_PKG_CONFLICTS="gcc, clang (<< 3.9.1-3)"
 TERMUX_PKG_REPLACES=gcc
 # See http://llvm.org/docs/CMake.html:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+-DPYTHON_EXECUTABLE=`which python`
 -DLLVM_ENABLE_PIC=ON
 -DLLVM_ENABLE_LIBEDIT=OFF
 -DLLVM_BUILD_TESTS=OFF
 -DLLVM_INCLUDE_TESTS=OFF
+-DCLANG_DEFAULT_CXX_STDLIB=libc++
 -DCLANG_INCLUDE_TESTS=OFF
 -DCLANG_TOOL_C_INDEX_TEST_BUILD=OFF
 -DC_INCLUDE_DIRS=$TERMUX_PREFIX/include

diff --git a/packages/libllvm/tools-clang-lib-Driver-ToolChain.cpp.patch b/packages/libllvm/tools-clang-lib-Driver-ToolChain.cpp.patch
index da39a4f26ea27a92a5c44f2ff84e69b78462f432..c61cb2a471701959912ab52cc37d244694c91313 100644 (file)
--- a/packages/libllvm/tools-clang-lib-Driver-ToolChain.cpp.patch
+++ b/packages/libllvm/tools-clang-lib-Driver-ToolChain.cpp.patch
@@ -1,12 +1,12 @@
-diff -u -r ../llvm-3.8.0.src/tools/clang/lib/Driver/ToolChain.cpp ./tools/clang/lib/Driver/ToolChain.cpp
---- ../llvm-3.8.0.src/tools/clang/lib/Driver/ToolChain.cpp     2015-11-25 20:02:07.000000000 -0500
-+++ ./tools/clang/lib/Driver/ToolChain.cpp     2016-05-02 08:50:35.526226962 -0400
-@@ -611,7 +611,7 @@
+diff -u -r ../llvm-4.0.1.src/tools/clang/lib/Driver/ToolChain.cpp ./tools/clang/lib/Driver/ToolChain.cpp
+--- ../llvm-4.0.1.src/tools/clang/lib/Driver/ToolChain.cpp     2016-12-14 17:46:50.000000000 +0100
++++ ./tools/clang/lib/Driver/ToolChain.cpp     2017-07-13 12:35:02.862534376 +0200
+@@ -632,7 +632,7 @@
+ 
+   switch (Type) {
+   case ToolChain::CST_Libcxx:
+-    CmdArgs.push_back("-lc++");
++    CmdArgs.push_back("-lc++_shared");
      break;
  
    case ToolChain::CST_Libstdcxx:
--    CmdArgs.push_back("-lstdc++");
-+    CmdArgs.push_back("-lgnustl_shared");
-     break;
-   }
- }

diff --git a/packages/libllvm/tools-clang-lib-StaticAnalyzer-Checkers-ExprInspectionChecker.cpp.patch b/packages/libllvm/tools-clang-lib-StaticAnalyzer-Checkers-ExprInspectionChecker.cpp.patch
deleted file mode 100644 (file)
index fb6c1f1..0000000
--- a/packages/libllvm/tools-clang-lib-StaticAnalyzer-Checkers-ExprInspectionChecker.cpp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -u -r ../llvm-4.0.0.src/tools/clang/lib/StaticAnalyzer/Checkers/ExprInspectionChecker.cpp ./tools/clang/lib/StaticAnalyzer/Checkers/ExprInspectionChecker.cpp
---- ../llvm-4.0.0.src/tools/clang/lib/StaticAnalyzer/Checkers/ExprInspectionChecker.cpp        2016-11-30 18:57:18.000000000 +0100
-+++ ./tools/clang/lib/StaticAnalyzer/Checkers/ExprInspectionChecker.cpp        2017-03-14 18:11:26.984865292 +0100
-@@ -12,6 +12,7 @@
- #include "clang/StaticAnalyzer/Core/Checker.h"
- #include "clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h"
- #include "clang/StaticAnalyzer/Checkers/SValExplainer.h"
-+#include "llvm/ADT/StringExtras.h"
- #include "llvm/ADT/StringSwitch.h"
- 
- using namespace clang;
-@@ -269,7 +270,7 @@
-     unsigned NumTimesReached = Item.second.NumTimesReached;
-     ExplodedNode *N = Item.second.ExampleNode;
- 
--    reportBug(std::to_string(NumTimesReached), BR, N);
-+    reportBug(llvm::utostr(NumTimesReached), BR, N);
-   }
- }
- 

diff --git a/packages/libllvm/tools-llvm-xray-xray-converter.cc.patch b/packages/libllvm/tools-llvm-xray-xray-converter.cc.patch
deleted file mode 100644 (file)
index 9d0d330..0000000
--- a/packages/libllvm/tools-llvm-xray-xray-converter.cc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -u -r ../llvm-4.0.0.src/tools/llvm-xray/xray-converter.cc ./tools/llvm-xray/xray-converter.cc
---- ../llvm-4.0.0.src/tools/llvm-xray/xray-converter.cc        2017-02-27 18:01:04.000000000 +0100
-+++ ./tools/llvm-xray/xray-converter.cc        2017-03-14 18:30:35.979011376 +0100
-@@ -14,6 +14,7 @@
- 
- #include "xray-extract.h"
- #include "xray-registry.h"
-+#include "llvm/ADT/StringExtras.h"
- #include "llvm/DebugInfo/Symbolize/Symbolize.h"
- #include "llvm/Support/EndianStream.h"
- #include "llvm/Support/FileSystem.h"
-@@ -95,7 +96,7 @@
-   for (const auto &R : Records) {
-     Trace.Records.push_back({R.RecordType, R.CPU, R.Type, R.FuncId,
-                              Symbolize ? FuncIdHelper.SymbolOrNumber(R.FuncId)
--                                       : std::to_string(R.FuncId),
-+                                       : llvm::utostr(R.FuncId),
-                              R.TSC, R.TId});
-   }
-   Output Out(OS, nullptr, 0);

diff --git a/packages/libprotobuf/build.sh b/packages/libprotobuf/build.sh
index 45560aa0d668cf1a117e6e779d5217c4e48b79b0..caa6b91b6398d39d90b2c6bbb85714b25bca0a12 100755 (executable)
--- a/packages/libprotobuf/build.sh
+++ b/packages/libprotobuf/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/google/protobuf
 TERMUX_PKG_DESCRIPTION="Protocol buffers C++ library"
 TERMUX_PKG_VERSION=3.3.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/google/protobuf/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=8b8e442becbeff637f160c1ef4a3a56769c50ba7c9ff939ccc94086530ff00e4
 TERMUX_PKG_FOLDERNAME=protobuf-$TERMUX_PKG_VERSION

diff --git a/packages/libtiff/build.sh b/packages/libtiff/build.sh
index baa246f8d2fc77fef5a636a27d30f81d1f31f172..891c755e84378ce4ad12db1fe4c7e7c99839dc9f 100644 (file)
--- a/packages/libtiff/build.sh
+++ b/packages/libtiff/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.simplesystems.org/libtiff/ # Note that http://libtiff.org/ is hijacked
 TERMUX_PKG_DESCRIPTION="Support for the Tag Image File Format (TIFF) for storing image data"
 TERMUX_PKG_VERSION=4.0.8
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://download.osgeo.org/libtiff/tiff-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=59d7a5a8ccd92059913f246877db95a2918e6c04fb9d43fd74e5c3390dac2910
 TERMUX_PKG_DEPENDS="libjpeg-turbo, liblzma"

diff --git a/packages/libvpx/build.sh b/packages/libvpx/build.sh
index 311985d4c22d20eaeb50fbc69a46121462cf5554..9e1ac87befc64469b0506c6a86c34a32721bc8cf 100644 (file)
--- a/packages/libvpx/build.sh
+++ b/packages/libvpx/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://www.webmproject.org
 TERMUX_PKG_DESCRIPTION="VP8 & VP9 Codec SDK"
 TERMUX_PKG_VERSION=1.6.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/webmproject/libvpx/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=cda8bb6f0e4848c018177d3a576fa83ed96d762554d7010fe4cfb9d70c22e588
 TERMUX_PKG_FOLDERNAME=libvpx-${TERMUX_PKG_VERSION}

diff --git a/packages/libx265/build.sh b/packages/libx265/build.sh
index 0ea272e5550f8d1fb7ceaaf856598207bc50e3bb..e27c1d016892bbb9003f64fb1aec647fc7ba5ec7 100644 (file)
--- a/packages/libx265/build.sh
+++ b/packages/libx265/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://x265.org/
 TERMUX_PKG_DESCRIPTION="H.265/HEVC video stream encoder library"
 TERMUX_PKG_VERSION=2.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://ftp.videolan.org/pub/videolan/x265/x265_${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=9c2aa718d78f6fecdd783f08ab83b98d3169e5f670404da4c16439306907d729
 TERMUX_PKG_FOLDERNAME=x265_$TERMUX_PKG_VERSION

diff --git a/packages/libxapian/build.sh b/packages/libxapian/build.sh
index 7ed7fe6dcb7965d44fbc3173bbd892792be03288..cea71d8f114c74f6a334e115a9e0c4ccc2dde084 100644 (file)
--- a/packages/libxapian/build.sh
+++ b/packages/libxapian/build.sh
@@ -1,6 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://xapian.org
 TERMUX_PKG_DESCRIPTION="Xapian search engine library"
 TERMUX_PKG_VERSION=1.4.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://oligarchy.co.uk/xapian/${TERMUX_PKG_VERSION}/xapian-core-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=a6a985a9841a452d75cf2169196b7ca6ebeef27da7c607078cd401ad041732d9
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_c_bigendian=no"
+# ac_cv_c_bigendian=no: We can use /proc/sys/kernel/random/uuid and do not need libuuid.
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_c_bigendian=no ac_cv_header_uuid_uuid_h=no"

diff --git a/packages/libzmq/build.sh b/packages/libzmq/build.sh
index bf79513052303de0b70fede88bac744c57afcb2e..f8e5ed58f338cf4dc307fc45878dd59f605fc731 100644 (file)
--- a/packages/libzmq/build.sh
+++ b/packages/libzmq/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://zeromq.org/
 TERMUX_PKG_DESCRIPTION="Fast messaging system built on sockets. C and C++ bindings. aka 0MQ, ZMQ."
 TERMUX_PKG_VERSION=4.2.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/zeromq/libzmq/releases/download/v${TERMUX_PKG_VERSION}/zeromq-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=5b23f4ca9ef545d5bd3af55d305765e3ee06b986263b31967435d285a3e6df6b
 TERMUX_PKG_DEPENDS="libsodium"

diff --git a/packages/lzip/build.sh b/packages/lzip/build.sh
index 8347dc46924b6b830e6d699c8373d21d4add3a9e..af3ac39780f839070078a4e5a034ea94ad7efb70 100644 (file)
--- a/packages/lzip/build.sh
+++ b/packages/lzip/build.sh
@@ -1,5 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://www.nongnu.org/lzip/
 TERMUX_PKG_DESCRIPTION="Lossless data compressor similar to gzip and bzip2"
 TERMUX_PKG_VERSION=1.19
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://download.savannah.gnu.org/releases/lzip/lzip-${TERMUX_PKG_VERSION}.tar.lz
 TERMUX_PKG_SHA256=c8b7a098a42429d34ca1504afcdfd9aeeaf249469d52039df05d0b5a2ad7ac77

diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh
index ea95451aeaa37645e7cbb57ae0635922d1eff738..320b11e238a3f8b9685f3e4c3bcedd6b19d2dac6 100644 (file)
--- a/packages/mariadb/build.sh
+++ b/packages/mariadb/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://mariadb.org
 TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server"
 TERMUX_PKG_VERSION=10.2.6
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://ftp.osuosl.org/pub/mariadb/mariadb-$TERMUX_PKG_VERSION/source/mariadb-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=c385c76e40d6e5f0577eba021805da5f494a30c9ef51884baefe206d5658a2e5
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="

diff --git a/packages/mosh/build.sh b/packages/mosh/build.sh
index 989f85174c1a2d1b9f0d46cc780e82c0e3e111a5..a1e7cbc455b2cb34f271da6b48382a3de5558739 100644 (file)
--- a/packages/mosh/build.sh
+++ b/packages/mosh/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://mosh.org
 TERMUX_PKG_DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
 TERMUX_PKG_VERSION=1.3.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/mobile-shell/mosh/releases/download/mosh-${TERMUX_PKG_VERSION}/mosh-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=320e12f461e55d71566597976bd9440ba6c5265fa68fbf614c6f1c8401f93376
 TERMUX_PKG_FOLDERNAME=mosh-$TERMUX_PKG_VERSION

diff --git a/packages/mpd/build.sh b/packages/mpd/build.sh
index 67c2413929b38a73f0d009f464d3f36fee17f479..85316699189cd577c40c185d4cd4d279a3905d72 100644 (file)
--- a/packages/mpd/build.sh
+++ b/packages/mpd/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE="https://www.musicpd.org"
 TERMUX_PKG_DESCRIPTION="music player daemon"
 TERMUX_PKG_VERSION=0.20.8
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_FOLDERNAME=MPD-$TERMUX_PKG_VERSION
 TERMUX_PKG_SHA256=b3ced73b44cf432ac8906deeb803e69235c1286b34c6986029ecf4fe8e351128

diff --git a/packages/ncmpcpp/build.sh b/packages/ncmpcpp/build.sh
index 2c9b2e734c763ec0a49dcd75cddee6a3602a301e..87095bd4a46eec7d9e0441f2f63a9012578ac7ff 100644 (file)
--- a/packages/ncmpcpp/build.sh
+++ b/packages/ncmpcpp/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://rybczak.net/ncmpcpp/
 TERMUX_PKG_DESCRIPTION="NCurses Music Player Client (Plus Plus)"
 TERMUX_PKG_VERSION=0.8
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://rybczak.net/ncmpcpp/stable/ncmpcpp-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=2f0f2a1c0816119430880be6932e5eb356b7875dfa140e2453a5a802909f465a
 TERMUX_PKG_DEPENDS="fftw, boost, readline, libcurl, libmpdclient"

diff --git a/packages/ndk-stl/build.sh b/packages/ndk-stl/build.sh
index a3a9099252fc19e4e1c6d1b9c7fe75c49bf2d6d8..52531427008c56c1a9e7674651d02dacab198ea3 100644 (file)
--- a/packages/ndk-stl/build.sh
+++ b/packages/ndk-stl/build.sh
@@ -4,18 +4,11 @@ TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION
 TERMUX_PKG_NO_DEVELSPLIT=yes
 
 termux_step_extract_into_massagedir () {
-        mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/
-       cp -Rf $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9.x/* $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/
+       mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/c++/v1/
+       cp -Rf $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9.x/* $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/c++/v1/
 
-       if [ $TERMUX_ARCH = arm ]; then
-               cp $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/arm-linux-androideabi/armv7-a/bits/* \
-                  $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/bits
-       else
-               cp $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/$TERMUX_ARCH-linux-android/bits/* \
-                  $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/bits
-       fi
-        # fenv.h is a C++ compatibility header which should be included with the compiler
-        rm -Rf $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/{arm-linux-androideabi,tr1,tr2,fenv.h,complex.h}
+       # fenv.h is a C++ compatibility header which should be included with the compiler
+       #rm -Rf $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/{arm-linux-androideabi,tr1,tr2,fenv.h,complex.h,stdio.h,wctype.h}
 }
 
 termux_step_massage () {

diff --git a/packages/newsbeuter/build.sh b/packages/newsbeuter/build.sh
index c77a06e65453364f5cf1948d41783bc47174c8f9..22245b27e9d70714caf13dd8cabfb5b28c28901f 100644 (file)
--- a/packages/newsbeuter/build.sh
+++ b/packages/newsbeuter/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.newsbeuter.org
 TERMUX_PKG_DESCRIPTION="An open-source RSS/Atom feed reader for text terminals"
 TERMUX_PKG_VERSION=2.9
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=http://www.newsbeuter.org/downloads/newsbeuter-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=74a8bf019b09c3b270ba95adc29f2bbe48ea1f55cc0634276b21fcce1f043dc8
 TERMUX_PKG_FOLDERNAME=newsbeuter-${TERMUX_PKG_VERSION}

diff --git a/packages/nmap/build.sh b/packages/nmap/build.sh
index 4e44ad0f540789e0c553479d2a1c1e53617d620e..cfbdd77c6ea2a50546207e303eb86c332adb1b70 100644 (file)
--- a/packages/nmap/build.sh
+++ b/packages/nmap/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://nmap.org/
 TERMUX_PKG_DESCRIPTION="Utility for network discovery and security auditing"
 TERMUX_PKG_VERSION=7.50
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://nmap.org/dist/nmap-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=e9a96a8e02bfc9e80c617932acc61112c23089521ee7d6b1502ecf8e3b1674b2
 # Depend on netcat so that it gets installed automatically when installing

diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh
index 8a9c5efb1af1a60b83462dcb24a61ab56d4369fc..f5129f482c20b99d8e22ccbfcbf1a8df207fc67c 100644 (file)
--- a/packages/nodejs/build.sh
+++ b/packages/nodejs/build.sh
@@ -1,6 +1,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_VERSION=6.11.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=821f518c9b25b7dc52c4d87fce4dbf6df3227aba92f0d008ec9d1f32e5f603d9
 # Note that we do not use a shared libuv to avoid an issue with the Android

diff --git a/packages/notmuch/build.sh b/packages/notmuch/build.sh
index fc2996aaf0608b21370761eb74cf722d4b3a8043..74680a1f305ecea2e8b6ef89ab661baa6fde9366 100644 (file)
--- a/packages/notmuch/build.sh
+++ b/packages/notmuch/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://notmuchmail.org
 TERMUX_PKG_DESCRIPTION="Thread-based email index, search and tagging system"
 TERMUX_PKG_VERSION=0.24.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://notmuchmail.org/releases/notmuch-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=aa76a96684d5c5918d940182b6fe40f7d6745f144476fdda57388479d586cc51
 TERMUX_PKG_BUILD_IN_SRC=yes

diff --git a/packages/ocrad/build.sh b/packages/ocrad/build.sh
index 9bee710c9b5b98a10b876c9312472979dd799463..ef79db321f30fd222668c97896c349710933a0a7 100644 (file)
--- a/packages/ocrad/build.sh
+++ b/packages/ocrad/build.sh
@@ -1,5 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/ocrad/ocrad.html
 TERMUX_PKG_DESCRIPTION="Optical Character Recognition program based on a feature extraction method"
 TERMUX_PKG_VERSION=0.26
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/ocrad/ocrad-${TERMUX_PKG_VERSION}.tar.lz
 TERMUX_PKG_SHA256=c383d37869baa0990d38d38836d4d567e9e2862aa0cd704868b62dafeac18e3c

diff --git a/packages/p7zip/build.sh b/packages/p7zip/build.sh
index 7bbd14c50e51c96772fd48a2ebe25863d0b5dd6b..7b9f10a9e35b59e189b11f1407afe5be7cb21e00 100644 (file)
--- a/packages/p7zip/build.sh
+++ b/packages/p7zip/build.sh
@@ -5,6 +5,7 @@ TERMUX_PKG_MAINTAINER="Francisco Demartino @franciscod"
 pkgname=p7zip
 pkgver=16.02
 TERMUX_PKG_VERSION=$pkgver
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2"
 TERMUX_PKG_SHA256=5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f
 TERMUX_PKG_BUILD_IN_SRC=yes

diff --git a/packages/par2/build.sh b/packages/par2/build.sh
index 20c04a6d012f93619e86df993c3c76216ab66bc3..3cb594bb33d459e4eb3ba6eedc64f86cfad0fb4a 100644 (file)
--- a/packages/par2/build.sh
+++ b/packages/par2/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/Parchive/par2cmdline
 TERMUX_PKG_DESCRIPTION="par2cmdline is a PAR 2.0 compatible file verification and repair tool."
 TERMUX_PKG_VERSION=0.7.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli"
 TERMUX_PKG_SRCURL=https://github.com/Parchive/par2cmdline/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=894e798eeffa4d96542aa437a8ca2b74406b7f831a56c6f7fd67d45e2548552c

diff --git a/packages/patchelf/build.sh b/packages/patchelf/build.sh
index 2015ba7a23131b6088a7a6f689d05a17801999f2..39b9f8579a129b356d2cef4225592b7a3853a7e2 100644 (file)
--- a/packages/patchelf/build.sh
+++ b/packages/patchelf/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://nixos.org/patchelf.html
 TERMUX_PKG_DESCRIPTION="Utility to modify the dynamic linker and RPATH of ELF executables"
 TERMUX_PKG_VERSION=0.9
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83
 TERMUX_PKG_SRCURL=https://nixos.org/releases/patchelf/patchelf-${TERMUX_PKG_VERSION}/patchelf-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_BUILD_IN_SRC=yes

diff --git a/packages/play-audio/build.sh b/packages/play-audio/build.sh
index 115ff7479ea4219c4230fec82e2bfae3c769246e..6564bc4c84805bb689bea45a817b070880001b7a 100644 (file)
--- a/packages/play-audio/build.sh
+++ b/packages/play-audio/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/termux/play-audio
 TERMUX_PKG_DESCRIPTION="Simple commandline audio player for Android"
 TERMUX_PKG_VERSION=0.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/termux/play-audio/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=95d495d2692b4ac13b5d0c9f680410f0c08e563ea67ae8de0089c7d9366fa223
 TERMUX_PKG_FOLDERNAME=play-audio-$TERMUX_PKG_VERSION

diff --git a/packages/poppler/build.sh b/packages/poppler/build.sh
index 03a5176bcf5d005d5b3e9ccd562256d9b1884bf2..948026691510f13c129b7872d58acf07ee68e0b2 100644 (file)
--- a/packages/poppler/build.sh
+++ b/packages/poppler/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://poppler.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="PDF rendering library"
 TERMUX_PKG_VERSION=0.55.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=537f2bc60d796525705ad9ca8e46899dcc99c2e9480b80051808bae265cdc658
 TERMUX_PKG_SRCURL=https://poppler.freedesktop.org/poppler-${TERMUX_PKG_VERSION}.tar.xz
 # libcairo and littlecms is used by pdftocairo:

diff --git a/packages/qalc/build.sh b/packages/qalc/build.sh
index e339f63b3578518d4f33541128c0c59c137ccd16..fdd72b3411d874bed96bc0e2fc4adf618d24796e 100644 (file)
--- a/packages/qalc/build.sh
+++ b/packages/qalc/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://qalculate.github.io/
 TERMUX_PKG_DESCRIPTION="Powerful and easy to use command line calculator"
 TERMUX_PKG_VERSION=0.9.11
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/Qalculate/libqalculate/releases/download/v${TERMUX_PKG_VERSION}/libqalculate-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=fb5014b04e0f80d85d85d96974c4d069a14791cb2d6aef016c72a24e30917f14
 TERMUX_PKG_DEPENDS="glib, gnuplot, libcln, ncurses"

diff --git a/packages/ragel/build.sh b/packages/ragel/build.sh
index 59171677f4b273511903abce67d5d9772242659b..0c047f338f5ce3d3f7c3d24e28386b75453babc2 100644 (file)
--- a/packages/ragel/build.sh
+++ b/packages/ragel/build.sh
@@ -1,5 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://www.colm.net/open-source/ragel/
 TERMUX_PKG_DESCRIPTION="Compiles finite state machines from regular languages into executable C, C++, Objective-C, or D code"
 TERMUX_PKG_VERSION=6.10
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://www.colm.net/files/ragel/ragel-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f

diff --git a/packages/squid/build.sh b/packages/squid/build.sh
index 6c81b036d48c77a7b098a0084081cdd1590dc48b..a6ab7ce607e383873456514a474a7ddc376481de 100644 (file)
--- a/packages/squid/build.sh
+++ b/packages/squid/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.squid-cache.org
 TERMUX_PKG_DESCRIPTION="Full-featured Web proxy cache server"
 TERMUX_PKG_VERSION=3.5.26
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_DEPENDS="libcrypt, openssl, libnettle, libltdl"
 TERMUX_PKG_SRCURL=http://www.squid-cache.org/Versions/v3/3.5/squid-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=baa1eecb7d6e18881f4455060d80ee7cb95ae7e2695fdccf7e21ccc8f879a982
@@ -8,6 +9,8 @@ TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
 # disk-io requires msgctl and store-io requires disk-io
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_lib_sasl2_sasl_errstring=no
+ac_cv_dbopen_libdb=no
+--disable-external-acl-helpers
 --disable-strict-error-checking
 --disable-disk-io
 --disable-storeio

diff --git a/packages/tasksh/build.sh b/packages/tasksh/build.sh
index 49653ab8568b8326ee5b9d4c36ce229ffa3478a8..db0445649212267a6ad03b21a978fe359fdddef5 100644 (file)
--- a/packages/tasksh/build.sh
+++ b/packages/tasksh/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://taskwarrior.org
 TERMUX_PKG_DESCRIPTION="Shell command wrapping Taskwarrior commands"
 TERMUX_PKG_VERSION=1.2.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://taskwarrior.org/download/tasksh-latest.tar.gz
 TERMUX_PKG_SHA256=6e42f949bfd7fbdde4870af0e7b923114cc96c4344f82d9d924e984629e21ffd
 TERMUX_PKG_DEPENDS="readline, taskwarrior, libandroid-glob"

diff --git a/packages/taskwarrior/build.sh b/packages/taskwarrior/build.sh
index e9e6227af25bc3722360c1fa99fd9c1afee6d440..67da95b14f4067a7aeb4df2822fb6c0f7bd28bc0 100644 (file)
--- a/packages/taskwarrior/build.sh
+++ b/packages/taskwarrior/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://taskwarrior.org
 TERMUX_PKG_DESCRIPTION="Utility for managing your TODO list"
 TERMUX_PKG_VERSION=2.5.1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://taskwarrior.org/download/task-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=d87bcee58106eb8a79b850e9abc153d98b79e00d50eade0d63917154984f2a15
 TERMUX_PKG_DEPENDS="libgnutls, libuuid, libandroid-glob"

diff --git a/packages/termux-elf-cleaner/build.sh b/packages/termux-elf-cleaner/build.sh
index 2c948245e0dbef2fe82154fd32d2f1e7c0058130..d5416a86dcbb4ac5d1e2b50c0c6f832583cd0bd0 100644 (file)
--- a/packages/termux-elf-cleaner/build.sh
+++ b/packages/termux-elf-cleaner/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_DESCRIPTION="Cleaner of ELF files for Android"
 #       to create a native binary. Bumping this version will need
 #       updating the checksum used there.
 TERMUX_PKG_VERSION=1.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/termux/termux-elf-cleaner/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=66612b294e197ab7bfac807e497581df58424af6a7c855f89fc12eafa3dc1b8c
 TERMUX_PKG_FOLDERNAME=termux-elf-cleaner-$TERMUX_PKG_VERSION

diff --git a/packages/tesseract/build.sh b/packages/tesseract/build.sh
index 2342e1f2125d1dc29d66d2fdab944209fe9e9a6f..cd27afecf3bfdb167b7f17456fbf5f0e963050e3 100644 (file)
--- a/packages/tesseract/build.sh
+++ b/packages/tesseract/build.sh
@@ -1,6 +1,7 @@
 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_VERSION=3.05.01
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_DEPENDS="libtool, libuuid, leptonica"
 TERMUX_PKG_SRCURL=https://github.com/tesseract-ocr/tesseract/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=05898f93c5d057fada49b9a116fc86ad9310ff1726a0f499c3e5211b3af47ec1

diff --git a/packages/texlive/build.sh b/packages/texlive/build.sh
index 68fd22faa31e423ca8944cd56a01772425774b25..19cacb916d546a1f83fcb9fcf9697c8860eba28a 100644 (file)
--- a/packages/texlive/build.sh
+++ b/packages/texlive/build.sh
@@ -4,7 +4,7 @@ TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
 _MAJOR_VERSION=20170524
 _MINOR_VERSION=
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}${_MINOR_VERSION}
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=ftp://tug.org/historic/systems/texlive/${TERMUX_PKG_VERSION:0:4}/texlive-${TERMUX_PKG_VERSION}-source.tar.xz
 TERMUX_PKG_SHA256="0161695304e941334dc0b3b5dabcf8edf46c09b7bc33eea8229b5ead7ccfb2aa"
 TERMUX_PKG_DEPENDS="freetype, libpng, libgd, libgmp, libmpfr, libicu, liblua, poppler, libgraphite, harfbuzz-icu, perl, xz-utils, wget, gnupg"

diff --git a/packages/timewarrior/build.sh b/packages/timewarrior/build.sh
index 79bb4efda268f6f30aa995ad217cb818f9bacd48..8745a8f57acb06e148253c9bfb2f983163ace5dc 100644 (file)
--- a/packages/timewarrior/build.sh
+++ b/packages/timewarrior/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://tasktools.org/projects/timewarrior.html
 TERMUX_PKG_DESCRIPTION="Command-line time tracker"
 TERMUX_PKG_VERSION=1.0.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://taskwarrior.org/download/timew-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=ac027910e1e8365bdd218a8b42389b26d017d38d3c96516c408db6d5a44e0bb5
 TERMUX_PKG_DEPENDS="libandroid-glob"

diff --git a/packages/timewarrior/src-libshared-src-Pig.cpp.patch b/packages/timewarrior/src-libshared-src-Pig.cpp.patch
deleted file mode 100644 (file)
index 6469047..0000000
--- a/packages/timewarrior/src-libshared-src-Pig.cpp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../timew-1.0.0/src/libshared/src/Pig.cpp ./src/libshared/src/Pig.cpp
---- ../timew-1.0.0/src/libshared/src/Pig.cpp   2016-08-17 17:22:34.000000000 -0400
-+++ ./src/libshared/src/Pig.cpp        2016-09-05 17:58:52.282716956 -0400
-@@ -251,7 +251,7 @@
- 
-   if (_cursor > save)
-   {
--    result = std::strtoimax (_text.substr (save, _cursor - save).c_str (), NULL, 10);
-+    result = strtoimax (_text.substr (save, _cursor - save).c_str (), NULL, 10);
-     return true;
-   }
- 

diff --git a/packages/unrar/build.sh b/packages/unrar/build.sh
index 3c9a3a402b787a19fa4208954743ebd0d89d99b7..310fc07d671afc63d65c1af4c19d0e7ee9131f81 100644 (file)
--- a/packages/unrar/build.sh
+++ b/packages/unrar/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.rarlab.com/
 TERMUX_PKG_DESCRIPTION="Tool for extracting files from .rar archives"
 TERMUX_PKG_VERSION=5.5.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://www.rarlab.com/rar/unrarsrc-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=c8217d311c8b3fbbd00737721f8d43d2b306192e1e39d7a858dcb714b2853517
 TERMUX_PKG_DEPENDS="libandroid-support"

diff --git a/packages/utfdecode/build.sh b/packages/utfdecode/build.sh
index 9a3030a32fb7b109b68aadb69c1daf478a1c8c5d..9dd3d8993fcfc69a61eb2943c21d2d5db88d22de 100644 (file)
--- a/packages/utfdecode/build.sh
+++ b/packages/utfdecode/build.sh
@@ -1,5 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://github.com/fornwall/utfdecode
 TERMUX_PKG_DESCRIPTION="Tool for decoding, encoding and debugging unicode"
 TERMUX_PKG_VERSION=0.3.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://fornwall.net/releases/utfdecode/utfdecode-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=5fd1473f6cf6bdedeb33569c3b0f6823aceda366c714f6a475e2d28767f99b5a

diff --git a/packages/vtutils/build.sh b/packages/vtutils/build.sh
index 0436e0606283fa73f7ee2130c387a3171ce00838..e222278a8cd7481bc9fa7f499fc0f0e1d9f6f59a 100644 (file)
--- a/packages/vtutils/build.sh
+++ b/packages/vtutils/build.sh
@@ -1,5 +1,6 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/fornwall/vtutils
 TERMUX_PKG_DESCRIPTION="Utilities for testing and working with virtual terminals"
 TERMUX_PKG_VERSION=0.5
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://fornwall.net/releases/vtutils/vtutils-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=ef0b11f9570697f53bcda7a61093f8d472afee2c8551b5b35e9b5b7c1539c2c6