diff --git a/.SRCINFO b/.SRCINFO index db488af66e572..a7966c65ed333 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = fvm-sourcebuild pkgdesc = Flutter Version Management: A simple CLI to manage Flutter SDK versions. (Build engine from sources) pkgver = 3.2.1 - pkgrel = 1 + pkgrel = 2 url = https://fvm.app arch = x86_64 license = MIT @@ -12,7 +12,7 @@ pkgbase = fvm-sourcebuild source = fvm-3.2.1.tar.gz::https://github.com/leoafarias/fvm/archive/refs/tags/3.2.1.tar.gz source = fvm-sourcebuild-wrapper sha256sums = d4d524a5e1d7c5160b17ee9c3b2dd4482224d2e1c27c8d494fa0290ae818cd41 - sha256sums = fd1bc3d2e4a768ddde30371accf3b8ea227565a4d086ff7bc24801c7c9cd9cc1 + sha256sums = 4f288030ee4eb9926d00a38a135a4d2a0ed29bc71a2a04921e09f06aaad5535f pkgname = fvm-sourcebuild depends = cmake diff --git a/PKGBUILD b/PKGBUILD index 9570c3bab794b..76331600e35f4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ _pkgname=fvm pkgname=${_pkgname}-sourcebuild pkgver=3.2.1 -pkgrel=1 +pkgrel=2 provides=(${_pkgname}) conflicts=(${_pkgname}) pkgdesc="Flutter Version Management: A simple CLI to manage Flutter SDK versions. (Build engine from sources)" @@ -18,7 +18,7 @@ source=( "$_pkgname-$pkgver.tar.gz::https://github.com/leoafarias/fvm/archive/refs/tags/$pkgver.tar.gz" "${pkgname}-wrapper") sha256sums=('d4d524a5e1d7c5160b17ee9c3b2dd4482224d2e1c27c8d494fa0290ae818cd41' - 'fd1bc3d2e4a768ddde30371accf3b8ea227565a4d086ff7bc24801c7c9cd9cc1') + '4f288030ee4eb9926d00a38a135a4d2a0ed29bc71a2a04921e09f06aaad5535f') prepare() { cd "$_pkgname-$pkgver" diff --git a/fvm-sourcebuild-wrapper b/fvm-sourcebuild-wrapper index bae1882a04aa5..3a68cbd49a6b2 100755 --- a/fvm-sourcebuild-wrapper +++ b/fvm-sourcebuild-wrapper @@ -49,9 +49,10 @@ setup_flutter_env() _patch_flutter() { - sed -i 's|--no-enable-mirrors "$SCRIPT_PATH"|--no-enable-mirrors "$SCRIPT_PATH" $ARCH_FLUTTER_OPTS|' \ - "$1/bin/internal/shared.sh" - sed -i 's|exec "$DART" --disable-dart-dev --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@"|exec "$DART" --disable-dart-dev --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" $ARCH_FLUTTER_OPTS "$@"|' \ + sed -i \ + -e 's|--no-enable-mirrors "$SCRIPT_PATH"|--no-enable-mirrors "$SCRIPT_PATH" $ARCH_FLUTTER_OPTS|' \ + -e 's|exec "$DART" --disable-dart-dev --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@"|exec "$DART" --disable-dart-dev --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" $ARCH_FLUTTER_OPTS "$@"|' \ + -e 's|exec "$DART" --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@"|exec "$DART" --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" $ARCH_FLUTTER_OPTS "$@"|' \ "$1/bin/internal/shared.sh" } @@ -221,6 +222,9 @@ _get_engine_version() { local -r fvm_cache_dir="$1" + #>&2 fvm.real api project + #>&2 fvm.real flutter --version + local engine_version="$(fvm.real api project | yq -er '.project.pinnedVersion.name')" if [[ -z "$engine_version" || "$engine_version" == 'null' ]]; then @@ -250,7 +254,7 @@ build_engine() mkdir -p "$cached_flutter_engine_dir" _ln "$cached_flutter_engine_dir/out" '.engine-src/engine/out' - #fvm.real api project + #>&2 fvm.real api project { flock -s 3