upgpkg(main/lesspipe): update to 2.06

Signed-off-by: 2096779623 <admin@utermux.dev>
This commit is contained in:
2096779623 2022-08-18 08:59:59 +08:00 committed by Uchiha Kakashi
parent 2f01819339
commit 657a87dfff
3 changed files with 32 additions and 21 deletions

View File

@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://www-zeuthen.desy.de/~friebel/unix/lesspipe.html
TERMUX_PKG_DESCRIPTION="An input filter for the pager less"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="2.05"
TERMUX_PKG_VERSION="2.06"
TERMUX_PKG_SRCURL=https://github.com/wofr06/lesspipe/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=78eab63d8bcb07ab9e2230bc4627ffa7b1c9296f0091b1237f52daf7f1d4682f
TERMUX_PKG_SHA256=f46c7b0b06f951613535a480d22ba7e8563f4f08d3d3f8e370047df122cb1637
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="less"
TERMUX_PKG_SUGGESTS="imagemagick, p7zip, unrar, unzip"

View File

@ -1,15 +1,25 @@
--- a/configure
+++ b/configure
@@ -56,10 +56,10 @@
mkdir -p \$(DESTDIR)\$(PREFIX)/bin
mkdir -p \$(DESTDIR)\$(PREFIX)/share/man/man1
mkdir -p \$(DESTDIR)\$(PREFIX)/share/zsh/site-functions
- mkdir -p \$(DESTDIR)/etc/bash_completion.d
+ mkdir -p \$(DESTDIR)\$(PREFIX)/etc/bash_completion.d
cp ./code2color ./sxw2txt ./archive_color ./lesspipe.sh ./vimcolor ./lesscomplete \$(DESTDIR)\$(PREFIX)/bin
cp ./lesspipe.1 \$(DESTDIR)\$(PREFIX)/share/man/man1
- cp ./less_completion \$(DESTDIR)/etc/bash_completion.d
+ cp ./less_completion \$(DESTDIR)\$(PREFIX)/etc/bash_completion.d
cp ./_less \$(DESTDIR)\$(PREFIX)/share/zsh/site-functions
chmod 0755 \$(DESTDIR)\$(PREFIX)/bin/lesspipe.sh
chmod 0755 \$(DESTDIR)\$(PREFIX)/bin/sxw2txt
diff -uNr lesspipe-2.06/configure lesspipe-2.06.mod/configure
--- lesspipe-2.06/configure 2022-08-17 17:56:28.000000000 +0800
+++ lesspipe-2.06.mod/configure 2022-08-18 08:56:15.742341358 +0800
@@ -30,16 +30,16 @@
exit ! $opt_help ? 1 : 0;
}
my $bash_complete_dir = `pkg-config --variable=completionsdir bash-completion`;
-$bash_complete_dir ||= '/usr/share/bash-completion/completions';
+$bash_complete_dir ||= '@TERMUX_PREFIX@/share/bash-completion/completions';
# dynamic loading not working, use the following dir instead:
-$bash_complete_dir = '/etc/bashcompletion.d';
+$bash_complete_dir = '@TERMUX_PREFIX@/etc/bashcompletion.d';
if ($opt_prefix and $opt_prefix !~ /^\/usr/) {
- $bash_complete_dir = "$ENV{HOME}/.local/share/bash-completion";
+ $bash_complete_dir = "@TERMUX_HOME@/.local/share/bash-completion";
# dynamic loading not working, use the following dir instead:
- $bash_complete_dir = "$opt_prefix/share/bash-completion";
+ $bash_complete_dir = "@TERMUX_PREFIX@/share/bash-completion";
print "installing bash completion in $bash_complete_dir\nIn bash, please preload the completion, dynamic invocation does not work\n. $bash_complete_dir/less_completion\n";
} else {
- $opt_prefix = '/usr/local';
+ $opt_prefix = '@TERMUX_PREFIX@';
}
# remove trailing slash and trailing bin directory
print "removed trailing /bin dir from prefix\n" if $opt_prefix =~ m|/bin/?$|;

View File

@ -1,11 +1,12 @@
--- a/lesspipe.sh
+++ b/lesspipe.sh
@@ -719,7 +719,7 @@
diff -uNr lesspipe-2.06/lesspipe.sh lesspipe-2.06.mod/lesspipe.sh
--- lesspipe-2.06/lesspipe.sh 2022-08-17 17:56:28.000000000 +0800
+++ lesspipe-2.06.mod/lesspipe.sh 2022-08-18 09:08:30.092341078 +0800
@@ -724,7 +724,7 @@
setopt sh_word_split 2>/dev/null
PATH=$PATH:${0%%/lesspipe.sh}
# the current locale in lowercase (or generic utf-8)
-locale=$(locale|grep LC_CTYPE|sed 's/.*"\(.*\)"/\1/') || locale=en_US.UTF-8
+locale=en_US.UTF-8
lclocale=$(echo ${locale##*.}|tr '[A-Z]' '[a-z]')
lclocale=$(echo ${locale##*.}|tr '[:upper:]' '[:lower:]')
sep=: # file name separator