Update version.

This commit is contained in:
Patrick Northon 2024-08-25 18:09:33 -04:00
parent dd430f3cc6
commit 14d467ca35
3 changed files with 30 additions and 17 deletions

View file

@ -1,6 +1,6 @@
pkgbase = fvm-sourcebuild
pkgdesc = Flutter Version Management: A simple CLI to manage Flutter SDK versions. (Build engine from sources)
pkgver = 3.1.7
pkgver = 3.2.0
pkgrel = 1
url = https://fvm.app
arch = x86_64
@ -9,10 +9,10 @@ pkgbase = fvm-sourcebuild
provides = fvm
conflicts = fvm
options = !strip
source = fvm-3.1.7.tar.gz::https://github.com/leoafarias/fvm/archive/refs/tags/3.1.7.tar.gz
source = fvm-3.2.0.tar.gz::https://github.com/leoafarias/fvm/archive/refs/tags/3.2.0.tar.gz
source = fvm-sourcebuild-wrapper
sha256sums = a479b54c4ade1df99dee975adbf61b56c6dff224915e44d4914925e4dfce8b4c
sha256sums = c422a806ed809c4b95e539b26860e2df93a744a81447cc524cec22c43e797905
sha256sums = 50aed46957c4149f88682e9ac062c8aeb44a8da0b023a49aa8e3eb4cd570d72e
sha256sums = 57aa3a2f5d32b8babf06cdabc0ccb79433bc63e302b86d52ae94104e6c38e1ba
pkgname = fvm-sourcebuild
depends = cmake

View file

@ -3,7 +3,7 @@
_pkgname=fvm
pkgname=${_pkgname}-sourcebuild
pkgver=3.1.7
pkgver=3.2.0
pkgrel=1
provides=(${_pkgname})
conflicts=(${_pkgname})
@ -17,8 +17,8 @@ options=('!strip')
source=(
"$_pkgname-$pkgver.tar.gz::https://github.com/leoafarias/fvm/archive/refs/tags/$pkgver.tar.gz"
"${pkgname}-wrapper")
sha256sums=('a479b54c4ade1df99dee975adbf61b56c6dff224915e44d4914925e4dfce8b4c'
'c422a806ed809c4b95e539b26860e2df93a744a81447cc524cec22c43e797905')
sha256sums=('50aed46957c4149f88682e9ac062c8aeb44a8da0b023a49aa8e3eb4cd570d72e'
'57aa3a2f5d32b8babf06cdabc0ccb79433bc63e302b86d52ae94104e6c38e1ba')
prepare() {
cd "$_pkgname-$pkgver"

View file

@ -49,10 +49,24 @@ setup_flutter_env()
_patch_flutter()
{
#sed -i 's|"$FLUTTER_ROOT/bin/internal/update_dart_sdk.sh"|#|' "$1/bin/internal/shared.sh"
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 "$@"|' \
"$1/bin/internal/shared.sh"
#local -r dart_sdk="$(pwd)/.engine-src/engine/out/arch_release/dart-sdk"
#rm -rf "$1/bin/cache/dart-sdk" || true
#mkdir -p "$1/bin/cache"
#_ln "$dart_sdk" "$1/bin/cache/dart-sdk"
if false; then
install -Dm755 '/dev/stdin' "$1/bin/dart" << EOF
#!/usr/bin/env sh
$dart_sdk/bin/dart "\$@"
EOF
fi
}
_clone_src()
@ -98,7 +112,7 @@ _prepare_build()
local -r version="$2"
if [[ $(vercmp "$version" '3.14.0') == -1 ]]; then
local -r python_exec="python3.11"
local -r python_exec='python3.11'
else
local -r python_exec='python3'
fi
@ -245,25 +259,24 @@ build_engine()
fi
local -r cache_home="${XDG_CACHE_HOME:-"$HOME/.cache"}"
local -r cached_flutter_dir="$cache_home/flutter-engine/$ARCH_FLUTTER_TARGET_CPU/$engine_version"
local -r cached_flutter_engine_dir="$cache_home/flutter-engine/$ARCH_FLUTTER_TARGET_CPU/$engine_version"
mkdir -p "$cached_flutter_dir"
mkdir -p "$cached_flutter_engine_dir"
_ln "$cached_flutter_engine_dir/out" '.engine-src/engine/out'
#fvm.real api project
{
flock -s 3
if [[ ! -L "$cached_flutter_dir/out/arch_release" ]]; then
_prepare_build "${cached_flutter_dir}" "$engine_version" && \
_build "${cached_flutter_dir}" && \
_install "${cached_flutter_dir}" || \
if [[ ! -L "$cached_flutter_engine_dir/out/arch_release" ]]; then
_prepare_build "${cached_flutter_engine_dir}" "$engine_version" && \
_build "${cached_flutter_engine_dir}" && \
_install "${cached_flutter_engine_dir}" || \
{ return 1; }
fi
} 3> "$cached_flutter_dir/.lock"
_ln "$cached_flutter_dir/out" '.engine-src/engine/out'
} 3> "$cached_flutter_engine_dir/.lock"
}
download_and_patch()