diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch (renamed from infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch) | 8 | ||||
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/dev/move-cache.patch (renamed from infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/beta/move-cache.patch) | 34 | ||||
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch | 28 | ||||
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch | 16 |
4 files changed, 43 insertions, 43 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch index cd01577cc10f..f9ac00d1d323 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch @@ -1,8 +1,8 @@ diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index 702bd9ed5..4d4dc94c6 100755 +index 22efe87443..c6954575c5 100644 --- a/bin/internal/shared.sh +++ b/bin/internal/shared.sh -@@ -204,8 +204,6 @@ function shared::execute() { +@@ -212,8 +212,6 @@ function shared::execute() { # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" @@ -12,10 +12,10 @@ index 702bd9ed5..4d4dc94c6 100755 case "$BIN_NAME" in flutter*) diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 21be933e1..2ea73c4c0 100644 +index fb1616ba96..b973b3fd58 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -294,13 +294,6 @@ class FlutterCommandRunner extends CommandRunner<void> { +@@ -291,13 +291,6 @@ class FlutterCommandRunner extends CommandRunner<void> { globals.flutterUsage.suppressAnalytics = true; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/beta/move-cache.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/dev/move-cache.patch index 64950d4476ef..eb6ff5cf582e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/beta/move-cache.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/dev/move-cache.patch @@ -1,21 +1,21 @@ diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart -index 8e511eefd..fef3cca8b 100644 +index a059a8e992..b664a7070c 100644 --- a/dev/devicelab/lib/framework/runner.dart +++ b/dev/devicelab/lib/framework/runner.dart -@@ -126,7 +126,7 @@ Future<void> cleanupSystem() async { - print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)'); - final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; - final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.'); -- recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir); -+ recursiveCopy(Directory(path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir); - copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper'))); - if (!Platform.isWindows) { - await exec( +@@ -137,7 +137,7 @@ Future<void> cleanupSystem() async { + print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)'); + final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; + final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.'); +- recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir); ++ recursiveCopy(Directory(path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir); + copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper'))); + if (!Platform.isWindows) { + await exec( diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index c680de599..480abfb77 100644 +index 36714c5fb4..c0cc049ee1 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart -@@ -8,6 +8,7 @@ import 'package:meta/meta.dart'; +@@ -6,6 +6,7 @@ import 'package:meta/meta.dart'; import 'package:package_config/package_config.dart'; import 'package:yaml/yaml.dart'; @@ -23,20 +23,20 @@ index c680de599..480abfb77 100644 import 'base/context.dart'; import 'base/file_system.dart'; import 'base/utils.dart'; -@@ -392,7 +393,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { +@@ -397,7 +398,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { for (final Map<dynamic, dynamic> font in (family['fonts'] as List<dynamic>).cast<Map<dynamic, dynamic>>()) { final Uri entryUri = globals.fs.path.toUri(font['asset'] as String); result.add(_Asset( - baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'), -+ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), ++ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), relativeUri: Uri(path: entryUri.pathSegments.last), entryUri: entryUri, package: null, diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index c0946782c..bdbc35cb8 100644 +index aaca036d78..43ff428f8d 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart -@@ -202,8 +202,15 @@ class Cache { +@@ -226,8 +226,15 @@ class Cache { return; } assert(_lock == null); @@ -53,7 +53,7 @@ index c0946782c..bdbc35cb8 100644 try { _lock = lockFile.openSync(mode: FileMode.write); } on FileSystemException catch (e) { -@@ -306,7 +313,7 @@ class Cache { +@@ -330,7 +337,7 @@ class Cache { if (_rootOverride != null) { return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache')); } else { diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch index c77357ea13c5..35ce5b367350 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch @@ -1,24 +1,24 @@ -diff --git a/bin/flutter b/bin/flutter -index cdf974233..1f7de1c1b 100755 ---- a/bin/flutter -+++ b/bin/flutter -@@ -185,8 +185,6 @@ fi - # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" - # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" +diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh +index 8d613de739..a673466726 100644 +--- a/bin/internal/shared.sh ++++ b/bin/internal/shared.sh +@@ -204,8 +204,6 @@ function shared::execute() { + # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" + # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" --(upgrade_flutter) 3< "$PROG_NAME" +- upgrade_flutter 7< "$PROG_NAME" - - # FLUTTER_TOOL_ARGS isn't quoted below, because it is meant to be considered as - # separate space-separated args. - "$DART" --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@" + BIN_NAME="$(basename "$PROG_NAME")" + case "$BIN_NAME" in + flutter*) diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index b3e69714f..a9eb76234 100644 +index 8a1a1e29da..778f253358 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -301,13 +301,6 @@ class FlutterCommandRunner extends CommandRunner<void> { +@@ -293,13 +293,6 @@ class FlutterCommandRunner extends CommandRunner<void> { + globals.flutterUsage.suppressAnalytics = true; } - _checkFlutterCopy(); - try { - await globals.flutterVersion.ensureVersionFile(); - } on FileSystemException catch (e) { diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch index 64950d4476ef..dc77496edb31 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch @@ -1,8 +1,8 @@ diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart -index 8e511eefd..fef3cca8b 100644 +index d045c83f04..d51973020b 100644 --- a/dev/devicelab/lib/framework/runner.dart +++ b/dev/devicelab/lib/framework/runner.dart -@@ -126,7 +126,7 @@ Future<void> cleanupSystem() async { +@@ -136,7 +136,7 @@ Future<void> cleanupSystem() async { print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)'); final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.'); @@ -12,7 +12,7 @@ index 8e511eefd..fef3cca8b 100644 if (!Platform.isWindows) { await exec( diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index c680de599..480abfb77 100644 +index 8da01315ae..bb8d61d7f2 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart @@ -8,6 +8,7 @@ import 'package:meta/meta.dart'; @@ -23,20 +23,20 @@ index c680de599..480abfb77 100644 import 'base/context.dart'; import 'base/file_system.dart'; import 'base/utils.dart'; -@@ -392,7 +393,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { +@@ -399,7 +400,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { for (final Map<dynamic, dynamic> font in (family['fonts'] as List<dynamic>).cast<Map<dynamic, dynamic>>()) { final Uri entryUri = globals.fs.path.toUri(font['asset'] as String); result.add(_Asset( - baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'), -+ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), ++ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), relativeUri: Uri(path: entryUri.pathSegments.last), entryUri: entryUri, package: null, diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index c0946782c..bdbc35cb8 100644 +index a35d8f87d0..a40027dc74 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart -@@ -202,8 +202,15 @@ class Cache { +@@ -215,8 +215,15 @@ class Cache { return; } assert(_lock == null); @@ -53,7 +53,7 @@ index c0946782c..bdbc35cb8 100644 try { _lock = lockFile.openSync(mode: FileMode.write); } on FileSystemException catch (e) { -@@ -306,7 +313,7 @@ class Cache { +@@ -319,7 +326,7 @@ class Cache { if (_rootOverride != null) { return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache')); } else { |