commit: 4835fedb1257d15d871c885e19b8fecfff78abfd Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jul 17 22:02:52 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jul 17 22:03:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4835fedb
sys-apps/less: fix tinfo linkage, add LFS Thanks to ionen and kerframil for doing the hard work here wrt tinfo, just doing the then-obvious patch as a result. Also, while at it, enable large file support. Closes: https://bugs.gentoo.org/896316 Closes: https://bugs.gentoo.org/910430 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/less/files/less-633-tinfow.patch | 52 ++++++++++++++++++++++ .../less/{less-9999.ebuild => less-633-r2.ebuild} | 8 +++- sys-apps/less/less-9999.ebuild | 8 +++- 3 files changed, 66 insertions(+), 2 deletions(-) diff --git a/sys-apps/less/files/less-633-tinfow.patch b/sys-apps/less/files/less-633-tinfow.patch new file mode 100644 index 000000000000..82ea458cd008 --- /dev/null +++ b/sys-apps/less/files/less-633-tinfow.patch @@ -0,0 +1,52 @@ +https://github.com/gwsw/less/pull/403 + +From 23000c286773af153a5743bc923465707b87613b Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +Date: Mon, 17 Jul 2023 22:58:27 +0100 +Subject: [PATCH] configure.ac: Check for tinfow before tinfo + +We currently check for ncursesw > ncurses and then tinfo > tinfow. This means +we can get a mismatch of ncursesw + tinfo, instead of the correct ncursesw + tinfow. + +Swap the order so we check for ncursesw first (before other ncurses variants) +and then tinfow first (before other tinfo variants). + +This is needed anyway for correctness, but also needed for certain terminfos +to work correctly with recent ncurses. + +A better fix would be to use pkg-config first which handles this correctly +and would include the appropriate -ltinfo* in the libraries list for -lncurses*, +but not doing that for now. + +Bug: https://bugs.gentoo.org/910430 +--- a/configure.ac ++++ b/configure.ac +@@ -63,10 +63,10 @@ fi + + if test $curses_broken = 0; then + +-# -- Try tinfo. ++# -- Try tinfow. + if test "x$TERMLIBS" = x; then +- if test $have_tinfo = yes; then +- TERMLIBS="-ltinfo" ++ if test $have_tinfow = yes; then ++ TERMLIBS="-ltinfow" + SAVE_LIBS=$LIBS + LIBS="$LIBS $TERMLIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[$include_termcap_h]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) +@@ -75,10 +75,10 @@ if test "x$TERMLIBS" = x; then + fi + fi + +-# -- Try tinfow. ++# -- Try tinfo. + if test "x$TERMLIBS" = x; then +- if test $have_tinfow = yes; then +- TERMLIBS="-ltinfow" ++ if test $have_tinfo = yes; then ++ TERMLIBS="-ltinfo" + SAVE_LIBS=$LIBS + LIBS="$LIBS $TERMLIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[$include_termcap_h]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) + diff --git a/sys-apps/less/less-9999.ebuild b/sys-apps/less/less-633-r2.ebuild similarity index 94% copy from sys-apps/less/less-9999.ebuild copy to sys-apps/less/less-633-r2.ebuild index c6edffba45d8..5d22949f4f80 100644 --- a/sys-apps/less/less-9999.ebuild +++ b/sys-apps/less/less-633-r2.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 fi -inherit autotools optfeature +inherit autotools flag-o-matic optfeature # Releases are usually first a beta then promoted to stable if no # issues were found. Upstream explicitly ask "to not generally distribute" @@ -42,6 +42,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-633-tinfow.patch +) + src_prepare() { default # Per upstream README to prepare live build @@ -52,6 +56,8 @@ src_prepare() { } src_configure() { + append-lfs-flags # bug #896316 + local myeconfargs=( --with-regex=$(usex pcre pcre2 posix) --with-editor="${EPREFIX}"/usr/libexec/editor diff --git a/sys-apps/less/less-9999.ebuild b/sys-apps/less/less-9999.ebuild index c6edffba45d8..5d22949f4f80 100644 --- a/sys-apps/less/less-9999.ebuild +++ b/sys-apps/less/less-9999.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 fi -inherit autotools optfeature +inherit autotools flag-o-matic optfeature # Releases are usually first a beta then promoted to stable if no # issues were found. Upstream explicitly ask "to not generally distribute" @@ -42,6 +42,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-633-tinfow.patch +) + src_prepare() { default # Per upstream README to prepare live build @@ -52,6 +56,8 @@ src_prepare() { } src_configure() { + append-lfs-flags # bug #896316 + local myeconfargs=( --with-regex=$(usex pcre pcre2 posix) --with-editor="${EPREFIX}"/usr/libexec/editor
