Merge pull request #7168 from termux/update-dart
dart: update to 2.13.4
This commit is contained in:
commit
35f60cedbd
@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Dart is a general-purpose programming language"
|
|||||||
TERMUX_PKG_LICENSE="BSD"
|
TERMUX_PKG_LICENSE="BSD"
|
||||||
TERMUX_PKG_LICENSE_FILE="sdk/LICENSE"
|
TERMUX_PKG_LICENSE_FILE="sdk/LICENSE"
|
||||||
TERMUX_PKG_MAINTAINER="@termux"
|
TERMUX_PKG_MAINTAINER="@termux"
|
||||||
TERMUX_PKG_VERSION=2.12.4
|
TERMUX_PKG_VERSION=2.13.4
|
||||||
TERMUX_PKG_BUILD_IN_SRC=true
|
TERMUX_PKG_BUILD_IN_SRC=true
|
||||||
TERMUX_PKG_SKIP_SRC_EXTRACT=true
|
TERMUX_PKG_SKIP_SRC_EXTRACT=true
|
||||||
TERMUX_PKG_BLACKLISTED_ARCHES="x86_64"
|
TERMUX_PKG_BLACKLISTED_ARCHES="x86_64"
|
||||||
|
@ -1,21 +1,24 @@
|
|||||||
diff -uNr src/sdk/pkg/front_end/lib/src/api_prototype/terminal_color_support.dart src.mod/sdk/pkg/front_end/lib/src/api_prototype/terminal_color_support.dart
|
diff -uNr src/sdk/pkg/_fe_analyzer_shared/lib/src/util/colors.dart src.mod/sdk/pkg/_fe_analyzer_shared/lib/src/util/colors.dart
|
||||||
--- src/sdk/pkg/front_end/lib/src/api_prototype/terminal_color_support.dart 2019-05-22 18:59:58.264004304 +0000
|
--- src/sdk/pkg/_fe_analyzer_shared/lib/src/util/colors.dart 2021-07-21 10:21:26.170021583 +0000
|
||||||
+++ src.mod/sdk/pkg/front_end/lib/src/api_prototype/terminal_color_support.dart 2019-05-22 19:21:02.019682122 +0000
|
+++ src.mod/sdk/pkg/_fe_analyzer_shared/lib/src/util/colors.dart 2021-07-21 10:45:50.756764582 +0000
|
||||||
@@ -55,7 +55,7 @@
|
@@ -166,7 +166,7 @@
|
||||||
|
|
||||||
// Check if stdin is a terminal (TTY).
|
|
||||||
ProcessResult result =
|
|
||||||
- Process.runSync("/bin/sh", ["-c", "tty > /dev/null 2> /dev/null"]);
|
|
||||||
+ Process.runSync("@TERMUX_PREFIX@/bin/sh", ["-c", "tty > /dev/null 2> /dev/null"]);
|
|
||||||
|
|
||||||
if (result.exitCode != 0) {
|
|
||||||
if (debug) {
|
|
||||||
@@ -67,7 +67,7 @@
|
|
||||||
// The `-S` option of `tput` allows us to query multiple capabilities at
|
// The `-S` option of `tput` allows us to query multiple capabilities at
|
||||||
// once.
|
// once.
|
||||||
result = Process.runSync(
|
ProcessResult result = Process.runSync(
|
||||||
- "/bin/sh", ["-c", "printf '%s' '$TERMINAL_CAPABILITIES' | tput -S"]);
|
- "/bin/sh", ["-c", "printf '%s' '$TERMINAL_CAPABILITIES' | tput -S"]);
|
||||||
+ "@TERMUX_PREFIX@/bin/sh", ["-c", "printf '%s' '$TERMINAL_CAPABILITIES' | tput -S"]);
|
+ "@TERMUX_PREFIX@/bin/sh", ["-c", "printf '%s' '$TERMINAL_CAPABILITIES' | tput -S"]);
|
||||||
|
|
||||||
if (result.exitCode != 0) {
|
if (result.exitCode != 0) {
|
||||||
if (debug) {
|
printEnableColorsReason("Not enabling colors, running tput failed.");
|
||||||
|
diff -uNr src/sdk/sdk/lib/_internal/vm/bin/process_patch.dart src.mod/sdk/sdk/lib/_internal/vm/bin/process_patch.dart
|
||||||
|
--- src/sdk/sdk/lib/_internal/vm/bin/process_patch.dart 2021-07-21 10:21:29.378043843 +0000
|
||||||
|
+++ src.mod/sdk/sdk/lib/_internal/vm/bin/process_patch.dart 2021-07-21 10:46:23.677037513 +0000
|
||||||
|
@@ -301,7 +301,7 @@
|
||||||
|
if (Platform.isWindows) {
|
||||||
|
return 'cmd.exe';
|
||||||
|
}
|
||||||
|
- return '/bin/sh';
|
||||||
|
+ return '@TERMUX_PREFIX@/bin/sh';
|
||||||
|
}
|
||||||
|
|
||||||
|
static List<String> _getShellArguments(
|
||||||
|
Loading…
Reference in New Issue
Block a user