diff --git a/packages/asciinema/build.sh b/packages/asciinema/build.sh index 3296936bf..112b4f4e7 100644 --- a/packages/asciinema/build.sh +++ b/packages/asciinema/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://asciinema.org/ TERMUX_PKG_DESCRIPTION="Record and share your terminal sessions, the right way" TERMUX_PKG_VERSION=2.0.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=7087b247dae36d04821197bc14ebd4248049592b299c9878d8953c025ac802e4 TERMUX_PKG_SRCURL=https://github.com/asciinema/asciinema/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes @@ -14,8 +15,8 @@ termux_step_make () { } termux_step_make_install () { - export PYTHONPATH=$TERMUX_PREFIX/lib/python3.6/site-packages/ - python3.6 setup.py install --prefix=$TERMUX_PREFIX --force + export PYTHONPATH=$TERMUX_PREFIX/lib/python3.7/site-packages/ + python3.7 setup.py install --prefix=$TERMUX_PREFIX --force } termux_step_post_massage () { diff --git a/packages/boost/build.sh b/packages/boost/build.sh index 09bd13f47..f0229a7e6 100644 --- a/packages/boost/build.sh +++ b/packages/boost/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://boost.org TERMUX_PKG_DESCRIPTION="Free peer-reviewed portable C++ source libraries" TERMUX_PKG_VERSION=1.68.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7 TERMUX_PKG_SRCURL=https://dl.bintray.com/boostorg/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2 TERMUX_PKG_BUILD_IN_SRC=yes @@ -17,7 +18,7 @@ termux_step_make_install() { ./bootstrap.sh echo "using clang : $TERMUX_ARCH : $CXX : -L/data/data/com.termux/files/usr/lib ; " >> project-config.jam - echo "using python : 3.6 : $TERMUX_PREFIX/bin/python3 : $TERMUX_PREFIX/include/python3.6m : $TERMUX_PREFIX/lib ;" >> project-config.jam + echo "using python : 3.7 : $TERMUX_PREFIX/bin/python3 : $TERMUX_PREFIX/include/python3.7m : $TERMUX_PREFIX/lib ;" >> project-config.jam if [ "$TERMUX_ARCH" = arm ] || [ "$TERMUX_ARCH" = aarch64 ]; then BOOSTARCH=arm @@ -45,6 +46,7 @@ termux_step_make_install() { architecture="$BOOSTARCH" \ abi="$BOOSTABI" \ address-model="$BOOSTAM" \ + boost.locale.icu=off \ binary-format=elf \ link=shared \ threading=multi \ @@ -64,5 +66,6 @@ termux_step_make_install() { cxxflags="$CXXFLAGS" \ link=shared \ threading=multi \ + boost.locale.icu=off \ stage } diff --git a/packages/profanity/build.sh b/packages/profanity/build.sh index aa3822cc5..ad1c94d08 100644 --- a/packages/profanity/build.sh +++ b/packages/profanity/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://profanity.im TERMUX_PKG_DESCRIPTION="Profanity is a console based XMPP client written in C using ncurses and libstrophe, inspired by Irssi" TERMUX_PKG_VERSION=0.5.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli" TERMUX_PKG_SRCURL=http://profanity.im/profanity-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e3513713e74ec3363fbdbac2919bdc17e249988780cc5a4589d1425807a7feb8 @@ -10,8 +10,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-python-plugins" TERMUX_PKG_BUILD_IN_SRC=yes termux_step_pre_configure() { - CPPFLAGS+=" -I$TERMUX_PREFIX/include/python3.6m" - LDFLAGS+=" -lpython3.6m" + CPPFLAGS+=" -I$TERMUX_PREFIX/include/python3.7m" + LDFLAGS+=" -lpython3.7m" } termux_step_post_configure() { diff --git a/packages/python/Lib-subprocess.py.patch b/packages/python/Lib-subprocess.py.patch new file mode 100644 index 000000000..bea4bbf23 --- /dev/null +++ b/packages/python/Lib-subprocess.py.patch @@ -0,0 +1,14 @@ +diff -u -r ../Python-3.7.1/Lib/subprocess.py ./Lib/subprocess.py +--- ../Python-3.7.1/Lib/subprocess.py 2018-10-20 06:04:19.000000000 +0000 ++++ ./Lib/subprocess.py 2018-10-20 20:17:50.157206343 +0000 +@@ -1389,9 +1389,7 @@ + args = list(args) + + if shell: +- # On Android the default shell is at '/system/bin/sh'. +- unix_shell = ('/system/bin/sh' if +- hasattr(sys, 'getandroidapilevel') else '/bin/sh') ++ unix_shell = ('@TERMUX_PREFIX@/bin/sh') + args = [unix_shell, "-c"] + args + if executable: + args[0] = executable diff --git a/packages/python/build.sh b/packages/python/build.sh index a4f769e91..c01429b95 100644 --- a/packages/python/build.sh +++ b/packages/python/build.sh @@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="Python 3 programming language intended to enable clear p TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libutil, libbz2, libsqlite, gdbm, ncurses-ui-libs, libcrypt, liblzma" # Python.h includes crypt.h: TERMUX_PKG_DEVPACKAGE_DEPENDS="libcrypt-dev" -_MAJOR_VERSION=3.6 -TERMUX_PKG_VERSION=${_MAJOR_VERSION}.6 -TERMUX_PKG_REVISION=2 -TERMUX_PKG_SHA256=d79bc15d456e73a3173a2938f18a17e5149c850ebdedf84a78067f501ee6e16f +_MAJOR_VERSION=3.7 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1 +TERMUX_PKG_SHA256=fa7e2b8e8c9402f192ad56dc4f814089d1c4466c97d780f5e5acc02c04243d6d TERMUX_PKG_SRCURL=https://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz # The flag --with(out)-pymalloc (disable/enable specialized mallocs) is enabled by default and causes m suffix versions of python. diff --git a/packages/python/setup.py.patch b/packages/python/setup.py.patch index fcb0cf278..d514538f9 100644 --- a/packages/python/setup.py.patch +++ b/packages/python/setup.py.patch @@ -1,26 +1,6 @@ diff -u -r ../Python-3.5.0/setup.py ./setup.py --- ../Python-3.5.0/setup.py 2015-09-13 07:41:26.000000000 -0400 +++ ./setup.py 2015-11-07 17:31:45.332321322 -0500 -@@ -592,7 +592,8 @@ - libraries=math_libs) ) - - # time libraries: librt may be needed for clock_gettime() -- time_libs = [] -+ # math_libs is needed by floatsleep() -+ time_libs = list(math_libs) - lib = sysconfig.get_config_var('TIMEMODULE_LIB') - if lib: - time_libs.append(lib) -@@ -651,7 +652,8 @@ - missing.append('spwd') - - # select(2); not on ancient System V -- exts.append( Extension('select', ['selectmodule.c']) ) -+ # selectmodule.c calls the ceil(3) math function -+ exts.append( Extension('select', ['selectmodule.c'], libraries=math_libs) ) - - # Fred Drake's interface to the Python parser - exts.append( Extension('parser', ['parsermodule.c']) ) @@ -661,7 +663,8 @@ # Lance Ellinghaus's syslog module diff --git a/packages/python/subprocess.py.patch b/packages/python/subprocess.py.patch deleted file mode 100644 index 0fb6a5049..000000000 --- a/packages/python/subprocess.py.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../Python-3.4.1/Lib/subprocess.py ./Lib/subprocess.py ---- ../Python-3.4.1/Lib/subprocess.py 2014-05-19 07:19:38.000000000 +0200 -+++ ./Lib/subprocess.py 2014-06-04 11:31:48.708843737 +0200 -@@ -1344,7 +1344,7 @@ - args = list(args) - - if shell: -- args = ["/bin/sh", "-c"] + args -+ args = ["@TERMUX_PREFIX@/bin/sh", "-c"] + args - if executable: - args[0] = executable - diff --git a/packages/ranger/build.sh b/packages/ranger/build.sh index 257fe3cee..9734e8b15 100644 --- a/packages/ranger/build.sh +++ b/packages/ranger/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://ranger.github.io/ TERMUX_PKG_DESCRIPTION="File manager with VI key bindings" TERMUX_PKG_VERSION=1.9.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=49a2d8dc5fa7b1c0cac0fa72d4ad704fc7107dee36cb9feb325a42754774d363 TERMUX_PKG_SRCURL=https://github.com/ranger/ranger/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="python, file" @@ -12,7 +13,7 @@ termux_step_make() { } termux_step_make_install() { - python3.6 setup.py install --prefix=$TERMUX_PREFIX --force + python3.7 setup.py install --prefix=$TERMUX_PREFIX --force } termux_step_post_massage() { diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh index e1b769c08..eb07de4aa 100755 --- a/packages/vim-python/build.sh +++ b/packages/vim-python/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_DEPENDS="ncurses, vim-runtime, python" # vim should only be updated every 50 releases on multiples of 50. # Update both vim and vim-python to the same version in one PR. TERMUX_PKG_VERSION=8.1.0450 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=19e30d255f429e1ae6a70d1fe08028e1fd14b257ebac7d4470ed1dbed5142648 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" @@ -37,15 +38,15 @@ TERMUX_PKG_CONFFILES="share/vim/vimrc" TERMUX_PKG_CONFLICTS="vim" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" vi_cv_path_python3_pfx=$TERMUX_PREFIX -vi_cv_var_python3_version=3.6 +vi_cv_var_python3_version=3.7 --enable-python3interp ---with-python3-config-dir=$TERMUX_PREFIX/lib/python3.6/config-3.6m/ +--with-python3-config-dir=$TERMUX_PREFIX/lib/python3.7/config-3.7m/ " TERMUX_PKG_DESCRIPTION+=" - with python support" # Remove share/vim/vim81 which is in vim-runtime built as a subpackage of vim: TERMUX_PKG_RM_AFTER_INSTALL+=" share/vim/vim81" termux_step_pre_configure() { - CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python3.6m" + CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python3.7m" } termux_step_pre_configure () { diff --git a/packages/weechat/build.sh b/packages/weechat/build.sh index 0eeb963d8..4d6c684f7 100755 --- a/packages/weechat/build.sh +++ b/packages/weechat/build.sh @@ -1,8 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://weechat.org/ TERMUX_PKG_DESCRIPTION="Fast, light and extensible IRC chat client" -TERMUX_PKG_VERSION=2.2 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=8f621d638dc93db27a7865b6c4a67c14376bbd33315579de3998f0e30e84965c +TERMUX_PKG_VERSION=2.3 +TERMUX_PKG_SHA256=3c5919c23feb40368fae08f3581448c707e1bdb14c835c06c31b78ebadbb2456 TERMUX_PKG_SRCURL=https://www.weechat.org/files/src/weechat-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_DEPENDS="ncurses, libgcrypt, libcurl, libgnutls, libandroid-support" TERMUX_PKG_RM_AFTER_INSTALL="bin/weechat-curses share/man/man1/weechat-headless.1 share/icons" diff --git a/packages/weechat/cmake-FindPython.cmake.patch b/packages/weechat/cmake-FindPython.cmake.patch index 6f9d7fa21..0b91d4dff 100644 --- a/packages/weechat/cmake-FindPython.cmake.patch +++ b/packages/weechat/cmake-FindPython.cmake.patch @@ -64,9 +64,9 @@ diff -u -r ../weechat-2.2/cmake/FindPython.cmake ./cmake/FindPython.cmake - endif() - endif() + set(PYTHON_EXECUTABLE "@TERMUX_PREFIX@/bin/python") -+ set(PYTHON_INCLUDE_PATH "@TERMUX_PREFIX@/include/python3.6m") ++ set(PYTHON_INCLUDE_PATH "@TERMUX_PREFIX@/include/python3.7m") + set(PYTHON_LIBRARY "@TERMUX_PREFIX@/lib") -+ set(PYTHON_LFLAGS "-Xlinker -export-dynamic -lpython3.6m") ++ set(PYTHON_LFLAGS "-Xlinker -export-dynamic -lpython3.7m") + set(PYTHON_FOUND TRUE) mark_as_advanced( diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index 29b449d88..c1583b979 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -20,7 +20,7 @@ PACKAGES+=" libglib2.0-dev" # Provides 'glib-genmarshal' which the glib build us PACKAGES+=" libtool-bin" PACKAGES+=" libncurses5-dev" # Used by mariadb for host build part. PACKAGES+=" lzip" -PACKAGES+=" python3.6" +PACKAGES+=" python3.7" PACKAGES+=" tar" PACKAGES+=" unzip" PACKAGES+=" m4"