[packages/less] - rediffed

[hawk]

commit 11fc8384976384684aeefd538a68b08f4dc5d539
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Sun Mar 21 01:03:29 2021 +0100

    - rediffed

 less-libtinfo.patch | 11 ++++++-----
 less-multilib.patch |  9 +++++----
 2 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/less-libtinfo.patch b/less-libtinfo.patch
index 9891742..b85bfc5 100644
--- a/less-libtinfo.patch
+++ b/less-libtinfo.patch
@@ -1,14 +1,15 @@
---- less-418/configure.ac.orig	2007-11-15 18:43:30.000000000 +0100
-+++ less-418/configure.ac	2008-01-22 21:04:46.715325810 +0100
-@@ -23,6 +23,7 @@
+diff -urNp -x '*.orig' less-563.org/configure.ac less-563/configure.ac
+--- less-563.org/configure.ac	2020-06-14 05:34:53.000000000 +0200
++++ less-563/configure.ac	2021-03-21 01:03:15.189335808 +0100
+@@ -23,6 +23,7 @@ AC_PROG_INSTALL
  AC_SYS_LARGEFILE
  
  # Checks for general libraries.
 +AC_CHECK_LIB(tinfow, tgoto, [have_tinfow=yes], [have_tinfow=no])
  AC_CHECK_LIB(tinfo, tgoto, [have_tinfo=yes], [have_tinfo=no])
+ AC_CHECK_LIB(tinfow, tgoto, [have_tinfow=yes], [have_tinfow=no])
  AC_CHECK_LIB(xcurses, initscr, [have_xcurses=yes], [have_xcurses=no])
- AC_CHECK_LIB(ncursesw, initscr, [have_ncursesw=yes], [have_ncursesw=no])
-@@ -55,6 +56,18 @@
+@@ -54,6 +55,18 @@ if test $curses_broken = 0; then
  
  # -- Try tinfo.
  if test "x$TERMLIBS" = x; then
diff --git a/less-multilib.patch b/less-multilib.patch
index 64510ac..c1c1a8b 100644
--- a/less-multilib.patch
+++ b/less-multilib.patch
@@ -1,6 +1,7 @@
---- less-418/Makefile.in.orig	2007-11-29 00:06:43.000000000 +0100
-+++ less-418/Makefile.in	2008-01-22 20:49:05.929713493 +0100
-@@ -53,13 +53,13 @@
+diff -urNp -x '*.orig' less-563.org/Makefile.in less-563/Makefile.in
+--- less-563.org/Makefile.in	2020-06-14 05:34:53.000000000 +0200
++++ less-563/Makefile.in	2021-03-21 01:02:59.370335808 +0100
+@@ -54,13 +54,13 @@ OBJ = \
  all: less$(EXEEXT) lesskey$(EXEEXT) lessecho$(EXEEXT)
  
  less$(EXEEXT): ${OBJ}
@@ -15,5 +16,5 @@
 -	${CC} ${LDFLAGS} -o $@ lessecho.${O} version.${O}
 +	${CC} ${CFLAGS} ${LDFLAGS} -o $@ lessecho.${O} version.${O}
  
- ${OBJ}: ${srcdir}/less.h ${srcdir}/funcs.h defines.h 
+ charset.${O}: compose.uni ubin.uni wide.uni
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/less.git/commitdiff/11fc8384976384684aeefd538a68b08f4dc5d539