summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2020-11-15 15:08:12 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2020-11-22 01:14:26 +0700
commiteab6ddbb153fe5e3774fc98f6181d54f82e23a9f (patch)
tree44e6d22725e254e282b1fe5aa9202ba9ff44d350
parent134afdf394888f348d68edadb43eb4cac3c0c67b (diff)
downloadslackbuilds-eab6ddbb153fe5e3774fc98f6181d54f82e23a9f.tar.gz
system/lv: Add patches, BUILD=2.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--system/lv/lv.SlackBuild8
-rw-r--r--system/lv/patches/change-maximum-height-to-144.patch17
-rw-r--r--system/lv/patches/series2
-rw-r--r--system/lv/patches/shows-the-filename-only.diff25
4 files changed, 50 insertions, 2 deletions
diff --git a/system/lv/lv.SlackBuild b/system/lv/lv.SlackBuild
index 87c7446e95..eb8c06c100 100644
--- a/system/lv/lv.SlackBuild
+++ b/system/lv/lv.SlackBuild
@@ -11,9 +11,11 @@
# continues to develop this. So I'm treating Debian as upstream, and
# the _7 in VERSION is the Debian patchlevel.
+# 20201115 bkw: add 2 new patches from Debian git, BUILD=2.
+
PRGNAM=lv
VERSION=${VERSION:-4.51_7}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -61,7 +63,9 @@ for i in $( cat debian/patches/series ); do
patch -p1 < "debian/patches/$i"
done
-# Local patches (sent upstream, maybe they'll be in the next release).
+# Local patches. 4 of these were written by the SlackBuild author, sent
+# upstream (to the Debian maintainer). The height and filename patches
+# are from Debian's git.
for i in $( cat $CWD/patches/series ); do
patch -p1 < "$CWD/patches/$i"
done
diff --git a/system/lv/patches/change-maximum-height-to-144.patch b/system/lv/patches/change-maximum-height-to-144.patch
new file mode 100644
index 0000000000..84b4afe0c2
--- /dev/null
+++ b/system/lv/patches/change-maximum-height-to-144.patch
@@ -0,0 +1,17 @@
+Author: TOMITA Masahiro <tommy@tmtm.org>
+Description: Change maximum height to 144.
+Last-Update: 2020-10-10
+
+Index: lv/src/file.h
+===================================================================
+--- lv.orig/src/file.h
++++ lv/src/file.h
+@@ -16,7 +16,7 @@
+ #include <str.h>
+ #include <stream.h>
+
+-#define LV_PAGE_SIZE 32U /* lines per page */
++#define LV_PAGE_SIZE 48U /* lines per page */
+
+ #ifdef MSDOS
+ #define BLOCK_SIZE 2 /* segments on memory */
diff --git a/system/lv/patches/series b/system/lv/patches/series
index 0228981fdf..ce324941d9 100644
--- a/system/lv/patches/series
+++ b/system/lv/patches/series
@@ -1,4 +1,6 @@
+change-maximum-height-to-144.patch
fix_implicit_decls.diff
no_inline.diff
man_typos.diff
makefile.diff
+shows-the-filename-only.diff
diff --git a/system/lv/patches/shows-the-filename-only.diff b/system/lv/patches/shows-the-filename-only.diff
new file mode 100644
index 0000000000..32912b4209
--- /dev/null
+++ b/system/lv/patches/shows-the-filename-only.diff
@@ -0,0 +1,25 @@
+Description: shows the file name only if it is shorter than the width of the screen.
+Author: Oohara Yuuma <oohara@libra.interq.or.jp>
+Last-Update: 2008-01-27
+
+Index: lv/src/command.c
+===================================================================
+--- lv.orig/src/command.c
++++ lv/src/command.c
+@@ -1173,8 +1173,15 @@ public void Command( file_t *file, byte
+ else
+ label = "(END)";
+ }
+- if( TRUE == f->top )
++ if( TRUE == f->top ){
+ label = FileName( f );
++ /* if the file name is not shorter than the width of the screen,
++ * it causes scrolling and moves the first line of the file
++ * out of the screen
++ */
++ if ( strlen(label) >= f->width )
++ label = NULL;
++ }
+ }
+
+ if( NULL != label ){