diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/less/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/less/files/less-549-mouse_fix.patch | 51 | ||||
| -rw-r--r-- | sys-apps/less/files/lesspipe.sh | 2 | ||||
| -rw-r--r-- | sys-apps/less/less-549-r1.ebuild (renamed from sys-apps/less/less-548.ebuild) | 6 |
4 files changed, 58 insertions, 3 deletions
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index 04ab1e1f..a532e27b 100644 --- a/sys-apps/less/Manifest +++ b/sys-apps/less/Manifest @@ -1,2 +1,2 @@ -DIST less-548.tar.gz 346139 SHA512 4e42ed3812d038634a12ae6f719869b228fe4ec270ceda560afb666543669f40c0c5746fc9b94c00584e78db356d900347ec5b7e3ca15249a9656dbd8b6b8dcb +DIST less-549.tar.gz 346978 SHA512 f0f86db00ee7a0ed638dfe2183e5cd6a9728d6e4cb9f054a746716abf6fe297f33b6f1d44bd4eac8ad360da564c4ea50cd6f41d297f857c78414961d28f4155c DIST less-select-2.9.tar.gz 28609 SHA512 e948948bf7d02ec17253fa248bbaa4de85e097cf2e2368454d3e5e399f8fe95ffa477013db376733e125768cfcf020cb5c9f54e3b2bba65bcc37ae4eae49bfb1 diff --git a/sys-apps/less/files/less-549-mouse_fix.patch b/sys-apps/less/files/less-549-mouse_fix.patch new file mode 100644 index 00000000..495073a3 --- /dev/null +++ b/sys-apps/less/files/less-549-mouse_fix.patch @@ -0,0 +1,51 @@ +From d5015d29f79e70fb70489616c0f2d0ff32e52898 Mon Sep 17 00:00:00 2001 +From: Mark Nudelman <markn@greenwoodsoftware.com> +Date: Sat, 16 Feb 2019 07:20:42 -0800 +Subject: [PATCH] Don't emit mouse controls if --mouse is not set. + +--- + screen.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/screen.c b/screen.c +index 9a32685..b58fe26 100644 +--- a/screen.c ++++ b/screen.c +@@ -1549,6 +1549,8 @@ win32_deinit_term(VOID_PARAM) + public void + init_mouse(VOID_PARAM) + { ++ if (!mousecap) ++ return; + #if !MSDOS_COMPILER + tputs(sc_s_mousecap, sc_height, putchr); + #else +@@ -1565,6 +1567,8 @@ init_mouse(VOID_PARAM) + public void + deinit_mouse(VOID_PARAM) + { ++ if (!mousecap) ++ return; + #if !MSDOS_COMPILER + tputs(sc_e_mousecap, sc_height, putchr); + #else +@@ -1587,8 +1591,7 @@ init(VOID_PARAM) + tputs(sc_init, sc_height, putchr); + if (!no_keypad) + tputs(sc_s_keypad, sc_height, putchr); +- if (mousecap) +- init_mouse(); ++ init_mouse(); + } + if (top_scroll) + { +@@ -1626,8 +1629,7 @@ deinit(VOID_PARAM) + #if !MSDOS_COMPILER + if (!(quit_if_one_screen && one_screen)) + { +- if (mousecap) +- deinit_mouse(); ++ deinit_mouse(); + if (!no_keypad) + tputs(sc_e_keypad, sc_height, putchr); + if (!no_init) diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh index 56cef730..66078850 100644 --- a/sys-apps/less/files/lesspipe.sh +++ b/sys-apps/less/files/lesspipe.sh @@ -246,7 +246,7 @@ if [[ -z $1 ]] ; then elif [[ $1 == "-V" || $1 == "--version" ]] ; then cat <<-EOF lesspipe (git) - Copyright 2001-2016 Gentoo Authors + Copyright 2001-2016 Gentoo Foundation Mike Frysinger <vapier@gentoo.org> (with plenty of ideas stolen from other projects/distros) diff --git a/sys-apps/less/less-548.ebuild b/sys-apps/less/less-549-r1.ebuild index ffc8eddf..eda41727 100644 --- a/sys-apps/less/less-548.ebuild +++ b/sys-apps/less/less-549-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors and Martin V\"ath +# Copyright 1999-2019 Gentoo Authors and Martin V\"ath # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -27,6 +27,10 @@ RDEPEND="${DEPEND} # || ( >=dev-lang/perl-5.10.1 >=virtual/perl-File-Temp-0.19 ) PDEPEND="lesspipe? ( app-text/lesspipe )" +PATCHES=( + "${FILESDIR}"/${P}-mouse_fix.patch #678102 +) + pkg_setup() { if use source && ! use less-select then ewarn 'ignoring USE=source without USE=less-select' |