From ea6cbe8fab7839525742c9c41011c808a843d8c0 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 21 Mar 2016 23:11:05 -0400
Subject: [PATCH] mc: Add patch fixing shell links (closes #175)

See https://mail.gnome.org/archives/mc-devel/2016-March/msg00015.html
---
 packages/mc/build.sh                              |  2 +-
 packages/mc/mc-3611-fish-fix-perl-ls-helper.patch | 34 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 packages/mc/mc-3611-fish-fix-perl-ls-helper.patch

diff --git a/packages/mc/build.sh b/packages/mc/build.sh
index ffa57070..70d9618b 100755
--- a/packages/mc/build.sh
+++ b/packages/mc/build.sh
@@ -1,5 +1,5 @@
 TERMUX_PKG_VERSION=4.8.16
-TERMUX_PKG_BUILD_REVISION=3
+TERMUX_PKG_BUILD_REVISION=4
 TERMUX_PKG_HOMEPAGE=https://www.midnight-commander.org/
 TERMUX_PKG_DESCRIPTION="Midnight Commander - a powerful file manager"
 TERMUX_PKG_SRCURL="http://ftp.midnight-commander.org/mc-${TERMUX_PKG_VERSION}.tar.xz"
diff --git a/packages/mc/mc-3611-fish-fix-perl-ls-helper.patch b/packages/mc/mc-3611-fish-fix-perl-ls-helper.patch
new file mode 100644
index 00000000..4010bd05
--- /dev/null
+++ b/packages/mc/mc-3611-fish-fix-perl-ls-helper.patch
@@ -0,0 +1,34 @@
+From e274e58cb7dff1683480f5538fd1bfa41a85c0c7 Mon Sep 17 00:00:00 2001
+From: Andreas Mohr <and@gmx.li>
+Date: Sun, 13 Mar 2016 20:59:47 +0000
+Subject: [PATCH] Fish: fix perl ls helper
+
+With #3599 I introduce a perl warning in fish_list_perl()
+so fish_list_perl() was skipped (return code 255) and fallback ls
+function was used instead.
+
+Plus all % chars must quoted because of g_strconcat() after reading
+script file into string.
+
+Fix it!
+
+Signed-off-by: Andreas Mohr <and@gmx.li>
+---
+ src/vfs/fish/helpers/ls | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/vfs/fish/helpers/ls b/src/vfs/fish/helpers/ls
+index 1284e17..909a77d 100755
+--- a/src/vfs/fish/helpers/ls
++++ b/src/vfs/fish/helpers/ls
+@@ -138,8 +138,8 @@ while((my $filename = readdir (DIR))){
+         my $linkname = readlink ("$dirname/$filename");
+         $linkname =~ $strutils_shell_escape_regex;
+         printf("R%%o %%o $uid.$gid\nS$size\nd$mloctime\n:\"%%s\" -> \"%%s\"\n\n", S_IMODE($mode), S_IFMT($mode), $e_filename, $linkname);
+-    } elseif (S_ISCHR ($mode) || S_ISBLK ($mode)) {
+-        my $minor = $rdev % 256;
++    } elsif (S_ISCHR ($mode) || S_ISBLK ($mode)) {
++        my $minor = $rdev %% 256;
+         my $major = int( $rdev / 256 );
+         printf("R%%o %%o $uid.$gid\nE$major,$minor\nd$mloctime\n:\"%%s\"\n\n", S_IMODE($mode), S_IFMT($mode), $e_filename);
+     } else {
-- 
2.11.0