summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2024-02-14 16:12:15 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2024-02-22 14:19:05 +0100
commit51cc65f721118002d124670019cabae2eb3e5190 (patch)
tree8b152ac7afc3c490763a46ad9357f06f31332c68 /package
parent45aae9bd8a44990d98efeda5aa981612cb402fd0 (diff)
mc: update to 4.8.31
Diffstat (limited to 'package')
-rw-r--r--package/mc/Makefile12
-rw-r--r--package/mc/patches/patch-lib_tty_tty-ncurses_c42
2 files changed, 47 insertions, 7 deletions
diff --git a/package/mc/Makefile b/package/mc/Makefile
index 49c0db187..539c292c4 100644
--- a/package/mc/Makefile
+++ b/package/mc/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= mc
-PKG_VERSION:= 4.8.23
+PKG_VERSION:= 4.8.31
PKG_RELEASE:= 1
-PKG_HASH:= dd7f7ce74183307b0df25b5c3e60ad3293fd3d3d27d2f37dd7a10efce13dff1c
+PKG_HASH:= 24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a
PKG_DESCR:= norton commander clone
PKG_SECTION:= sys/misc
PKG_DEPENDS:= glib libncurses libssh2
@@ -19,11 +19,9 @@ include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,MC,mc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-TARGET_LDFLAGS+= -ltinfo
+TARGET_LDFLAGS+= -ltinfo -lncurses
CONFIGURE_ARGS+= --enable-charset \
- --disable-extcharset \
--disable-background \
- --disable-gcc-warnings \
--disable-glibtest \
--disable-netcode \
--without-libiconv-prefix \
@@ -37,7 +35,7 @@ CONFIGURE_ARGS+= --enable-charset \
--without-ext2undel \
--with-subshell \
--with-screen=ncurses \
- --with-edit
+ --disable-silent-rules
CONFIGURE_ENV+= mc_cv_have_zipinfo=yes \
am_cv_func_iconv=no
@@ -48,7 +46,7 @@ mc-install:
${CP} ${WRKINST}/usr/share/mc/* ${IDIR_MC}/usr/share/mc
${INSTALL_BIN} ${WRKINST}/usr/bin/mc ${IDIR_MC}/usr/bin/
cd ${IDIR_MC}/usr/bin && ln -fs mc mcedit && ln -fs mc mcview
- cd ${WRKINST}/etc/mc && ${CP} mcedit.menu mc.ext sfs.ini \
+ cd ${WRKINST}/etc/mc && ${CP} mcedit.menu sfs.ini \
mc.menu ${IDIR_MC}/etc/mc/
include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mc/patches/patch-lib_tty_tty-ncurses_c b/package/mc/patches/patch-lib_tty_tty-ncurses_c
new file mode 100644
index 000000000..34c0b53df
--- /dev/null
+++ b/package/mc/patches/patch-lib_tty_tty-ncurses_c
@@ -0,0 +1,42 @@
+--- mc-4.8.31.orig/lib/tty/tty-ncurses.c 2024-01-20 20:34:38.000000000 +0100
++++ mc-4.8.31/lib/tty/tty-ncurses.c 2024-02-14 11:53:54.151821148 +0100
+@@ -561,39 +561,11 @@ tty_fill_region (int y, int x, int rows,
+ void
+ tty_colorize_area (int y, int x, int rows, int cols, int color)
+ {
+-#ifdef ENABLE_SHADOWS
+- cchar_t *ctext;
+- wchar_t wch[10]; /* TODO not sure if the length is correct */
+- attr_t attrs;
+- short color_pair;
+-
+- if (!use_colors || !tty_clip (&y, &x, &rows, &cols))
+- return;
+-
+- tty_setcolor (color);
+- ctext = g_malloc (sizeof (cchar_t) * (cols + 1));
+-
+- for (int row = 0; row < rows; row++)
+- {
+- mvin_wchnstr (y + row, x, ctext, cols);
+-
+- for (int col = 0; col < cols; col++)
+- {
+- getcchar (&ctext[col], wch, &attrs, &color_pair, NULL);
+- setcchar (&ctext[col], wch, attrs, color, NULL);
+- }
+-
+- mvadd_wchnstr (y + row, x, ctext, cols);
+- }
+-
+- g_free (ctext);
+-#else
+ (void) y;
+ (void) x;
+ (void) rows;
+ (void) cols;
+ (void) color;
+-#endif /* ENABLE_SHADOWS */
+ }
+
+ /* --------------------------------------------------------------------------------------------- */