rustdesk-git fvm patch

diff --git a/PKGBUILD b/PKGBUILD
index 6bbd0f6..67a942e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -40,10 +40,6 @@ _fn_VCL() {
 # Flutter has more advanced UI
 _opt_FLUTTER=1

-# 0 for package flutter, version checked
-# 1 for system flutter, version warned
-_opt_SYS_FLUTTER=0
-
 # hwcodec stopped working when it went from/to
 # 1.2.7 hwcodec v0.6.0 (https://github.com/21pages/hwcodec#89879f2f)
 # 1.3.0 hwcodec v0.7.0 (https://github.com/rustdesk-org/hwcodec#6abd1898)
@@ -156,20 +152,7 @@ source+=("${_vcs[@]}")
 if [ "${_opt_FLUTTER}" -eq 0 ]; then
   source+=("https://raw.github.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so")
 else
-  if [ "${_opt_SYS_FLUTTER}" -eq 0 ]; then
-    _FLX=(
-      '9.9.9:3.16.9' # 1.3.0
-      '1.2.7:3.19.6' # 1.3.1
-      '9.9.9:3.22.3' # 1.3.3
-      '1.4.1:3.27.4' # none
-    )
-    _FLUVER="$(_fn_VCL "${_pkgver}" -ge "${_FLX[@]}")"; unset _FLX # https://docs.flutter.dev/release/archive
-    source+=(
-      "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${_FLUVER}-stable.tar.xz"
-    )
-  else
-    makedepends+=('flutter')
-  fi
+  makedepends+=('fvm')
   if :; then
     _FRBVER='1.80.1'
     _srcdirfrb="flutter_rust_bridge-${_FRBVER}"
@@ -187,13 +170,12 @@ md5sums=('SKIP'
          '4d782be2571f14e7b74b10a385f74e15'
          'e86ff4df372dd1819ea45c540d5be13f'
          '5dd9f68970c677d6e6951df55e343635'
-         'a45fa99b7f1a972e364cc68f1ebf949c'
+         '536aa7d335654e08bb9c0a7981b4cf2f'
          '1695d39ba38a9593f4107722f3459fe0'
-         'f2f3868524b82915da3700267d116cdf'
+         '6b1f5fa02adfab0123f94ece03c1ea7a'
          '6d2b7b8e1c06f4b10ae63ca22491f8a4'
          '557a08d88aa605ee6cf4156686ce4cc2'
          '03485098fb64a000a4f7cd97e468dfff'
-         '4faa930d94db6f19d36dbbfbc5e86b5e'
          'cc8e5418ff0c163228aabbe385ba2596')
 sha256sums=('SKIP'
             'SKIP'
@@ -203,13 +185,12 @@ sha256sums=('SKIP'
             '3df9359a39b91929868265090b97d7e2365dc8cdd5aaa1473a717720b4598f55'
             '4889795777b536ea1a351982f3ef7c7b06a786ccb47036daba63cc5757c59edb'
             '0ee103cd390c3ee0e77a7a1c71dcb79a50a426fa2a648f6d07f2678c23adc5e3'
-            '06b9ea2f20a216fffac0c3991ea517ad4159df976bb7cd05084c8bfba3608fba'
+            'c825099309a1613f5bd460dc7f6d5f45263628ff60f2a99a5bc22686cad31565'
             '35fec2e1ddfb05ecf6d93e50bc57c1e54bc81c16d611ddf6eff73fff266d8285'
-            '73a4ecb598cd6824cb7a0a0d934d81b866e2762acd8eb465e1510063b4649659'
+            'ca37941beda3a3fb200124110ac19c38db18c735eb34bfc9f98b6bc1d9674bee'
             'e935eded7d81631a538bfae703fd1e293aad1c7fd3407ba00440c95105d2011e'
             '9480e329e989f70d69886ded470c7f8cfe6c0667cc4196d4837ac9e668fb7404'
             '7ddad2d992bd250a6c56053c26029f7e728bebf0f37f80cf3f8a0e6ec706431a'
-            '64df4273de625433c7ba41967932b782f5f9abf3199db8330782d64508379344'
             '5c1494e79024de228a9f383c8e52e45b042cd0cf24f4b0f47ee4d5448938b336')
 _vcs=("${_vcs[@]%%::*}")
 _vcs=("${_vcs[@]##*/}")
@@ -326,37 +307,24 @@ _dpr_check() {
   set +u
 }

-_flutter_check() {
-  set +u; msg '_flutter_check'; set -u
-  if [ "${_opt_FLUTTER}" -ne 0 ]; then
-    local _FLUTTER_VERSION
-    local _pyfv="
+_read_flutter_version() {
+  local _pyfv="
 import yaml
 import io
-#with open('.github/workflows/flutter-build.yml', 'r') as stream:
-with open('.github/workflows/bridge.yml', 'r') as stream:
+with open('.github/workflows/flutter-build.yml', 'r') as stream:
+#with open('.github/workflows/bridge.yml', 'r') as stream:
     data_loaded = yaml.safe_load(stream)
 #print(data_loaded.get('env').keys())
 print(data_loaded.get('env').get('FLUTTER_VERSION'))
 "
-    _FLUTTER_VERSION="$(python -c "${_pyfv}")"
-    if [ "${_opt_SYS_FLUTTER}" -ne 0 ]; then
-      local _FLUVER
-      _FLUVER="$(pacman -Q flutter)"
-      _FLUVER="${_FLUVER##* }"
-      _FLUVER="${_FLUVER%%-*}"
-    fi
-    if [ "${_FLUTTER_VERSION}" != "${_FLUVER}" ]; then
-      if [ "${_opt_SYS_FLUTTER}" -ne 0 ]; then
-        set +u; msg2 "Warning: expected Flutter version is ${_FLUTTER_VERSION}"; set -u
-        _FLUTTER_VERSION="${_FLUVER}"
-      else
-        printf 'Flutter version has changed to %s from %s\n' "${_FLUTTER_VERSION}" "${_FLUVER}"
-        #set +u
-        #false
-      fi
-    fi
-    set +u; msg2 "FLUTTER_VERSION=${_FLUTTER_VERSION}"; set -u
+  pushd "${srcdir}/${_srcdir}" > /dev/null
+    python -c "${_pyfv}"
+  popd > /dev/null
+}
+
+_flutter_check() {
+  set +u; msg '_flutter_check'; set -u
+  if [ "${_opt_FLUTTER}" -ne 0 ]; then
     local _flutter_rust_bridge
     local _pyfrb="
 import toml
@@ -415,15 +383,34 @@ prepare() {
   popd > /dev/null
   set -u
   if [ "${_opt_FLUTTER}" -ne 0 ]; then
-    if [ "${_opt_SYS_FLUTTER}" -ne 0 ]; then
-      set +u; msg2 'Copy /opt/flutter'; set -u
-      rm -rf 'flutter'
-      if [ -d '/opt/flutter' ]; then
-        cp -pr '/opt/flutter' .
-      else
-        cp -pr '/usr/lib/flutter' .
-      fi
-    fi
+    pushd "${_srcdir}/flutter" > /dev/null
+      local _flutter_ver="$(_read_flutter_version)"
+      export FVM_CACHE_PATH="$SRCDEST/fvm-cache"
+      fvm install "$_flutter_ver"
+      fvm use -f "$_flutter_ver"
+    popd > /dev/null
+    mkdir -p 'flutter'
+    install -Dm755 <(cat << EOF
+#!/usr/bin/bash
+
+# https://github.com/flutter/flutter/issues/59533
+# Gets rid of all the unnecessary downloads
+
+echo '#fvm flutter --no-version-check' "\$@"
+fvm flutter --no-version-check "\$@"
+EOF
+    ) 'flutter/flutter'
+
+    install -Dm755 <(cat << EOF
+#!/usr/bin/bash
+
+# dart doesn't do a version check. Let's reveal the commands.
+
+echo '#fvm dart' "\$@"
+fvm dart "\$@"
+EOF
+    ) 'flutter/dart'
+
     if [ ! -d 'flutter_rust_bridge' ]; then
       ln -s "flutter_rust_bridge-${_FRBVER}" 'flutter_rust_bridge'
       test -d 'flutter_rust_bridge'
@@ -510,34 +497,8 @@ build() {
     export CPATH="$(clang -v 2>&1 | grep "Selected GCC installation: " | cut -d' ' -f4-)/include"
     local _oldpath="${PATH}"
     export CARGO_INCREMENTAL=0
-    export PATH="${srcdir}/flutter/bin:${_oldpath}"
-    pushd "${PATH%%:*}"
-    if [ ! -s 'flutter-NVC' ]; then
-      mv 'flutter' 'flutter-NVC'
-      cat > 'flutter' << EOF
-#!/usr/bin/bash
-
-# https://github.com/flutter/flutter/issues/59533
-# Gets rid of all the unnecessary downloads
-
-echo '#flutter --no-version-check' "\$@"
-flutter-NVC --no-version-check "\$@"
-EOF
-      chmod 755 'flutter'
-    fi
-    if [ ! -s 'dart-NVC' ]; then
-      mv 'dart' 'dart-NVC'
-      cat > 'dart' << EOF
-#!/usr/bin/bash
-
-# dart doesn't do a version check. Let's reveal the commands.
-
-echo '#dart' "\$@"
-dart-NVC "\$@"
-EOF
-      chmod 755 'dart'
-    fi
-    popd
+    export PATH="${srcdir}/flutter:${_oldpath}"
+    flutter --disable-analytics
     flutter doctor
     dart pub global activate ffigen --version 5.0.1
     pushd "${srcdir}/flutter_rust_bridge/frb_codegen"; nice -n1 cargo install --path . ; popd