diff options
Diffstat (limited to 'pkgs/development/compilers/flutter/patches')
7 files changed, 0 insertions, 153 deletions
diff --git a/pkgs/development/compilers/flutter/patches/copy-without-perms.patch b/pkgs/development/compilers/flutter/patches/copy-without-perms.patch deleted file mode 100644 index 281b3840891f..000000000000 --- a/pkgs/development/compilers/flutter/patches/copy-without-perms.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/build_system/targets/assets.dart b/packages/flutter_tools/lib/src/build_system/targets/assets.dart -index 5f458bd53e..7a6c59f98d 100644 ---- a/packages/flutter_tools/lib/src/build_system/targets/assets.dart -+++ b/packages/flutter_tools/lib/src/build_system/targets/assets.dart -@@ -128,7 +128,11 @@ Future<Depfile> copyAssets( - break; - } - if (doCopy) { -- await (content.file as File).copy(file.path); -+ // Not using File.copy because it preserves permissions. -+ final sourceFile = content.file as File; -+ final destinationFile = file; -+ -+ await destinationFile.writeAsBytes(await sourceFile.readAsBytes(), flush: true); - } - } else { - await file.writeAsBytes(await entry.value.contentsAsBytes()); diff --git a/pkgs/development/compilers/flutter/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/patches/deregister-pub-dependencies-artifact.patch deleted file mode 100644 index 01e34c6d292c..000000000000 --- a/pkgs/development/compilers/flutter/patches/deregister-pub-dependencies-artifact.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart -index 252021cf78..e50ef0885d 100644 ---- a/packages/flutter_tools/lib/src/flutter_cache.dart -+++ b/packages/flutter_tools/lib/src/flutter_cache.dart -@@ -51,14 +51,6 @@ class FlutterCache extends Cache { - registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform)); - } - registerArtifact(FontSubsetArtifacts(this, platform: platform)); -- registerArtifact(PubDependencies( -- logger: logger, -- // flutter root and pub must be lazily initialized to avoid accessing -- // before the version is determined. -- flutterRoot: () => Cache.flutterRoot!, -- pub: () => pub, -- projectFactory: projectFactory, -- )); - } - } - \ No newline at end of file diff --git a/pkgs/development/compilers/flutter/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/disable-auto-update.patch deleted file mode 100644 index 05960c01b737..000000000000 --- a/pkgs/development/compilers/flutter/patches/disable-auto-update.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart -index b7e624b4e2..edfdde118b 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart -@@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and - - // Populate the cache. We call this before pub get below so that the - // sky_engine package is available in the flutter cache for pub to find. -- if (shouldUpdateCache) { -+ if (false) { - // First always update universal artifacts, as some of these (e.g. - // ios-deploy on macOS) are required to determine `requiredArtifacts`. - final bool offline; -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 5d6d78639f..90a4dfa555 100644 ---- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - globals.flutterUsage.suppressAnalytics = true; - } - -- globals.flutterVersion.ensureVersionFile(); - final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; - final bool ci = await globals.botDetector.isRunningOnBot; - final bool redirectedCompletion = !globals.stdio.hasTerminal && -@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false; - final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag; - -- if (topLevelResults.command?.name != 'upgrade' && -- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { -- await globals.flutterVersion.checkFlutterVersionFreshness(); -- } -- - // See if the user specified a specific device. - final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; - if (specifiedDeviceId != null) { diff --git a/pkgs/development/compilers/flutter/patches/dont-validate-executable-location.patch b/pkgs/development/compilers/flutter/patches/dont-validate-executable-location.patch deleted file mode 100644 index 5f391265ce15..000000000000 --- a/pkgs/development/compilers/flutter/patches/dont-validate-executable-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/doctor.dart b/packages/flutter_tools/lib/src/doctor.dart -index 651dc6cf36..236eb370e1 100644 ---- a/packages/flutter_tools/lib/src/doctor.dart -+++ b/packages/flutter_tools/lib/src/doctor.dart -@@ -515,7 +515,6 @@ class FlutterValidator extends DoctorValidator { - final String flutterRoot = _flutterRoot(); - messages.add(_getFlutterVersionMessage(frameworkVersion, versionChannel, flutterRoot)); - -- _validateRequiredBinaries(flutterRoot).forEach(messages.add); - messages.add(_getFlutterUpstreamMessage(version)); - if (gitUrl != null) { - messages.add(ValidationMessage(_userMessages.flutterGitUrl(gitUrl))); diff --git a/pkgs/development/compilers/flutter/patches/flutter-pub-dart-override.patch b/pkgs/development/compilers/flutter/patches/flutter-pub-dart-override.patch deleted file mode 100644 index 9d1de65c320d..000000000000 --- a/pkgs/development/compilers/flutter/patches/flutter-pub-dart-override.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ddb81649092776ecac635af7040685588798b5a5 Mon Sep 17 00:00:00 2001 -From: hacker1024 <hacker1024@users.sourceforge.net> -Date: Sun, 27 Aug 2023 22:47:24 +1000 -Subject: [PATCH] Allow replacing the Dart binary used for Pub commands with - NIX_FLUTTER_PUB_DART - ---- - packages/flutter_tools/lib/src/dart/pub.dart | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/packages/flutter_tools/lib/src/dart/pub.dart b/packages/flutter_tools/lib/src/dart/pub.dart -index 40e60f9005..22fd3cebc7 100644 ---- a/packages/flutter_tools/lib/src/dart/pub.dart -+++ b/packages/flutter_tools/lib/src/dart/pub.dart -@@ -3,6 +3,7 @@ - // found in the LICENSE file. - - import 'dart:async'; -+import 'dart:io' as io; - - import 'package:meta/meta.dart'; - import 'package:package_config/package_config.dart'; -@@ -544,7 +545,7 @@ class _DefaultPub implements Pub { - - List<String> _computePubCommand() { - // TODO(zanderso): refactor to use artifacts. -- final String sdkPath = _fileSystem.path.joinAll(<String>[ -+ final String sdkPath = io.Platform.environment['NIX_FLUTTER_PUB_DART'] ?? _fileSystem.path.joinAll(<String>[ - Cache.flutterRoot!, - 'bin', - 'cache', --- -2.41.0 - diff --git a/pkgs/development/compilers/flutter/patches/override-host-platform.patch b/pkgs/development/compilers/flutter/patches/override-host-platform.patch deleted file mode 100644 index 42c16791a561..000000000000 --- a/pkgs/development/compilers/flutter/patches/override-host-platform.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/base/os.dart b/packages/flutter_tools/lib/src/base/os.dart -index 1ce1951cef..1bd7602318 100644 ---- a/packages/flutter_tools/lib/src/base/os.dart -+++ b/packages/flutter_tools/lib/src/base/os.dart -@@ -260,7 +260,15 @@ class _PosixUtils extends OperatingSystemUtils { - @override - String get pathVarSeparator => ':'; - -- HostPlatform? _hostPlatform; -+ // uname outputs build platform characteristics, not host platform characteristics. -+ // _MacOSUtils uses sysctl instead, which is still incorrect. -+ HostPlatform? _hostPlatform = switch (const String.fromEnvironment('NIX_FLUTTER_HOST_PLATFORM')) { -+ 'x86_64-linux' => HostPlatform.linux_x64, -+ 'aarch64-linux' => HostPlatform.linux_arm64, -+ 'x86_64-darwin' => HostPlatform.darwin_x64, -+ 'aarch64-darwin' => HostPlatform.darwin_arm64, -+ String value => throw ArgumentError.value(value, 'NIX_FLUTTER_HOST_PLATFORM', 'Unknown Nix host platform!'), -+ }; - - @override - HostPlatform get hostPlatform { diff --git a/pkgs/development/compilers/flutter/patches/override-operating-system.patch b/pkgs/development/compilers/flutter/patches/override-operating-system.patch deleted file mode 100644 index 07d57175bd9a..000000000000 --- a/pkgs/development/compilers/flutter/patches/override-operating-system.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/base/platform.dart b/packages/flutter_tools/lib/src/base/platform.dart -index 45da89ad4c..2d79dbaece 100644 ---- a/packages/flutter_tools/lib/src/base/platform.dart -+++ b/packages/flutter_tools/lib/src/base/platform.dart -@@ -132,7 +132,7 @@ class LocalPlatform extends Platform { - String get pathSeparator => io.Platform.pathSeparator; - - @override -- String get operatingSystem => io.Platform.operatingSystem; -+ String get operatingSystem => io.Platform.environment['NIX_FLUTTER_OPERATING_SYSTEM'] ?? io.Platform.operatingSystem; - - @override - String get operatingSystemVersion => io.Platform.operatingSystemVersion; |