diff --git a/packages/ncurses/build.sh b/packages/ncurses/build.sh index f581e66fb..144c79409 100644 --- a/packages/ncurses/build.sh +++ b/packages/ncurses/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=(6.1.20190511 9.22 15) -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SHA256=(fdbd39234fc7e7f8e5fd08d2329014e085fa5c8d0a9cc9a919e94bbc9d411c0e e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd 3ae9ebef28aad081c6c11351f086776e2fd9547563b2f900732b41c376bec05a) @@ -12,6 +12,10 @@ TERMUX_PKG_SRCURL=(https://dl.bintray.com/termux/upstream/ncurses-${TERMUX_PKG_V https://fossies.org/linux/misc/rxvt-unicode-${TERMUX_PKG_VERSION[1]}.tar.bz2 https://github.com/thestinger/termite/archive/v${TERMUX_PKG_VERSION[2]}.tar.gz) +# tset/reset/clear are moved to package 'ncurses'. +TERMUX_PKG_BREAKS="ncurses-utils (<< 6.1.20190511-4)" +TERMUX_PKG_REPLACES="ncurses-utils (<< 6.1.20190511-4)" + # --without-normal disables static libraries: # --disable-stripping to disable -s argument to install which does not work when cross compiling: TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/ncurses/ncurses-utils.subpackage.sh b/packages/ncurses/ncurses-utils.subpackage.sh index 5e1d9b241..0f418c09d 100644 --- a/packages/ncurses/ncurses-utils.subpackage.sh +++ b/packages/ncurses/ncurses-utils.subpackage.sh @@ -1,19 +1,13 @@ TERMUX_SUBPKG_INCLUDE=" bin/toe bin/tput -bin/clear -bin/tset bin/tabs bin/infocmp -bin/reset bin/tic share/man/man1/toe.1.gz share/man/man1/tput.1.gz -share/man/man1/clear.1.gz -share/man/man1/tset.1.gz share/man/man1/tabs.1.gz share/man/man1/infocmp.1.gz -share/man/man1/reset.1.gz share/man/man1/tic.1.gz " TERMUX_SUBPKG_DESCRIPTION="Tools for working with terminals"