diff options
| -rw-r--r-- | .SRCINFO | 83 | ||||
| -rw-r--r-- | PKGBUILD | 19 | ||||
| -rw-r--r-- | gradle-user-home.patch | 2 | ||||
| -rw-r--r-- | system-dart.patch | 14 |
4 files changed, 60 insertions, 58 deletions
@@ -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 = 8 + pkgver = 3.22.0 + pkgrel = 1 url = https://flutter.dev arch = x86_64 arch = aarch64 @@ -9,12 +9,13 @@ pkgbase = flutter license = custom license = BSD license = CCPL - makedepends = dart>=3.2.0 + makedepends = dart>=3.4.0 + makedepends = dart<3.5.0 makedepends = jq makedepends = gradle makedepends = unzip options = !emptydirs - source = flutter-3.19.5.tar.xz::https://github.com/flutter/flutter/archive/refs/tags/3.19.5.tar.gz + source = flutter-3.22.0.tar.xz::https://github.com/flutter/flutter/archive/refs/tags/3.22.0.tar.gz source = system-dart.patch source = gradle-user-home.patch source = flutter.sh @@ -23,9 +24,9 @@ pkgbase = flutter source = no-runtime-download.patch source = doctor.patch source = opt-in-analytics.patch - sha256sums = f9c737cbf6551ca4a68ac826131e1b71f6d173fe83da42521c8f5513c287c57d - sha256sums = a440bbf9e895ba5e53cd9b3b93838a0bf0437373ff3d78f22dee5ac13ac51732 - sha256sums = de0d3567d83bd756841b19ccf879efc02749d8a45cf18d94cd71ec1d366c9024 + sha256sums = 015a98e1944be1e1b894433a8ceee6632d46832163c651091eeddb569c975e0c + sha256sums = f0fb98748a911a546fb8211e4ff4b9ed5c8d4631042445e9829caa67b0380aaf + sha256sums = ae41d1ee4b6819bf9747a7ff1c02cf98ca554e88f9c0d78dd9aeaf9865cc5eb1 sha256sums = b4c104129eb57e7e3edca2e23376b8b034de2d466189bdc1c3e2a304506889a3 sha256sums = 688a7d6a3c220cf09f7e48af46f1ef1b01d251679962c825eded0b3fa4fc2ab1 sha256sums = 544d08716332a9f9358b21010d468b84a9edff0da7bbb1baf0cf4d6322821ea5 @@ -35,36 +36,36 @@ pkgbase = flutter pkgname = flutter pkgdesc = Flutter SDK component - full installation of development tool and runtime - depends = flutter-devel=3.19.5 - depends = flutter-target-linux=3.19.5 - depends = flutter-target-android=3.19.5 - depends = flutter-target-web=3.19.5 - depends = flutter-intellij-patch=3.19.5 + depends = flutter-devel=3.22.0 + depends = flutter-target-linux=3.22.0 + depends = flutter-target-android=3.22.0 + depends = flutter-target-web=3.22.0 + depends = flutter-intellij-patch=3.22.0 conflicts = flutter pkgname = flutter-common pkgdesc = Flutter SDK component - common SDK files and pub cache install = flutter-common.install - conflicts = flutter<3.19.5 - conflicts = flutter-engine-common<3.19.5 - conflicts = flutter-intellij-patch<3.19.5 - conflicts = flutter-gradle<3.19.5 - conflicts = flutter-engine-android<3.19.5 - conflicts = flutter-engine-linux<3.19.5 - conflicts = flutter-engine-web<3.19.5 - conflicts = flutter-tool<3.19.5 - conflicts = flutter-devel<3.19.5 + conflicts = flutter<3.22.0 + conflicts = flutter-engine-common<3.22.0 + conflicts = flutter-intellij-patch<3.22.0 + conflicts = flutter-gradle<3.22.0 + conflicts = flutter-engine-android<3.22.0 + conflicts = flutter-engine-linux<3.22.0 + conflicts = flutter-engine-web<3.22.0 + conflicts = flutter-tool<3.22.0 + conflicts = flutter-devel<3.22.0 pkgname = flutter-gradle pkgdesc = Flutter SDK component - gradle wrapper - provides = flutter-gradle=3.19.5 + provides = flutter-gradle=3.22.0 conflicts = flutter-gradle - conflicts = flutter-target-android<3.19.5 + conflicts = flutter-target-android<3.22.0 pkgname = flutter-tool pkgdesc = Flutter SDK component - CLI tool (for packaging only) - depends = flutter-common=3.19.5 - depends = dart>=3.2.0 + depends = flutter-common=3.22.0 + depends = dart>=3.4.0 depends = bash depends = curl depends = file @@ -75,23 +76,23 @@ pkgname = flutter-tool depends = xz depends = zip depends = glu - conflicts = flutter-devel<3.19.5 - conflicts = flutter-target-android<3.19.5 - conflicts = flutter-target-linux<3.19.5 - conflicts = flutter-target-web<3.19.5 + conflicts = flutter-devel<3.22.0 + conflicts = flutter-target-android<3.22.0 + conflicts = flutter-target-linux<3.22.0 + conflicts = flutter-target-web<3.22.0 pkgname = flutter-devel pkgdesc = Flutter SDK component - CLI tool (for application development) - depends = flutter-tool=3.19.5 - depends = dart>=3.2.0 - conflicts = flutter<3.19.5 + depends = flutter-tool=3.22.0 + depends = dart>=3.4.0 + conflicts = flutter<3.22.0 replaces = flutter-tool-developer pkgname = flutter-target-linux pkgdesc = Flutter SDK component - linux target files - depends = flutter-tool=3.19.5 - depends = flutter-engine-linux=3.19.5 - depends = dart>=3.2.0 + depends = flutter-tool=3.22.0 + depends = flutter-engine-linux=3.22.0 + depends = dart>=3.4.0 depends = clang depends = cmake depends = ninja @@ -101,20 +102,20 @@ pkgname = flutter-target-linux pkgname = flutter-target-android pkgdesc = Flutter SDK component - android target files - depends = flutter-tool=3.19.5 - depends = flutter-engine-android=3.19.5 - depends = flutter-gradle=3.19.5 + depends = flutter-tool=3.22.0 + depends = flutter-engine-android=3.22.0 + depends = flutter-gradle=3.22.0 optdepends = android-sdk: develop for Android devices optdepends = java-environment: develop for Android devices pkgname = flutter-target-web pkgdesc = Flutter SDK component - web target files - depends = flutter-tool=3.19.5 - depends = flutter-engine-web=3.19.5 + depends = flutter-tool=3.22.0 + depends = flutter-engine-web=3.22.0 pkgname = flutter-intellij-patch pkgdesc = Flutter SDK component - IntelliJ Flutter plugin hotfix - depends = flutter-common=3.19.5 + depends = flutter-common=3.22.0 optdepends = android-studio optdepends = intellij-idea-community-edition optdepends = intellij-idea-ultimate-edition @@ -5,13 +5,13 @@ pkgbase=flutter _group=flutter groups=("$_group") -pkgver=3.19.5 -_dartver=(3.2.0 4.0.0) -_enginever=e76c956498841e1ab458577d3892003e553e4f3c +pkgver=3.22.0 +_dartver=(3.4.0 3.5.0) +_enginever=f6344b75dcf861d8bf1f1322780b8811f982e31a _materialfontsver=3012db47f3130e62f7cc0beabff968a33cbec8d8 _gradlewver=fd5c1f2c013565a3bea56ada6df9d2b8e96d56aa -_flutterarch=$(uname -m | sed s/aarch64/arm64/ | sed s/x86_64/x64/) -pkgrel=8 +_flutterarch=$(echo "$CARCH" | sed s/aarch64/arm64/ | sed s/x86_64/x64/) +pkgrel=1 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") @@ -19,8 +19,7 @@ url="https://${_group}.dev" license=("custom" "BSD" "CCPL") makedepends=( "dart>=${_dartver[0]}" - # this breaks using the aur/dart-sdk-dev package - # "dart<${_dartver[1]}" + "dart<${_dartver[1]}" "jq" "gradle" "unzip" @@ -41,9 +40,9 @@ source=( "opt-in-analytics.patch" ) -sha256sums=('f9c737cbf6551ca4a68ac826131e1b71f6d173fe83da42521c8f5513c287c57d' - 'a440bbf9e895ba5e53cd9b3b93838a0bf0437373ff3d78f22dee5ac13ac51732' - 'de0d3567d83bd756841b19ccf879efc02749d8a45cf18d94cd71ec1d366c9024' +sha256sums=('015a98e1944be1e1b894433a8ceee6632d46832163c651091eeddb569c975e0c' + 'f0fb98748a911a546fb8211e4ff4b9ed5c8d4631042445e9829caa67b0380aaf' + 'ae41d1ee4b6819bf9747a7ff1c02cf98ca554e88f9c0d78dd9aeaf9865cc5eb1' 'b4c104129eb57e7e3edca2e23376b8b034de2d466189bdc1c3e2a304506889a3' '688a7d6a3c220cf09f7e48af46f1ef1b01d251679962c825eded0b3fa4fc2ab1' '544d08716332a9f9358b21010d468b84a9edff0da7bbb1baf0cf4d6322821ea5' diff --git a/gradle-user-home.patch b/gradle-user-home.patch index 893f9347cd36..2e98fbc6e448 100644 --- a/gradle-user-home.patch +++ b/gradle-user-home.patch @@ -6,9 +6,9 @@ +project.buildDir = file(project.gradle.gradleUserHomeDir.path + "/flutter/build") + - group = "dev.flutter.plugin" version = "1.0.0" + --- ./packages/flutter_tools/lib/src/android/gradle.dart.orig +++ ./packages/flutter_tools/lib/src/android/gradle.dart @@ -2,6 +2,7 @@ diff --git a/system-dart.patch b/system-dart.patch index 32d04f11091a..10427a7fcfe7 100644 --- a/system-dart.patch +++ b/system-dart.patch @@ -28,15 +28,15 @@ +exec "${DART_ROOT:-"/opt/dart-sdk"}/bin/dart" "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.dart" "${@:1}" --- ./packages/flutter_tools/gradle/src/main/groovy/flutter.groovy.orig +++ ./packages/flutter_tools/gradle/src/main/groovy/flutter.groovy -@@ -264,7 +264,7 @@ +@@ -324,7 +324,7 @@ } String flutterExecutableName = Os.isFamily(Os.FAMILY_WINDOWS) ? "flutter.bat" : "flutter" -- flutterExecutable = Paths.get(flutterRoot.absolutePath, "bin", flutterExecutableName).toFile(); -+ flutterExecutable = Paths.get("/usr", "bin", flutterExecutableName).toFile(); +- flutterExecutable = Paths.get(flutterRoot.absolutePath, "bin", flutterExecutableName).toFile() ++ flutterExecutable = Paths.get("/usr", "bin", flutterExecutableName).toFile() - if (project.hasProperty("multidex-enabled") && - project.property("multidex-enabled").toBoolean()) { + // Validate that the provided Gradle, Java, AGP, and KGP versions are all within our + // supported range. --- ./packages/flutter_tools/lib/src/artifacts.dart.orig +++ ./packages/flutter_tools/lib/src/artifacts.dart @@ -2,6 +2,8 @@ @@ -48,7 +48,7 @@ import 'package:file/memory.dart'; import 'package:meta/meta.dart'; import 'package:process/process.dart'; -@@ -1059,48 +1061,7 @@ +@@ -1176,50 +1176,7 @@ } String _getDartSdkPath() { @@ -82,6 +82,8 @@ - return 'linux-x64'; - case TargetPlatform.windows_x64: - return 'windows-x64'; +- case TargetPlatform.windows_arm64: +- return 'windows-arm64'; - case TargetPlatform.ios: - case TargetPlatform.android: - case TargetPlatform.android_arm: |