mc: update to 4.8.26

Refreshed patches and added one from alpine linux to fix musl
compilation.

Signed-off-by: Rosen Penev <redacted>

diff --git a/utils/mc/Makefile b/utils/mc/Makefile
index 76f8ff08512941ef99857fd471694714c49933e0..ea874a0ce3051dd0669b9349795bba7d750ddf2c 100644 (file)
--- a/utils/mc/Makefile
+++ b/utils/mc/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mc
-PKG_VERSION:=4.8.25
+PKG_VERSION:=4.8.26
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 PKG_LICENSE:=GPL-3.0-or-later
@@ -14,7 +14,7 @@ PKG_CPE_ID:=cpe:/a:midnight_commander:midnight_commander
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://ftp.midnight-commander.org/
-PKG_HASH:=ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a
+PKG_HASH:=c6deadc50595f2d9a22dc6c299a9f28b393e358346ebf6ca444a8469dc166c27
 PKG_BUILD_PARALLEL:=1
 PKG_FIXUP:=autoreconf gettext-version
 PKG_BUILD_DEPENDS:=MC_VFS:libtirpc

diff --git a/utils/mc/patches/010-subshell.patch b/utils/mc/patches/010-subshell.patch
index 73d8ca94911174f1e76bf88f213d717fb7d41598..73fde76c7b12cd0cb1766b876effa62a853c0d1a 100644 (file)
--- a/utils/mc/patches/010-subshell.patch
+++ b/utils/mc/patches/010-subshell.patch
@@ -1,6 +1,6 @@
--- a/src/subshell/common.c
+--- a/src/subshell/common.c
 +++ b/src/subshell/common.c
-@@ -836,7 +836,7 @@ init_subshell_precmd (char *precmd, size
+@@ -1128,7 +1128,7 @@ init_subshell_precmd (char *precmd, size
                      "else "
                      "[ \"${PWD##$HOME/}\" = \"$PWD\" ] && MC_PWD=\"$PWD\" || MC_PWD=\"~/${PWD##$HOME/}\"; "
                      "fi; "

diff --git a/utils/mc/patches/020-fix-mouse-handling-newer-terminfo.patch b/utils/mc/patches/020-fix-mouse-handling-newer-terminfo.patch
index 82543379e32a4cb5eccd64e9130099ae132ef47e..8da79f680c10a68e79e0877df05c6c22a7c26615 100644 (file)
--- a/utils/mc/patches/020-fix-mouse-handling-newer-terminfo.patch
+++ b/utils/mc/patches/020-fix-mouse-handling-newer-terminfo.patch
@@ -1,6 +1,6 @@
 --- a/lib/tty/tty.c
 +++ b/lib/tty/tty.c
-@@ -370,7 +370,7 @@ tty_init_xterm_support (gboolean is_xter
+@@ -393,7 +393,7 @@ tty_init_xterm_support (gboolean is_xter
      if (xmouse_seq != NULL)
      {
          if (strcmp (xmouse_seq, ESC_STR "[<") == 0)

diff --git a/utils/mc/patches/030-fix-cchat_t.patch b/utils/mc/patches/030-fix-cchat_t.patch
new file mode 100644 (file)
index 0000000..8b05e42
--- /dev/null
+++ b/utils/mc/patches/030-fix-cchat_t.patch
@@ -0,0 +1,10 @@
+--- a/lib/tty/tty-ncurses.h
++++ b/lib/tty/tty-ncurses.h
+@@ -3,6 +3,7 @@
+ #define MC__TTY_NCURSES_H
+ 
+ #ifdef USE_NCURSES
++#define _XOPEN_SOURCE_EXTENDED
+ #ifdef HAVE_NCURSES_CURSES_H
+ #include <ncurses/curses.h>
+ #elif defined (HAVE_NCURSES_NCURSES_H)