From 30bbda67af71be7b70c916eb863609c4b300fef5 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 27 Jul 2020 10:07:17 +0200
Subject: [PATCH] mc: Update from 4.8.24 to 4.8.25

---
 packages/mc/build.sh            |  5 ++---
 packages/mc/lib-tty-key.c.patch | 22 ----------------------
 2 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 packages/mc/lib-tty-key.c.patch

diff --git a/packages/mc/build.sh b/packages/mc/build.sh
index 2d78d4e86..6157bb405 100644
--- a/packages/mc/build.sh
+++ b/packages/mc/build.sh
@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://www.midnight-commander.org/
 TERMUX_PKG_DESCRIPTION="Midnight Commander - a powerful file manager"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_VERSION=4.8.24
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=4.8.25
 TERMUX_PKG_SRCURL=http://ftp.midnight-commander.org/mc-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46
+TERMUX_PKG_SHA256=ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a
 TERMUX_PKG_DEPENDS="libandroid-support, libiconv, ncurses, glib, openssl, libssh2, zlib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_lib_util_openpty=no
diff --git a/packages/mc/lib-tty-key.c.patch b/packages/mc/lib-tty-key.c.patch
deleted file mode 100644
index b95bb6140..000000000
--- a/packages/mc/lib-tty-key.c.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-The code assumes that "kmous" capability is for X10 mouse reporting,
-so if an event for kmous happens it tries to decode it according to
-the X10 protocol.
-
-This breaks starting with ncurses 6.1 as the terminfo for xterm
-started using the SGR sequence for xterm in 6.1.
-
-This is a hacky, non-invasive patch which just assumes that the SGR
-protocol is used.
-
-diff -u -r ../mc-4.8.20/lib/tty/key.c ./lib/tty/key.c
---- ../mc-4.8.20/lib/tty/key.c	2017-03-04 18:51:38.000000000 +0100
-+++ ./lib/tty/key.c	2018-02-08 23:19:38.207353992 +0100
-@@ -2140,7 +2140,7 @@
-                           || c == MCKEY_EXTENDED_MOUSE))
-     {
-         /* Mouse event */
--        xmouse_get_event (event, c == MCKEY_EXTENDED_MOUSE);
-+        xmouse_get_event (event, 1);
-         c = (event->type != 0) ? EV_MOUSE : EV_NONE;
-     }
-     else if (c == MCKEY_BRACKETED_PASTING_START)