From d946e67c5b86dd990ffa0e5654b2a514b787aeb9 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Fri, 14 Jul 2017 00:23:37 +0200 Subject: [PATCH] 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. --- build-package.sh | 38 +++++++++++++--------- packages/aapt/build.sh | 8 +++-- packages/apt/build.sh | 8 +++-- packages/aria2/build.sh | 1 + packages/boost/build.sh | 2 +- packages/cgdb/build.sh | 1 + packages/cmake/build.sh | 1 + packages/elfutils/build.sh | 1 + packages/fish/build.sh | 1 + packages/fish/src-wutil.cpp.patch | 12 +++++++ packages/gdb/build.sh | 1 + packages/gettext/build.sh | 1 + packages/gnuchess/build.sh | 1 + packages/gnuplot/build.sh | 2 +- packages/googletest/build.sh | 1 + packages/graphviz/build.sh | 2 +- packages/harfbuzz/build.sh | 2 +- packages/ht/build.sh | 3 +- packages/ht/htapp.cc.patch | 12 +++++++ packages/hunspell/build.sh | 1 + packages/jsoncpp/build.sh | 1 + packages/ledger/build.sh | 1 + packages/lftp/build.sh | 1 + packages/libc++/build.sh | 14 ++++++++ packages/libcaca/build.sh | 1 + packages/libcln/build.sh | 2 +- packages/libflac/build.sh | 1 + packages/libgnustl/build.sh | 29 +++++++++-------- packages/libgraphite/build.sh | 1 + packages/libgrpc/build.sh | 1 + .../include-grpcpp-impl-codegen-config.h.patch | 11 ------- packages/libicu/build.sh | 1 + packages/libllvm/build.sh | 3 ++ .../tools-clang-lib-Driver-ToolChain.cpp.patch | 18 +++++----- ...alyzer-Checkers-ExprInspectionChecker.cpp.patch | 20 ------------ .../tools-llvm-xray-xray-converter.cc.patch | 20 ------------ packages/libprotobuf/build.sh | 1 + packages/libtiff/build.sh | 1 + packages/libvpx/build.sh | 1 + packages/libx265/build.sh | 1 + packages/libxapian/build.sh | 4 ++- packages/libzmq/build.sh | 1 + packages/lzip/build.sh | 1 + packages/mariadb/build.sh | 2 +- packages/mosh/build.sh | 2 +- packages/mpd/build.sh | 2 +- packages/ncmpcpp/build.sh | 2 +- packages/ndk-stl/build.sh | 15 +++------ packages/newsbeuter/build.sh | 2 +- packages/nmap/build.sh | 1 + packages/nodejs/build.sh | 1 + packages/notmuch/build.sh | 1 + packages/ocrad/build.sh | 1 + packages/p7zip/build.sh | 1 + packages/par2/build.sh | 1 + packages/patchelf/build.sh | 1 + packages/play-audio/build.sh | 1 + packages/poppler/build.sh | 2 +- packages/qalc/build.sh | 1 + packages/ragel/build.sh | 1 + packages/squid/build.sh | 3 ++ packages/tasksh/build.sh | 1 + packages/taskwarrior/build.sh | 2 +- packages/termux-elf-cleaner/build.sh | 1 + packages/tesseract/build.sh | 1 + packages/texlive/build.sh | 2 +- packages/timewarrior/build.sh | 1 + .../timewarrior/src-libshared-src-Pig.cpp.patch | 12 ------- packages/unrar/build.sh | 1 + packages/utfdecode/build.sh | 1 + packages/vtutils/build.sh | 1 + 71 files changed, 165 insertions(+), 132 deletions(-) create mode 100644 packages/fish/src-wutil.cpp.patch create mode 100644 packages/ht/htapp.cc.patch create mode 100644 packages/libc++/build.sh delete mode 100644 packages/libgrpc/include-grpcpp-impl-codegen-config.h.patch delete mode 100644 packages/libllvm/tools-clang-lib-StaticAnalyzer-Checkers-ExprInspectionChecker.cpp.patch delete mode 100644 packages/libllvm/tools-llvm-xray-xray-converter.cc.patch delete mode 100644 packages/timewarrior/src-libshared-src-Pig.cpp.patch diff --git a/build-package.sh b/build-package.sh index 568211ad..325f1fb1 100755 --- 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. 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 92bac76f..95f55c58 100644 --- 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 . - $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 %%' 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 eedeac9b..48cc9082 100644 --- 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 d480cf19..cbc7f76f 100644 --- 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 3e42caae..c251e639 100644 --- 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 1854eae8..5a7141d7 100644 --- 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 b12ad08f..1bf54da3 100644 --- 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 7b4417d1..ef6d0ef5 100644 --- 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 50024194..9608a25a 100644 --- 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 index 00000000..58145d02 --- /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 891dd4db..d6ceb362 100755 --- 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 ec85d3ae..f60b562c 100644 --- 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 ff792f4d..56f6112c 100644 --- 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 e64ae5b8..f8e68508 100644 --- 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 8ba99c8e..7ad30939 100644 --- 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 f8ae42b9..c0d1a94e 100644 --- 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 a4125486..a0c3ce08 100644 --- 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 21b87b6d..e8e0eccd 100755 --- 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 index 00000000..b2a45bcb --- /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 5512191c..690b7f1a 100644 --- 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 4d056e3e..67528902 100644 --- 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 608f5466..e5c79a87 100644 --- 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 f6a16581..dad4ac06 100644 --- 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 index 00000000..904b10c7 --- /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 df781887..8b21a8db 100644 --- 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 6ad13b67..c8566a2d 100644 --- 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 57b46674..65ba5979 100644 --- 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 a1ee5d62..435de340 100644 --- 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 e3982c47..19d8f59f 100644 --- 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 acc153f4..199c128c 100644 --- 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 index c0d728ab..00000000 --- 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 87846369..80bb280f 100644 --- 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 ab751274..dad30676 100644 --- 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 da39a4f2..c61cb2a4 100644 --- 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 index fb6c1f1c..00000000 --- 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 index 9d0d3308..00000000 --- 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 45560aa0..caa6b91b 100755 --- 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 baa246f8..891c755e 100644 --- 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 311985d4..9e1ac87b 100644 --- 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 0ea272e5..e27c1d01 100644 --- 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 7ed7fe6d..cea71d8f 100644 --- 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 bf795130..f8e5ed58 100644 --- 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 8347dc46..af3ac397 100644 --- 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 ea95451a..320b11e2 100644 --- 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 989f8517..a1e7cbc4 100644 --- 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 67c24139..85316699 100644 --- 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 2c9b2e73..87095bd4 100644 --- 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 a3a90992..52531427 100644 --- 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 c77a06e6..22245b27 100644 --- 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 4e44ad0f..cfbdd77c 100644 --- 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 8a9c5efb..f5129f48 100644 --- 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 fc2996aa..74680a1f 100644 --- 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 9bee710c..ef79db32 100644 --- 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 7bbd14c5..7b9f10a9 100644 --- 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 20c04a6d..3cb594bb 100644 --- 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 2015ba7a..39b9f857 100644 --- 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 115ff747..6564bc4c 100644 --- 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 03a5176b..94802669 100644 --- 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 e339f63b..fdd72b34 100644 --- 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 59171677..0c047f33 100644 --- 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 6c81b036..a6ab7ce6 100644 --- 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 49653ab8..db044564 100644 --- 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 e9e6227a..67da95b1 100644 --- 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 2c948245..d5416a86 100644 --- 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 2342e1f2..cd27afec 100644 --- 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 68fd22fa..19cacb91 100644 --- 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 79bb4efd..8745a8f5 100644 --- 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 index 6469047f..00000000 --- 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 3c9a3a40..310fc07d 100644 --- 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 9a3030a3..9dd3d899 100644 --- 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 0436e060..e222278a 100644 --- 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 -- 2.11.0