less: bump version

This commit is contained in:
Jérôme Duval
2024-12-01 19:05:36 +01:00
parent bbc8c2c1c1
commit 739c561dae
2 changed files with 15 additions and 46 deletions

View File

@@ -10,7 +10,7 @@ COPYRIGHT="1984-2023 Mark Nudelman"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="http://www.greenwoodsoftware.com/less/less-$portVersion.tar.gz"
CHECKSUM_SHA256="2911b5432c836fa084c8a2e68f6cd6312372c026a58faaa98862731c8b6052e8"
CHECKSUM_SHA256="2819f55564d86d542abbecafd82ff61e819a3eec967faa36cd3e68f1596a44b8"
PATCHES="less-$portVersion.patchset"
ADDITIONAL_FILES="sysless.in"

View File

@@ -1,4 +1,4 @@
From 42981d3f93f7163f1b2f29c6931e74bc008e9285 Mon Sep 17 00:00:00 2001
From 1d5fdb8caaa69b2f09eb4dc3aed29fb27d180813 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 29 Jun 2017 17:06:55 +0200
Subject: import fix from previous version
@@ -9,10 +9,10 @@ Content-Transfer-Encoding: 8bit
Co-authored-by: Joachim Mairböck <j.mairboeck@gmail.com>
diff --git a/cmdbuf.c b/cmdbuf.c
index c813283..dac4c98 100644
index 73dd297..027f261 100644
--- a/cmdbuf.c
+++ b/cmdbuf.c
@@ -1356,12 +1356,19 @@ static char * histfile_find(int must_exist)
@@ -1373,12 +1373,19 @@ static char * histfile_find(lbool must_exist)
name = dirfile(lgetenv("XDG_STATE_HOME"), &LESSHISTFILE[1], must_exist);
if (name == NULL)
{
@@ -33,10 +33,10 @@ index c813283..dac4c98 100644
if (name == NULL)
name = dirfile(lgetenv("XDG_DATA_HOME"), &LESSHISTFILE[1], must_exist);
diff --git a/configure.ac b/configure.ac
index 37dc496..f4d003b 100644
index 4c14de0..48474dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -582,9 +582,15 @@ AH_TOP([
@@ -581,9 +581,15 @@ AH_TOP([
* LESSHISTFILE is the filename of the history file
* (in the HOME directory).
*/
@@ -53,10 +53,10 @@ index 37dc496..f4d003b 100644
#define LESSHISTFILE ".lesshst"
diff --git a/filename.c b/filename.c
index a8726dc..8efcccb 100644
index 219eac7..014179a 100644
--- a/filename.c
+++ b/filename.c
@@ -253,10 +253,21 @@ public char * homefile(char *filename)
@@ -278,10 +278,21 @@ public char * homefile(constant char *filename)
{
char *pathname;
@@ -79,10 +79,10 @@ index a8726dc..8efcccb 100644
/* Try $INIT/filename. */
pathname = dirfile(lgetenv("INIT"), filename, 1);
diff --git a/less.h b/less.h
index 2ba8c35..080daaf 100644
index cc63951..7e22f41 100644
--- a/less.h
+++ b/less.h
@@ -111,6 +111,11 @@ typedef unsigned long uintmax;
@@ -104,6 +104,11 @@ typedef unsigned long uintmax;
#include <floss.h>
#endif
@@ -95,7 +95,7 @@ index 2ba8c35..080daaf 100644
#include <io.h>
#endif
diff --git a/lesskey.c b/lesskey.c
index 61311c7..14b6c2c 100644
index 7f92522..502cdc9 100644
--- a/lesskey.c
+++ b/lesskey.c
@@ -87,6 +87,11 @@
@@ -107,11 +107,11 @@ index 61311c7..14b6c2c 100644
+#include <StorageDefs.h>
+#endif
+
char fileheader[] = {
constant char fileheader[] = {
C0_LESSKEY_MAGIC,
C1_LESSKEY_MAGIC,
@@ -159,8 +164,19 @@ char * homefile(char *filename)
char *p;
@@ -159,8 +164,19 @@ char * homefile(constant char *filename)
constant char *p;
char *pathname;
+#ifdef __HAIKU__
@@ -131,36 +131,5 @@ index 61311c7..14b6c2c 100644
else if ((p = getenv("INIT")) != NULL && *p != '\0')
pathname = mkpathname(p, filename);
--
2.43.2
From 52be1da870e69f51ccd06b59683285381487bed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Fri, 12 Apr 2024 16:35:13 +0200
Subject: gcc2 build fix
diff --git a/command.c b/command.c
index f5ee7ed..e38be19 100644
--- a/command.c
+++ b/command.c
@@ -713,6 +713,7 @@ static int mca_char(int c)
/* Incremental search: do a search after every input char. */
int st = (search_type & (SRCH_FORW|SRCH_BACK|SRCH_NO_MATCH|SRCH_NO_REGEX|SRCH_NO_MOVE|SRCH_WRAP|SRCH_SUBSEARCH_ALL));
char *pattern = get_cmdbuf();
+ int save_updown_match;
if (pattern == NULL)
return (MCA_MORE);
/*
@@ -720,7 +721,7 @@ static int mca_char(int c)
* reinits it. That breaks history scrolling.
* {{ This is ugly. mca_search probably shouldn't call set_mlist. }}
*/
- int save_updown_match = updown_match;
+ save_updown_match = updown_match;
cmd_exec();
if (*pattern == '\0')
{
--
2.43.2
2.45.2