mirror of
https://github.com/gryf/gryf-overlay.git
synced 2026-01-02 20:04:17 +01:00
MC version bump
This commit is contained in:
@@ -1,8 +1,7 @@
|
||||
AUX mc-4.8.26-ncurses-mouse.patch 612 BLAKE2B ba3324dfee320a6c08c65ec8bf7784075f8a36c111ffa75129251674152cea68cde87844d5849c82111d4fad779c1d13992a7d765c4bc48b39d865ab1f89cbb6 SHA512 f97025ad7b3719b372368028ad9428e0cac67069d04e70b2e2923dd998a9f687f0807254bdc859218869e1666db80807fd53c19291e2921b420bc357e79d9406
|
||||
AUX mc-4.8.29-gentoo-tools.patch 413 BLAKE2B 53e3f8e5e711374bbc5e3bb868df5e3345eed8f8de4ec3cac486b63c210bb10e6832b60292c614b4bd5c65ae750c5b2c38430ac1da2c9f6febb2b686199463ff SHA512 38598f57f4905659bc5d69f4ae19510ce35e76c8e33fc5262c5c8d17742483ebd5aa61ddac29a5811e111fe8ca66e6418fa4d48567e3a4e7ec4406916834c6fa
|
||||
AUX mc-4.8.30-mcdiff-segfault.patch 1534 BLAKE2B ff3904f22a3f46251833f259255abd15015d47fed685447fb7f42b4d8adc042adb3104b4e41c2bedc0552335e681ca5df7404cd9cd0e4066a8a84714faa718c2 SHA512 41aa773416a3bd2f035ed584b6179f237b216010bd541b1a881f95f25eb5d05abbe721af2ae3c64dc39916525ff284cf0c5bf2ddde89e4bcf3647f7c5cad4e2d
|
||||
AUX mc-4.8.30-musl-tests.patch 300 BLAKE2B 52dff36517ccd7643cf594e556b0f315081ed39d01735f6da351bdf3dadc70ce1b14e8320b5edb08a8ae1a2db533f1bea60ef6bb1c37bc24a80a0c671384349d SHA512 73b32f64c5976a1b4518d2cdb8c802d9a93c71aab3781c6edfc731d7088ac67e3a09687bc1cce8a3597117b333e13ba96c50c4b26a21f5ad4c81aa76f03cfb41
|
||||
DIST mc-4.8.30.tar.xz 2380824 BLAKE2B 2bf759314abae39db7596426cba22f6eaac0efc58e7025f1a7ef1863496ea7a3c00d298d101123b9defb109e76e31fe988227fb5c1112e06051b3c7a5b3dc1b6 SHA512 f793f744eaff236c9952d477236dd775a24d9ddd7ff46940bfe2d06da5596bed91d6bd9c85250696da6dcdc0a1890dc01c736654df3f59039674eff38e12e68e
|
||||
DIST mc-4.8.32.tar.xz 2385648 BLAKE2B eb2ac2474c86dbcfe43b4f229cdc458bdfc9de2acf1d0206198721b56ec188010aba24063c1fc079ada295c73ab915786749be1ead599a582832ca649b9a8347 SHA512 f7f46e4f065331ede638a79c821ab5ef65952ba99cf71710d4282efa9ed7de75f06c786a8f8feb27d487417f438a48959439b40bb6456eb64796d46518a3f4a8
|
||||
DIST uc1541 20829 BLAKE2B c94bd39cc6d9ffe2b4f8c2ae45b864609776538f75e30c38c1ccd7c34ca348c8898b2d2e1924a1cd2c4c942e448165e365a43a7467c83053ef85b9ee34922c0e SHA512 d043293031cc0e71f36c6948e645e222f01408eafb728cd89c526afb114a13493ea551144d6c8e0572f23119659572b1e9cace73f9d536c722324c1626dbab7d
|
||||
DIST ulha 5392 BLAKE2B def48a21baa3a977bb2c417de7ab2d5882485bef66a31308a445bbf64adfe901414294b713d77a5db318391ce10b40fd9e82eb47e0749d0a853cc40197cd1e17 SHA512 b679ace38da80e887f1ca3d424db2174472b6aa31eda963181c578b57f9fa89219c93e515ef3b74547519d90840604c7a91a95b7bfc34cbae5c17d700ff88ed5
|
||||
EBUILD mc-4.8.30-r10.ebuild 3464 BLAKE2B bf497f1d7d742c0f3238bcf0da18ee2ee056c1f5d3884ddd342d3fa5e8e774eb9258787a079331c11e56255ecd2a587d08fcabe5731dcef9b23c0a608f136b79 SHA512 80720a72c7d7765a828263242a6cf3b6ef0948a85c024dbaad5623cf0e93eaf8139c99b5b3511f4c6c585bc47be28fca4b3f3680404f46fe4f9f11a3be62b246
|
||||
EBUILD mc-4.8.32-r10.ebuild 3694 BLAKE2B db1429fe8734f19f78461500ab7cfb0f20250daf75e6386eee59f9009eeb9a13e9dc0b303ffb32f4e467cd7abf8df9cf3d053e9df9278ed25ad5e41296b4d725 SHA512 7e8fac780ffaf6a141076ff50c29fe13e9b0d86fbe80011815a3c537cfa28e9ed2a1e6ee9ca61c8e49f39a0c10c0ce0c09f8621f08f2379564ad8b423b0fa403
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
From dfe3279a365d629ba848f0265108d98d9f12348f Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Borodin <aborodin@vmail.ru>
|
||||
Date: Sun, 27 Aug 2023 19:32:53 +0300
|
||||
Subject: [PATCH] Ticket 4500: mcdiff: segfault when display of line numbers is
|
||||
enabled.
|
||||
|
||||
The bug was introduced in 00f84fbf24b5f65381f41c5d6333182bc7921700.
|
||||
|
||||
* (dview_load_options): avoid NULL dereference: don't caclulate the
|
||||
width of line numbers field here because dview->a isn't created yet.
|
||||
* (dview_update): caclulate the width of line numbers field using an
|
||||
actual length of diff lines array.
|
||||
|
||||
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
|
||||
--- a/src/diffviewer/ydiff.c
|
||||
+++ b/src/diffviewer/ydiff.c
|
||||
@@ -2366,7 +2366,7 @@ dview_load_options (WDiff * dview)
|
||||
dview->display_symbols = 1;
|
||||
show_numbers = mc_config_get_bool (mc_global.main_config, "DiffView", "show_numbers", FALSE);
|
||||
if (show_numbers)
|
||||
- dview->display_numbers = calc_nwidth ((const GArray * const *) dview->a);
|
||||
+ dview->display_numbers = 1;
|
||||
tab_size = mc_config_get_int (mc_global.main_config, "DiffView", "tab_size", 8);
|
||||
if (tab_size > 0 && tab_size < 9)
|
||||
dview->tab_size = tab_size;
|
||||
@@ -2885,6 +2885,10 @@ dview_update (WDiff * dview)
|
||||
if (height < 2)
|
||||
return;
|
||||
|
||||
+ /* use an actual length of dview->a */
|
||||
+ if (dview->display_numbers != 0)
|
||||
+ dview->display_numbers = calc_nwidth ((const GArray * const *) dview->a);
|
||||
+
|
||||
width1 = dview->half1 + dview->bias;
|
||||
width2 = dview->half2 - dview->bias;
|
||||
if (dview->full)
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -6,24 +6,24 @@ EAPI=8
|
||||
inherit autotools flag-o-matic
|
||||
|
||||
MY_P="${P/_/-}"
|
||||
DESCRIPTION="GNU Midnight Commander is a text based file manager"
|
||||
HOMEPAGE="https://midnight-commander.org"
|
||||
SRC_URI="
|
||||
http://ftp.midnight-commander.org/${MY_P}.tar.xz
|
||||
https://raw.githubusercontent.com/gryf/uc1541/master/uc1541
|
||||
https://raw.githubusercontent.com/gryf/mc_ulha/master/ulha
|
||||
"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
|
||||
|
||||
DESCRIPTION="GNU Midnight Commander is a text based file manager"
|
||||
HOMEPAGE="https://midnight-commander.org"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="+edit gpm nls sftp +slang spell test unicode X"
|
||||
|
||||
REQUIRED_USE="spell? ( edit )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND="
|
||||
dev-python/extfslib
|
||||
COMMON_DEPEND="
|
||||
>=dev-libs/glib-2.30.0:2
|
||||
gpm? ( sys-libs/gpm )
|
||||
kernel_linux? ( sys-fs/e2fsprogs[tools(+)] )
|
||||
@@ -32,37 +32,50 @@ DEPEND="
|
||||
!slang? ( sys-libs/ncurses:=[unicode(+)?] )
|
||||
spell? ( app-text/aspell )
|
||||
X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libICE
|
||||
x11-libs/libXau
|
||||
x11-libs/libXdmcp
|
||||
x11-libs/libSM
|
||||
x11-libs/libX11
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
spell? ( app-dicts/aspell-en )"
|
||||
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
X? ( x11-base/xorg-proto )
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
dev-python/extfslib
|
||||
spell? ( app-dicts/aspell-en )
|
||||
"
|
||||
|
||||
BDEPEND="
|
||||
app-arch/xz-utils
|
||||
virtual/pkgconfig
|
||||
dev-python/extfslib
|
||||
nls? ( sys-devel/gettext )
|
||||
test? ( dev-libs/check )
|
||||
"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
|
||||
"${FILESDIR}"/${PN}-4.8.29-gentoo-tools.patch
|
||||
"${FILESDIR}"/${PN}-4.8.30-mcdiff-segfault.patch
|
||||
)
|
||||
|
||||
# This is a check for AIX, on Linux mc uses statvfs() regardless of whether
|
||||
# LFS64 interfaces are available in libc or not.
|
||||
QA_CONFIG_IMPL_DECL_SKIP=(
|
||||
statvfs64
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Bug #906194
|
||||
use elibc_musl && eapply "${FILESDIR}"/${PN}-4.8.30-musl-tests.patch
|
||||
# Bug #906194, #922483
|
||||
if use elibc_musl; then
|
||||
eapply "${FILESDIR}"/${PN}-4.8.30-musl-tests.patch
|
||||
eapply "${FILESDIR}"/${PN}-4.8.31-musl-tests.patch
|
||||
fi
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
@@ -105,6 +118,7 @@ src_test() {
|
||||
# information.
|
||||
CK_FORK=no emake check VERBOSE=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
dodoc AUTHORS NEWS README
|
||||
@@ -120,6 +134,8 @@ src_install() {
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "${PN} extension scripts depend on many external tools, install them as needed"
|
||||
elog
|
||||
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"
|
||||
Reference in New Issue
Block a user