commit c0acaffe6f89715c9968e725dd01a7b353ebacdc
Author: Jakub Bogusz <[email protected]>
Date: Sat Aug 24 21:27:10 2024 +0200
- updated to 661
less-multilib.patch | 15 +++++++--------
less-shell.patch | 10 +++++-----
less.spec | 4 ++--
3 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/less.spec b/less.spec
index c40105a..dcf4839 100644
--- a/less.spec
+++ b/less.spec
@@ -8,13 +8,13 @@ Summary(ru.UTF-8): Программа для просмотра текстовы
Summary(tr.UTF-8): Metin dosyası görüntüleyici - more benzeri
Summary(uk.UTF-8): Програма для перегляду текстових файлів схожа на more,
але краща
Name: less
-Version: 643
+Version: 661
Release: 1
License: GPL v3+
Group: Applications/Text
#Source0Download: http://www.greenwoodsoftware.com/less/download.html
Source0: https://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
-# Source0-md5: cf05e2546a3729492b944b4874dd43dd
+# Source0-md5: 44f54b6313c5d71fa1ac224d8d84766a
Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 07bb76556307ab4cecba7abd3933bad2
Source2: %{name}echo.1
diff --git a/less-multilib.patch b/less-multilib.patch
index 0c22dc5..2cea39e 100644
--- a/less-multilib.patch
+++ b/less-multilib.patch
@@ -1,7 +1,6 @@
-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 = \
+--- less-661/Makefile.in.orig 2024-08-24 20:28:01.122724956 +0200
++++ less-661/Makefile.in 2024-08-24 21:24:31.187692732 +0200
+@@ -62,13 +62,13 @@ endif
all: less$(EXEEXT) lesskey$(EXEEXT) lessecho$(EXEEXT)
less$(EXEEXT): ${OBJ}
@@ -9,12 +8,12 @@ diff -urNp -x '*.orig' less-563.org/Makefile.in
less-563/Makefile.in
+ ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJ} ${LIBS}
lesskey$(EXEEXT): lesskey.${O} lesskey_parse.${O} xbuf.${O} version.${O}
-- ${CC} ${LDFLAGS} -o $@ lesskey.${O} lesskey_parse.${O} xbuf.${O}
version.${O}
-+ ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lesskey.${O} lesskey_parse.${O}
xbuf.${O} version.${O}
+- ${CC} ${LDFLAGS} -o $@ lesskey.${O} lesskey_parse.${O} xbuf.${O}
version.${O} ${LIBS}
++ ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lesskey.${O} lesskey_parse.${O}
xbuf.${O} version.${O} ${LIBS}
lessecho$(EXEEXT): lessecho.${O} version.${O}
-- ${CC} ${LDFLAGS} -o $@ lessecho.${O} version.${O}
-+ ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lessecho.${O} version.${O}
+- ${CC} ${LDFLAGS} -o $@ lessecho.${O} version.${O} ${LIBS}
++ ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lessecho.${O} version.${O} ${LIBS}
charset.${O}: compose.uni ubin.uni wide.uni
diff --git a/less-shell.patch b/less-shell.patch
index 835189a..ae8b43a 100644
--- a/less-shell.patch
+++ b/less-shell.patch
@@ -1,11 +1,11 @@
---- less-481/filename.c.orig 2015-10-30 20:54:28.100188419 +0100
-+++ less-481/filename.c 2015-10-30 21:16:14.293494525 +0100
-@@ -582,37 +582,7 @@
+--- less-661/filename.c.orig 2024-08-24 20:24:56.143727073 +0200
++++ less-661/filename.c 2024-08-24 20:27:41.742829946 +0200
+@@ -550,37 +550,7 @@ static FILE * shellcmd(constant char *cm
{
FILE *fd;
-#if HAVE_SHELL
-- char *shell;
+- constant char *shell;
-
- shell = lgetenv("SHELL");
- if (!isnullenv(shell))
@@ -23,7 +23,7 @@
- fd = popen(cmd, "r");
- } else
- {
-- int len = (int) (strlen(shell) + strlen(esccmd) + 5);
+- size_t len = strlen(shell) + strlen(esccmd) + 5;
- scmd = (char *) ecalloc(len, sizeof(char));
- SNPRINTF3(scmd, len, "%s %s %s", shell,
shell_coption(), esccmd);
- free(esccmd);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/less.git/commitdiff/c0acaffe6f89715c9968e725dd01a7b353ebacdc
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
