Browse Source

mc: Update from 4.8.20 to 4.8.21

android-5
Fredrik Fornwall 7 years ago
parent
commit
3c1fede649
  1. 5
      packages/mc/build.sh
  2. 19
      packages/mc/src-filemanager-achown.c.patch
  3. 16
      packages/mc/src-usermenu.c.patch

5
packages/mc/build.sh

@ -1,8 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://www.midnight-commander.org/ TERMUX_PKG_HOMEPAGE=https://www.midnight-commander.org/
TERMUX_PKG_DESCRIPTION="Midnight Commander - a powerful file manager" TERMUX_PKG_DESCRIPTION="Midnight Commander - a powerful file manager"
TERMUX_PKG_VERSION=4.8.20 TERMUX_PKG_VERSION=4.8.21
TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=8f37e546ac7c31c9c203a03b1c1d6cb2d2f623a300b86badfd367e5559fe148c
TERMUX_PKG_SHA256=017ee7f4f8ae420a04f4d6fcebaabe5b494661075c75442c76e9c8b1923d501c
TERMUX_PKG_SRCURL=http://ftp.midnight-commander.org/mc-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SRCURL=http://ftp.midnight-commander.org/mc-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_DEPENDS="libandroid-support, ncurses, glib" TERMUX_PKG_DEPENDS="libandroid-support, ncurses, glib"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="

19
packages/mc/src-filemanager-achown.c.patch

@ -1,29 +1,30 @@
diff -u -r ../mc-4.8.15/src/filemanager/achown.c ./src/filemanager/achown.c diff -u -r ../mc-4.8.21/src/filemanager/achown.c ./src/filemanager/achown.c
--- ../mc-4.8.15/src/filemanager/achown.c 2015-11-06 04:11:09.000000000 -0500 --- ../mc-4.8.21/src/filemanager/achown.c 2018-05-27 19:56:21.000000000 +0000
+++ ./src/filemanager/achown.c 2015-11-20 18:00:58.613280615 -0500 +++ ./src/filemanager/achown.c 2018-06-03 22:53:50.499299792 +0000
@@ -347,21 +347,25 @@ @@ -564,22 +564,26 @@
listbox_add_item (chl_list, LISTBOX_APPEND_AT_END, 0, "<Unknown>", NULL, FALSE);
if (is_owner) if (is_owner)
{ {
/* get and put user names in the listbox */
+#ifndef __ANDROID__ +#ifndef __ANDROID__
/* get and put user names in the listbox */
setpwent (); setpwent ();
while ((chl_pass = getpwent ()) != NULL) while ((chl_pass = getpwent ()) != NULL)
listbox_add_item (chl_list, LISTBOX_APPEND_SORTED, 0, chl_pass->pw_name, NULL, listbox_add_item (chl_list, LISTBOX_APPEND_SORTED, 0, chl_pass->pw_name, NULL,
FALSE); FALSE);
+#endif
endpwent (); endpwent ();
fe = listbox_search_text (chl_list, get_owner (sf_stat->st_uid)); +#endif
fe = listbox_search_text (chl_list, get_owner (sf_stat.st_uid));
} }
else else
{ {
/* get and put group names in the listbox */
+#ifndef __ANDROID__ +#ifndef __ANDROID__
/* get and put group names in the listbox */
setgrent (); setgrent ();
while ((chl_grp = getgrent ()) != NULL) while ((chl_grp = getgrent ()) != NULL)
listbox_add_item (chl_list, LISTBOX_APPEND_SORTED, 0, chl_grp->gr_name, NULL, listbox_add_item (chl_list, LISTBOX_APPEND_SORTED, 0, chl_grp->gr_name, NULL,
FALSE); FALSE);
endgrent (); endgrent ();
+#endif +#endif
fe = listbox_search_text (chl_list, get_group (sf_stat->st_gid)); fe = listbox_search_text (chl_list, get_group (sf_stat.st_gid));
} }

16
packages/mc/src-usermenu.c.patch

@ -1,9 +1,9 @@
diff -u -r ../mc-4.8.20/src/usermenu.c ./src/usermenu.c diff -u -r ../mc-4.8.21/src/usermenu.c ./src/usermenu.c
--- ../mc-4.8.20/src/usermenu.c 2017-11-18 18:45:59.000000000 +0100 --- ../mc-4.8.21/src/usermenu.c 2018-05-27 19:56:21.000000000 +0000
+++ ./src/usermenu.c 2017-11-26 23:06:56.100910498 +0100 +++ ./src/usermenu.c 2018-06-03 22:55:09.086449615 +0000
@@ -449,7 +449,7 @@ @@ -450,7 +450,7 @@
return;
} }
cmd_file = fdopen (cmd_file_fd, "w"); cmd_file = fdopen (cmd_file_fd, "w");
- fputs ("#! /bin/sh\n", cmd_file); - fputs ("#! /bin/sh\n", cmd_file);
+ fputs ("#! @TERMUX_PREFIX@/bin/sh\n", cmd_file); + fputs ("#! @TERMUX_PREFIX@/bin/sh\n", cmd_file);
@ -16,6 +16,6 @@ diff -u -r ../mc-4.8.20/src/usermenu.c ./src/usermenu.c
- cmd = g_strconcat ("/bin/sh ", vfs_path_as_str (file_name_vpath), (char *) NULL); - cmd = g_strconcat ("/bin/sh ", vfs_path_as_str (file_name_vpath), (char *) NULL);
+ cmd = g_strconcat ("@TERMUX_PREFIX@/bin/sh ", vfs_path_as_str (file_name_vpath), (char *) NULL); + cmd = g_strconcat ("@TERMUX_PREFIX@/bin/sh ", vfs_path_as_str (file_name_vpath), (char *) NULL);
if (!show_prompt)
{ if (show_prompt)
if (system (cmd) == -1) shell_execute (cmd, EXECUTE_HIDE);

Loading…
Cancel
Save