From 11b87c4834101544845642afac6b10813381697d Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Thu, 25 Jul 2019 02:06:06 +0300 Subject: [PATCH] ncurses: enable termcap support + more compatibility symlinks libtinfo can be actually a symlink to libncursesw.so --- packages/ncurses/build.sh | 20 +++++++++++--------- packages/ncurses/ncurses-utils.subpackage.sh | 4 ++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/packages/ncurses/build.sh b/packages/ncurses/build.sh index 144c79409..47c3a5c04 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=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SHA256=(fdbd39234fc7e7f8e5fd08d2329014e085fa5c8d0a9cc9a919e94bbc9d411c0e e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd 3ae9ebef28aad081c6c11351f086776e2fd9547563b2f900732b41c376bec05a) @@ -26,6 +26,7 @@ ac_cv_header_locale_h=no --enable-ext-mouse --enable-overwrite --enable-pc-files +--enable-termcap --enable-widec --mandir=$TERMUX_PREFIX/share/man --without-ada @@ -35,16 +36,13 @@ ac_cv_header_locale_h=no --without-static --without-tests --with-shared +--with-termpath=$TERMUX_PREFIX/etc/termcap:$TERMUX_PREFIX/share/misc/termcap " TERMUX_PKG_INCLUDE_IN_DEVPACKAGE=" share/man/man1/ncursesw6-config.1* bin/ncursesw6-config " TERMUX_PKG_RM_AFTER_INSTALL=" -bin/captoinfo -bin/infotocap -share/man/man1/captoinfo.1* -share/man/man1/infotocap.1* share/man/man5 share/man/man7 " @@ -63,10 +61,14 @@ termux_step_post_make_install() { done (cd pkgconfig; ln -sf ${lib}w.pc $lib.pc) done - # some packages want libcurses while building/compiling - rm -f libcurses.so* - for file in libncurses.so*; do - ln -s $file ${file/libn/lib} + + # Compatibility symlinks (libcurses, libtic, libtinfo) + for lib in curses tic tinfo; do + rm -f lib${lib}.so* + ln -sfr libncursesw.so.${TERMUX_PKG_VERSION:0:3} lib${lib}.so.${TERMUX_PKG_VERSION:0:3} + ln -sfr libncursesw.so.${TERMUX_PKG_VERSION:0:3} lib${lib}.so.${TERMUX_PKG_VERSION:0:1} + ln -sfr libncursesw.so.${TERMUX_PKG_VERSION:0:3} lib${lib}.so + (cd pkgconfig; ln -sfr ncursesw.pc ${lib}.pc) done # Some packages want these: diff --git a/packages/ncurses/ncurses-utils.subpackage.sh b/packages/ncurses/ncurses-utils.subpackage.sh index 0f418c09d..40f88c3b2 100644 --- a/packages/ncurses/ncurses-utils.subpackage.sh +++ b/packages/ncurses/ncurses-utils.subpackage.sh @@ -1,9 +1,13 @@ TERMUX_SUBPKG_INCLUDE=" +bin/captoinfo +bin/infotocap bin/toe bin/tput bin/tabs bin/infocmp bin/tic +share/man/man1/captoinfo.1.gz +share/man/man1/infotocap.1.gz share/man/man1/toe.1.gz share/man/man1/tput.1.gz share/man/man1/tabs.1.gz