diff options
author | 2023-08-17 21:17:19 +0200 | |
---|---|---|
committer | 2023-08-17 21:17:19 +0200 | |
commit | 1a2152bd73d9b813c4777be29bb61b7da8db28ec (patch) | |
tree | 92b26c7e52b28d055e23b9fdec68a2d0696bce69 | |
parent | Update systemd-tmpfiles deps. Thanks to https://github.com/andrei-mihaila. (diff) | |
download | mv-1a2152bd73d9b813c4777be29bb61b7da8db28ec.tar.gz mv-1a2152bd73d9b813c4777be29bb61b7da8db28ec.tar.bz2 mv-1a2152bd73d9b813c4777be29bb61b7da8db28ec.zip |
sys-apps/less: Version bump
Signed-off-by: Martin Väth <martin@mvath.de>
-rw-r--r-- | metadata/pkg_desc_index | 4 | ||||
-rw-r--r-- | sys-apps/less/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/less/files/less-633-tinfow.patch | 52 | ||||
-rw-r--r-- | sys-apps/less/files/less-643-lesstest-pkg-config.patch | 34 | ||||
-rw-r--r-- | sys-apps/less/less-643.ebuild (renamed from sys-apps/less/less-633-r2.ebuild) | 13 |
5 files changed, 43 insertions, 62 deletions
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 4c33b878..0e6fd379 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -98,7 +98,7 @@ net-print/foo2zjs 20200221: Support for printing to ZjStream-based printers sci-geosciences/googleearth 7.1.8.3036-r4 7.3.0.3832-r4 7.3.4-r2: A 3D interface to the planet sci-mathematics/reduce 20141130-r3 20190413: A general-purpose computer algebra system sys-apps/cpi 3.2: A wrapper for cp -i -a, making use of diff -sys-apps/less 633-r2: Excellent text file viewer, optionally with additional selection feature +sys-apps/less 643: Excellent text file viewer, optionally with additional selection feature sys-apps/man 1.6g-r4: Standard commands to read man pages sys-apps/openrc-wrapper 2.4: Use openrc init scripts with systemd or other init systems sys-apps/paxopen 1.2: A wrapper script to set PAX kernel variables to an insecure/safe state @@ -113,7 +113,7 @@ sys-fs/encfs 1.9.6_alpha0: An implementation of encrypted filesystem in user-spa sys-fs/squash_dir 13.14-r1: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist sys-fs/squashfs-tools 99999999: Tool for creating compressed filesystem type squashfs sys-fs/squashfuse 0.1.104: FUSE filesystem to mount squashfs archives -sys-fs/squashmount 22.1-r1: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist +sys-fs/squashmount 22.1-r2: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist sys-kernel/cfcfg 1.0: Yet another Linux kernel configuration comparator sys-kernel/kccmp 0.3-r3: A simple tool for comparing two linux kernel .config files sys-kernel/kconfig-hardened-check 0.6.1 99999999: A script for checking the hardening options in the Linux kernel config diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index 5205b4ad..40ed82a5 100644 --- a/sys-apps/less/Manifest +++ b/sys-apps/less/Manifest @@ -1,2 +1,2 @@ -DIST less-633.tar.gz 375733 BLAKE2B e9df180794af365f86734c6b8fde766c1bba42b111717ee5e1cf11001fc7ec3d78910db9bb7c51a76816086f599808b1b60f514011ec40e37650d6bc4f8b3d5c SHA512 a29aaf72abca07fb29d12f218bbd422a39e3898b3d53e8dbd5265ae47ecf68b88c3381aa3a9bf7caa8db1e2d8e2c138b333f0d69fddd4cf014e39118c53f7fb1 +DIST less-643.tar.gz 592291 BLAKE2B 6dc60dc2e8db05afdae466877a1d26a3008ff5378bbbf2fbdf9efc4f87c0fcfde5703d44a24d4355c98d3a5f438bdb51173150f2a69f801d9c8e4a7401d71b53 SHA512 6a324ac54e22429ac652dc303bc1fe48933555d1cbf8ad7ecf345940910c014fef9551a3219743cfb7115e356b5841ae97d6ce62e7a1ba1e3300d243efca34d9 DIST less-select-2.15.tar.gz 32374 BLAKE2B f135d80cdae38f84309754863ae3736f574e5476414b7b835a8d2f9c3ff6c8baf92ece154763e61e9f0a2133928bc8f7462b209e9508ac2dad2ca454eb32aecf SHA512 1284d11b9098cbdc5243886ffdc29cf998853fd998ef6a6e1ef8af9cdcf89175bc7573b836afaab8dc06a51e9018cdd07bc9011c994bc7fd63965d3bff46defd diff --git a/sys-apps/less/files/less-633-tinfow.patch b/sys-apps/less/files/less-633-tinfow.patch deleted file mode 100644 index 82ea458c..00000000 --- a/sys-apps/less/files/less-633-tinfow.patch +++ /dev/null @@ -1,52 +0,0 @@ -https://github.com/gwsw/less/pull/403 - -From 23000c286773af153a5743bc923465707b87613b Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -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/files/less-643-lesstest-pkg-config.patch b/sys-apps/less/files/less-643-lesstest-pkg-config.patch new file mode 100644 index 00000000..cd5f6f30 --- /dev/null +++ b/sys-apps/less/files/less-643-lesstest-pkg-config.patch @@ -0,0 +1,34 @@ +https://github.com/gwsw/less/pull/412 + +From 5d884b29fb11c2686b804428f483f4607334eb68 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 13 Aug 2023 03:57:25 +0100 +Subject: [PATCH] lesstest: use pkg-config to find ncurses libraries + +Fails to build with split tinfo otherwise like: +``` + +x86_64-pc-linux-gnu-gcc -O2 -pipe -march=native -fdiagnostics-color=always -frecord-gcc-switches -Wreturn-type -ggdb3 -Wl,-O1 -Wl,--as-needed -Wl,--defsym=__gentoo_check_ldflags__=0 -Wl,-z,pack-relative-relocs -ggdb3 -o lesstest display.o env.o lesstest.o parse.o pipeline.o log.o run.o term.o wchar.o -lncurses +/usr/lib/gcc/x86_64-pc-linux-gnu/13/../../../../x86_64-pc-linux-gnu/bin/ld: display.o: in function `display_screen': +/var/tmp/portage/sys-apps/less-643/work/less-643/lesstest/display.c:86:(.text+0x2e0): undefined reference to `tgoto' +/usr/lib/gcc/x86_64-pc-linux-gnu/13/../../../../x86_64-pc-linux-gnu/bin/ld: term.o: in function `setup_mode': +/var/tmp/portage/sys-apps/less-643/work/less-643/lesstest/term.c:83:(.text+0x18): undefined reference to `tgetstr' +[...] +``` + +Going forward, we may want to just add a Makefile.in which configure handles +to the lesstest subdir. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/lesstest/Makefile ++++ b/lesstest/Makefile +@@ -1,7 +1,8 @@ + CC ?= gcc + CFLAGS ?= -Wall -O2 + LDFLAGS ?= +-TERMLIB = -lncurses ++PKG_CONFIG ?= pkg-config ++TERMLIB ?= $(shell ${PKG_CONFIG} --libs ncurses) + srcdir ?= . + + all: lesstest lt_screen diff --git a/sys-apps/less/less-633-r2.ebuild b/sys-apps/less/less-643.ebuild index a314c3e7..d1069ed9 100644 --- a/sys-apps/less/less-633-r2.ebuild +++ b/sys-apps/less/less-643.ebuild @@ -5,7 +5,7 @@ EAPI=8 WANT_AUTOMAKE=none WANT_LIBTOOL=none -inherit autotools flag-o-matic optfeature +inherit autotools flag-o-matic optfeature toolchain-funcs DESCRIPTION="Excellent text file viewer, optionally with additional selection feature" PATCHN="less-select" @@ -22,10 +22,8 @@ RESTRICT="mirror" LICENSE="|| ( GPL-3 BSD-2 )" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+lesspipe +less-select pcre original-gentoo source" -# As of 623_beta, lesstest is not included in dist tarballs -# https://github.com/gwsw/less/issues/344 -RESTRICT="test" +IUSE="+lesspipe +less-select pcre original-gentoo source test" +RESTRICT="test !test? ( test )" DEPEND=" >=app-misc/editor-wrapper-3 @@ -36,9 +34,10 @@ RDEPEND="${DEPEND} less-select? ( dev-lang/perl )" # || ( >=dev-lang/perl-5.10.1 >=virtual/perl-File-Temp-0.19 ) PDEPEND="lesspipe? ( app-text/lesspipe )" +BDEPEND="test? ( virtual/pkgconfig )" PATCHES=( - "${FILESDIR}"/${PN}-633-tinfow.patch + "${FILESDIR}"/${PN}-643-lesstest-pkg-config.patch ) pkg_setup() { @@ -80,7 +79,7 @@ src_compile() { } src_test() { - emake check VERBOSE=1 + emake check VERBOSE=1 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" } src_install() { |