From 519a36ea190e1a151590d0e3097e4d365b942021 Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Thu, 27 Dec 2018 15:53:05 +0100
Subject: [PATCH] mc: update to 4.8.21 and improve - use wrapper to avoid
 history spam and reduce addon size - set home directory - fix mclib path
 error (even we compile with --disable-mclib)

---
 .../addon-depends/system-tools-depends/mc/package.mk   | 10 +++++++---
 .../addon-depends/system-tools-depends/mc/wrapper/mc   |  4 ++++
 .../system-tools-depends/mc/wrapper/mcedit             |  4 ++++
 .../system-tools-depends/mc/wrapper/mcview             |  4 ++++
 4 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 packages/addons/addon-depends/system-tools-depends/mc/wrapper/mc
 create mode 100644 packages/addons/addon-depends/system-tools-depends/mc/wrapper/mcedit
 create mode 100644 packages/addons/addon-depends/system-tools-depends/mc/wrapper/mcview

diff --git a/packages/addons/addon-depends/system-tools-depends/mc/package.mk b/packages/addons/addon-depends/system-tools-depends/mc/package.mk
index fbb7d2f134..c5d1c884c6 100644
--- a/packages/addons/addon-depends/system-tools-depends/mc/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/mc/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mc"
-PKG_VERSION="4.8.20"
-PKG_SHA256="017ee7f4f8ae420a04f4d6fcebaabe5b494661075c75442c76e9c8b1923d501c"
+PKG_VERSION="4.8.21"
+PKG_SHA256="8f37e546ac7c31c9c203a03b1c1d6cb2d2f623a300b86badfd367e5559fe148c"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.midnight-commander.org"
 PKG_URL="http://ftp.midnight-commander.org/mc-${PKG_VERSION}.tar.xz"
@@ -13,7 +13,8 @@ PKG_LONGDESC="Midnight Commander is a text based filemanager that emulates Norto
 
 PKG_CONFIGURE_OPTS_TARGET=" \
   --datadir=/storage/.kodi/addons/virtual.system-tools/data \
-  --libdir=/storage/.kodi/addons/virtual.system-tools/mclib \
+  --libexecdir=/storage/.kodi/addons/virtual.system-tools/mclib \
+  --with-homedir=/storage/.kodi/userdata/addon_data/virtual.system-tools \
   --sysconfdir=/storage/.kodi/addons/virtual.system-tools/etc \
   --with-screen=ncurses \
   --with-sysroot=$SYSROOT_PREFIX \
@@ -41,4 +42,7 @@ pre_configure_target() {
 post_makeinstall_target() {
   rm -rf $INSTALL/storage/.kodi/addons/virtual.system-tools/data/locale
   rm -rf $INSTALL/storage/.kodi/addons/virtual.system-tools/data/mc/help/mc.hlp.*
+  mv $INSTALL/usr/bin/mc $INSTALL/usr/bin/mc-bin
+  rm -f $INSTALL/usr/bin/{mcedit,mcview}
+  cp $PKG_DIR/wrapper/* $INSTALL/usr/bin
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/mc/wrapper/mc b/packages/addons/addon-depends/system-tools-depends/mc/wrapper/mc
new file mode 100644
index 0000000000..c006477ebd
--- /dev/null
+++ b/packages/addons/addon-depends/system-tools-depends/mc/wrapper/mc
@@ -0,0 +1,4 @@
+#!/bin/sh
+HISTFILE="/run/mc_histfile"
+export HISTFILE
+exec mc-bin "$@"
diff --git a/packages/addons/addon-depends/system-tools-depends/mc/wrapper/mcedit b/packages/addons/addon-depends/system-tools-depends/mc/wrapper/mcedit
new file mode 100644
index 0000000000..43b7815f4c
--- /dev/null
+++ b/packages/addons/addon-depends/system-tools-depends/mc/wrapper/mcedit
@@ -0,0 +1,4 @@
+#!/bin/sh
+HISTFILE="/run/mc_histfile"
+export HISTFILE
+exec mc-bin -e "$@"
diff --git a/packages/addons/addon-depends/system-tools-depends/mc/wrapper/mcview b/packages/addons/addon-depends/system-tools-depends/mc/wrapper/mcview
new file mode 100644
index 0000000000..7aec5c875a
--- /dev/null
+++ b/packages/addons/addon-depends/system-tools-depends/mc/wrapper/mcview
@@ -0,0 +1,4 @@
+#!/bin/sh
+HISTFILE="/run/mc_histfile"
+export HISTFILE
+exec mc-bin -v "$@"