summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe one with the braid2024-04-08 12:33:14 +0200
committerThe one with the braid2024-04-08 12:33:14 +0200
commit1ea66914c19436db72ccbf0be085df0efed25b01 (patch)
treecaf48b894578e206784fbb4ff4a6bced15a51861
parentf823fb2f3e8081af46a8dd38d262f8a50f11cd00 (diff)
downloadaur-1ea66914c19436db72ccbf0be085df0efed25b01.tar.gz
fix: system Dart patch
Signed-off-by: The one with the braid <info@braid.business>
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--system-dart.patch15
3 files changed, 16 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4a37b2863b25..b68d347db0b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = flutter
pkgdesc = A new mobile app SDK to help developers and designers build modern mobile apps for iOS and Android.
pkgver = 3.19.5
- pkgrel = 7
+ pkgrel = 8
url = https://flutter.dev
arch = x86_64
arch = aarch64
@@ -24,7 +24,7 @@ pkgbase = flutter
source = doctor.patch
source = opt-in-analytics.patch
sha256sums = f9c737cbf6551ca4a68ac826131e1b71f6d173fe83da42521c8f5513c287c57d
- sha256sums = d721fc48f534af8f804bb4a9f2cb1d304627a9f73881b3f61d829a9f1e33164f
+ sha256sums = a440bbf9e895ba5e53cd9b3b93838a0bf0437373ff3d78f22dee5ac13ac51732
sha256sums = de0d3567d83bd756841b19ccf879efc02749d8a45cf18d94cd71ec1d366c9024
sha256sums = b4c104129eb57e7e3edca2e23376b8b034de2d466189bdc1c3e2a304506889a3
sha256sums = 688a7d6a3c220cf09f7e48af46f1ef1b01d251679962c825eded0b3fa4fc2ab1
diff --git a/PKGBUILD b/PKGBUILD
index 68de7bb9e000..922c76be4efa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ _enginever=e76c956498841e1ab458577d3892003e553e4f3c
_materialfontsver=3012db47f3130e62f7cc0beabff968a33cbec8d8
_gradlewver=fd5c1f2c013565a3bea56ada6df9d2b8e96d56aa
_flutterarch=$(uname -m | sed s/aarch64/arm64/ | sed s/x86_64/x64/)
-pkgrel=7
+pkgrel=8
pkgdesc="A new mobile app SDK to help developers and designers build modern mobile apps for iOS and Android."
_pkgdesc="Flutter SDK component"
arch=("x86_64" "aarch64")
@@ -42,7 +42,7 @@ source=(
)
sha256sums=('f9c737cbf6551ca4a68ac826131e1b71f6d173fe83da42521c8f5513c287c57d'
- 'd721fc48f534af8f804bb4a9f2cb1d304627a9f73881b3f61d829a9f1e33164f'
+ 'a440bbf9e895ba5e53cd9b3b93838a0bf0437373ff3d78f22dee5ac13ac51732'
'de0d3567d83bd756841b19ccf879efc02749d8a45cf18d94cd71ec1d366c9024'
'b4c104129eb57e7e3edca2e23376b8b034de2d466189bdc1c3e2a304506889a3'
'688a7d6a3c220cf09f7e48af46f1ef1b01d251679962c825eded0b3fa4fc2ab1'
diff --git a/system-dart.patch b/system-dart.patch
index e42c2aecfd74..32d04f11091a 100644
--- a/system-dart.patch
+++ b/system-dart.patch
@@ -150,17 +150,26 @@
'pluginClass': pluginClass,
--- ./packages/flutter_tools/lib/src/dart/pub.dart.orig
+++ ./packages/flutter_tools/lib/src/dart/pub.dart
-@@ -545,9 +545,7 @@
+@@ -3,6 +3,7 @@
+ // found in the LICENSE file.
+
+ import 'dart:async';
++import 'dart:io' as io show Platform;
+
+ import 'package:meta/meta.dart';
+ import 'package:package_config/package_config.dart';
+@@ -545,10 +546,7 @@
List<String> _computePubCommand() {
// TODO(zanderso): refactor to use artifacts.
final String sdkPath = _fileSystem.path.joinAll(<String>[
- Cache.flutterRoot!,
- 'bin',
- 'cache',
-+ '/opt',
- 'dart-sdk',
+- 'dart-sdk',
++ io.Platform.environment['DART_ROOT'] ?? '/opt/dart-sdk',
'bin',
'dart',
+ ]);
--- ./packages/flutter_tools/lib/src/dart/language_version.dart.orig
+++ ./packages/flutter_tools/lib/src/dart/language_version.dart
@@ -3,6 +3,7 @@