commit: 25aac466357a303896fa961e759488e9d4ea6eee Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Tue Jul 13 11:46:02 2021 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Tue Jul 13 11:57:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25aac466
app-misc/mc: fix mouse-key garbage output on ncurses and modern terminals While at it, bump to EAPI 8 and fix some DEPEND/BDEPEND confusion. Closes: https://bugs.gentoo.org/753578 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> app-misc/mc/files/mc-4.8.26-ncurses-mouse.patch | 16 +++ app-misc/mc/mc-4.8.26-r3.ebuild | 125 ++++++++++++++++++++++++ 2 files changed, 141 insertions(+) diff --git a/app-misc/mc/files/mc-4.8.26-ncurses-mouse.patch b/app-misc/mc/files/mc-4.8.26-ncurses-mouse.patch new file mode 100644 index 00000000000..bde04c99b86 --- /dev/null +++ b/app-misc/mc/files/mc-4.8.26-ncurses-mouse.patch @@ -0,0 +1,16 @@ +Fix mouse-key input with ncurses6 in terminals without basic X10 mouse +support, at the cost of breaking it with ncurses5. See discussion in +https://midnight-commander.org/ticket/4144 . + +--- a/lib/tty/key.c ++++ b/lib/tty/key.c +@@ -2124,8 +2124,7 @@ + gboolean extended = c == MCKEY_EXTENDED_MOUSE; + + #ifdef KEY_MOUSE +- extended = extended || (c == KEY_MOUSE && xmouse_seq == NULL +- && xmouse_extended_seq != NULL); ++ extended = extended || (c == KEY_MOUSE && xmouse_extended_seq != NULL); + #endif /* KEY_MOUSE */ + + xmouse_get_event (event, extended); diff --git a/app-misc/mc/mc-4.8.26-r3.ebuild b/app-misc/mc/mc-4.8.26-r3.ebuild new file mode 100644 index 00000000000..e3d96886ce3 --- /dev/null +++ b/app-misc/mc/mc-4.8.26-r3.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +MY_P=${P/_/-} + +DESCRIPTION="GNU Midnight Commander is a text based file manager" +HOMEPAGE="https://www.midnight-commander.org"; +SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"; + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg" + +REQUIRED_USE="spell? ( edit )" + +RDEPEND=">=dev-libs/glib-2.26.0:2 + gpm? ( sys-libs/gpm ) + kernel_linux? ( sys-fs/e2fsprogs ) + samba? ( net-fs/samba ) + sftp? ( net-libs/libssh2 ) + slang? ( >=sys-libs/slang-2 ) + !slang? ( sys-libs/ncurses:0=[unicode?] ) + spell? ( app-text/aspell ) + X? ( x11-libs/libX11 + x11-libs/libICE + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libSM )" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/xz-utils + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( dev-libs/check )" + +PATCHES=( + "${FILESDIR}"/${PN}-4.8.26-file-seccomp.patch + "${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch + "${FILESDIR}"/${PN}-4.8.26-shadow-crash.patch +) + +RESTRICT="!test? ( test )" + +S="${WORKDIR}/${MY_P}" + +pkg_pretend() { + if use slang && use unicode ; then + ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled." + fi +} + +src_prepare() { + default + + # patch touches configure.ac + eautoreconf +} + +src_configure() { + [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" + + local myeconfargs=( + --enable-charset + --enable-vfs + --with-homedir=$(usex xdg 'XDG' '.mc') + --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')") + $(use_enable kernel_linux vfs-undelfs) + # Today mclib does not expose any headers and is linked to + # single 'mc' binary. Thus there is no advantage of having + # a library. Let's avoid shared library altogether + # as it also conflicts with sci-libs/mc: bug #685938 + --disable-mclib + $(use_enable nls) + $(use_enable samba vfs-smb) + $(use_enable sftp vfs-sftp) + $(use_enable spell aspell) + $(use_enable test tests) + $(use_with gpm gpm-mouse) + $(use_with X x) + $(use_with edit internal-edit) + ) + econf "${myeconfargs[@]}" +} + +src_test() { + # CK_FORK=no to avoid using fork() in check library + # as mc mocks fork() itself: bug #644462. + # + # VERBOSE=1 to make test failures contain detailed + # information. + CK_FORK=no emake check VERBOSE=1 +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS README NEWS + + # fix bug #334383 + if use kernel_linux && [[ ${EUID} == 0 ]] ; then + fowners root:tty /usr/libexec/mc/cons.saver + fperms g+s /usr/libexec/mc/cons.saver + fi + + if ! use xdg ; then + sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \ + -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die + fi +} + +pkg_postinst() { + if use spell && ! has_version app-dicts/aspell-en ; then + elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed." + elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini" + elog "It has to be set to one of your installed aspell dictionaries or 'NONE'" + elog + fi + + elog "To enable exiting to latest working directory," + elog "put this into your ~/.bashrc:" + elog ". ${EPREFIX}/usr/libexec/mc/mc.sh" +}
