coreutils: Remove strange ls color patch
This commit is contained in:
parent
4eb3f685cd
commit
ec64262da3
|
@ -1,7 +1,7 @@
|
||||||
TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/coreutils/
|
TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/coreutils/
|
||||||
TERMUX_PKG_DESCRIPTION="Basic file, shell and text manipulation utilities from the GNU project"
|
TERMUX_PKG_DESCRIPTION="Basic file, shell and text manipulation utilities from the GNU project"
|
||||||
TERMUX_PKG_VERSION=8.25
|
TERMUX_PKG_VERSION=8.25
|
||||||
TERMUX_PKG_BUILD_REVISION=4
|
TERMUX_PKG_BUILD_REVISION=5
|
||||||
TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/coreutils/coreutils-${TERMUX_PKG_VERSION}.tar.xz
|
TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/coreutils/coreutils-${TERMUX_PKG_VERSION}.tar.xz
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_mkfifo=yes gl_cv_host_operating_system=Android --without-gmp --enable-single-binary=symlinks ac_cv_func_endpwent=no"
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_mkfifo=yes gl_cv_host_operating_system=Android --without-gmp --enable-single-binary=symlinks ac_cv_func_endpwent=no"
|
||||||
# pinky has no usage on Android.
|
# pinky has no usage on Android.
|
||||||
|
|
|
@ -1,60 +0,0 @@
|
||||||
diff -u -r ../coreutils-8.22/src/ls.c ./src/ls.c
|
|
||||||
--- ../coreutils-8.22/src/ls.c 2013-12-04 15:48:30.000000000 +0100
|
|
||||||
+++ ./src/ls.c 2014-02-14 16:11:48.000000000 +0100
|
|
||||||
@@ -1641,6 +1641,15 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ print_with_color = isatty (STDOUT_FILENO);
|
|
||||||
+ if (print_with_color)
|
|
||||||
+ {
|
|
||||||
+ /* Don't use TAB characters in output. Some terminal
|
|
||||||
+ emulators can't handle the combination of tabs and
|
|
||||||
+ color codes on the same line. */
|
|
||||||
+ tabsize = 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
while (true)
|
|
||||||
{
|
|
||||||
int oi = -1;
|
|
||||||
@@ -1889,25 +1898,7 @@
|
|
||||||
|
|
||||||
case COLOR_OPTION:
|
|
||||||
{
|
|
||||||
- int i;
|
|
||||||
- if (optarg)
|
|
||||||
- i = XARGMATCH ("--color", optarg, color_args, color_types);
|
|
||||||
- else
|
|
||||||
- /* Using --color with no argument is equivalent to using
|
|
||||||
- --color=always. */
|
|
||||||
- i = color_always;
|
|
||||||
-
|
|
||||||
- print_with_color = (i == color_always
|
|
||||||
- || (i == color_if_tty
|
|
||||||
- && isatty (STDOUT_FILENO)));
|
|
||||||
-
|
|
||||||
- if (print_with_color)
|
|
||||||
- {
|
|
||||||
- /* Don't use TAB characters in output. Some terminal
|
|
||||||
- emulators can't handle the combination of tabs and
|
|
||||||
- color codes on the same line. */
|
|
||||||
- tabsize = 0;
|
|
||||||
- }
|
|
||||||
+ // Do nothing - color has been patched to color_if_tty.
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -2098,11 +2089,13 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifndef __ANDROID__
|
|
||||||
/* Note we leave %5b etc. alone so user widths/flags are honored. */
|
|
||||||
if (strstr (long_time_format[0], "%b")
|
|
||||||
|| strstr (long_time_format[1], "%b"))
|
|
||||||
if (!abmon_init ())
|
|
||||||
error (0, 0, _("error initializing month strings"));
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
return optind;
|
|
Loading…
Reference in New Issue