3.10.5

5 files changed, 79 insertions, 120 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 86cbf165b9d2..25417deeca96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = flutter-light
-	pkgver = 3.7.12
+	pkgver = 3.10.5
 	pkgrel = 1
 	url = https://flutter.dev
 	arch = x86_64
@@ -12,19 +12,17 @@ pkgbase = flutter-light
 	optdepends = android-studio
 	optdepends = intellij-idea-community-edition
 	optdepends = intellij-idea-ultimate-edition
+	optdepends = cmake
 	optdepends = ninja
 	optdepends = perl
 	optdepends = python
-	options = !emptydirs
+	options = emptydirs
 	options = !strip
 	source = flutter.sh
-	source = flutter.csh
-	sha256sums = 1dea1952d386c43948b9970382c2da5b65b7870684b8ad2ad89124e873aa485a
-	sha256sums = 7ef10d753cfaac52d243549764a793f44f8284a1f4b11715ccd2fa915b026a6f
+	sha256sums = 5993b28055a91eea1888ebda54b08e2131b6fae9ff41d35318df1042cc5f9b07
 
 pkgname = flutter-light-common
 	pkgdesc = A new mobile app SDK to help developers and designers build modern mobile apps for iOS and Android. Using the dart package provided by Arch devs (slower updates)
-	install = flutter-light.install
 	arch = x86_64
 	arch = aarch64
 	depends = git
@@ -41,19 +39,19 @@ pkgname = flutter-light-common
 	backup = opt/flutter/packages/flutter/pubspec.yaml
 
 pkgname = flutter-light-android-arm
-	depends = flutter
+	depends = flutter-light-common
 
 pkgname = flutter-light-android-arm64
-	depends = flutter
+	depends = flutter-light-common
 
 pkgname = flutter-light-android-x86
-	depends = flutter
+	depends = flutter-light-common
 
 pkgname = flutter-light-android-x64
-	depends = flutter
+	depends = flutter-light-common
 
 pkgname = flutter-light-web
-	depends = flutter
+	depends = flutter-light-common
 
 pkgname = flutter-light-linux
-	depends = flutter
+	depends = flutter-light-common
diff --git a/PKGBUILD b/PKGBUILD
index 91e62788aff6..cf32cf1b49e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,35 +4,39 @@
 
 pkgname=('flutter-light-common' 'flutter-light-android-arm' 'flutter-light-android-arm64' 'flutter-light-android-x86' 'flutter-light-android-x64' 'flutter-light-web' 'flutter-light-linux')
 pkgbase=flutter-light
-_pkgname=flutter
-pkgver=3.7.12
+pkgver=3.10.5
 pkgrel=1
 makedepends=("python")
-optdepends=("android-sdk" "android-studio" "intellij-idea-community-edition" "intellij-idea-ultimate-edition" "ninja" "perl" "python")
+optdepends=("android-sdk" "android-studio" "intellij-idea-community-edition" "intellij-idea-ultimate-edition" "cmake" "ninja" "perl" "python")
 
 arch=("x86_64" "aarch64")
-url="https://${_pkgname}.dev"
+url="https://flutter.dev"
 license=("custom" "BSD" "CCPL")
-options=("!emptydirs" "!strip")
+options=("emptydirs" "!strip")
 source=(
-  "${_pkgname}.sh"
-  "${_pkgname}.csh"
+  "flutter.sh"
 )
 
-sha256sums=('1dea1952d386c43948b9970382c2da5b65b7870684b8ad2ad89124e873aa485a'
-            '7ef10d753cfaac52d243549764a793f44f8284a1f4b11715ccd2fa915b026a6f')
+sha256sums=('5993b28055a91eea1888ebda54b08e2131b6fae9ff41d35318df1042cc5f9b07')
 
 prepare() {
-  rm -rf $srcdir/$_pkgname
-  git clone https://github.com/flutter/flutter.git --depth 1 -b $pkgver $_pkgname
-  cd $srcdir/$_pkgname
-  rm -rf bin/cache .pub-cache
-  #sed -i "s/\$FLUTTER_ROOT\/bin\/cache\/dart-sdk/\/opt\/dart-sdk/g" "${srcdir}/${_pkgname}/bin/internal/shared.sh"
-  sed -i "/\"\$FLUTTER_ROOT\/bin\/internal\/update_dart_sdk.sh\"/d" "${srcdir}/${_pkgname}/bin/internal/shared.sh"
-  mkdir -p "${srcdir}/${_pkgname}/bin/cache/"
-  ln -sf "/opt/dart-sdk" "${srcdir}/${_pkgname}/bin/cache/dart-sdk"
-  ln -s "${srcdir}/${_pkgname}/bin/internal/engine.version" "${srcdir}/${_pkgname}/bin/cache/engine.stamp"
-  "${srcdir}/${_pkgname}/bin/flutter" precache
+  if [ ! -e $srcdir/flutter ]; then
+    git clone https://github.com/flutter/flutter.git --depth 1 -b stable
+  fi
+  cd $srcdir/flutter
+  git clean -dfx
+  _ver=$(git tag -l)
+  if [[ $_ver != $pkgver  ]]; then
+	git pull --update-shallow
+  fi
+  _ver=$(git tag -l)
+  if [[ $_ver != $pkgver  ]]; then
+  	exit 1
+  fi
+  sed -i "/\"\$FLUTTER_ROOT\/bin\/internal\/update_dart_sdk.sh\"/d" "${srcdir}/flutter/bin/internal/shared.sh"
+  mkdir -p "${srcdir}/flutter/bin/cache/"
+  ln -sf "/opt/dart-sdk" "${srcdir}/flutter/bin/cache/"
+  "${srcdir}/flutter/bin/flutter" --no-version-check precache
 }
 
 package_flutter-light-common() {
@@ -40,82 +44,79 @@ package_flutter-light-common() {
   conflicts=(flutter)
   depends=("git" "glu" "java-environment>=8" "libglvnd" "unzip" "dart" "flutter-light-android-arm64" "dart")
   arch=("x86_64" "aarch64")
-  backup=("opt/${_pkgname}/packages/${_pkgname}_test/pubspec.yaml" "opt/${_pkgname}/packages/${_pkgname}/pubspec.yaml")
+  backup=("opt/flutter/packages/flutter_test/pubspec.yaml" "opt/flutter/packages/flutter/pubspec.yaml")
   pkgdesc="A new mobile app SDK to help developers and designers build modern mobile apps for iOS and Android. Using the dart package provided by Arch devs (slower updates)"
-  install="${pkgbase}.install"
   
-  install -Dm644 "${srcdir}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
-  install -Dm755 "${srcdir}/${_pkgname}.sh" "${pkgdir}/etc/profile.d/${_pkgname}.sh"
-  install -Dm755 "${srcdir}/${_pkgname}.csh" "${pkgdir}/etc/profile.d/${_pkgname}.csh"
-  install -dm755 "${pkgdir}/opt/${_pkgname}"
+  install -Dm644 "${srcdir}/flutter/LICENSE" "${pkgdir}/usr/share/licenses/flutter/LICENSE"
+  install -Dm755 "${srcdir}/flutter.sh" "${pkgdir}/usr/bin/flutter"
+  install -dm755 "${pkgdir}/opt/flutter"
   install -dm755 "${pkgdir}/usr/bin"
-  cp -ra "${srcdir}/${_pkgname}" "${pkgdir}/opt/"
-  rm -rf ${pkgdir}/opt/${_pkgname}/bin/cache/artifacts/engine/{android*,linux*}
-  rm -rf "${pkgdir}/opt/${_pkgname}/bin/cache/flutter_web_sdk"
-  find "${pkgdir}/opt/${_pkgname}" -type d -exec chmod a+rx {} +
-  find "${pkgdir}/opt/${_pkgname}" -type f -exec chmod a+r {} +
+  cp -ra "${srcdir}/flutter" "${pkgdir}/opt/"
+  rm -rf ${pkgdir}/opt/flutter/bin/cache/artifacts/engine/{android*,linux*} ${pkgdir}/opt/flutter/bin/cache/flutter_web_sdk
+
+  # version overriding, something broken; not my fault *grumble*
+  echo "${pkgver}" > "${pkgdir}/opt/flutter/version" 
+  find "${pkgdir}/opt/flutter" -type d -exec chmod a+rx {} +
+  find "${pkgdir}/opt/flutter" -type f -exec chmod a+r {} +
+
   # those files *must* be read-write for end-users; not my fault *grumble*
-  chmod a+rw "${pkgdir}/opt/${_pkgname}/version" "${pkgdir}/opt/${_pkgname}/bin/cache/lockfile" "${pkgdir}/opt/${_pkgname}/bin/cache/usbmuxd.stamp" "${pkgdir}/opt/${_pkgname}/bin/cache/libimobiledevice.stamp"
-  ln -s "/opt/${pkgname}/bin/${_pkgname}" "${pkgdir}/usr/bin/"
+  chmod a+rw "${pkgdir}/opt/flutter"
+  chmod -R a+rw "${pkgdir}/opt/flutter/version" "${pkgdir}/opt/flutter/bin/cache" "${pkgdir}/opt/flutter/.git"
+  find "${pkgdir}/opt/flutter" -name "pubspec.lock" -exec chmod a+rw {} +
+  find "${pkgdir}/opt/flutter" -name "package_config.json" -exec chmod a+rw {} +
+  find "${pkgdir}/opt/${pkgname}" -name "package_config.json" -exec chmod a+rw {} +
 }
 
 package_flutter-light-android-arm() {
-  depends=("flutter")
-  
-  install -dm755 "${pkgdir}/opt/${_pkgname}/bin/cache/artifacts/engine"
-  cp -ra "${srcdir}/${_pkgname}/bin/cache/artifacts/engine/android-arm" "${pkgdir}/opt/${_pkgname}/bin/cache/artifacts/engine"
-  cp -ra ${srcdir}/${_pkgname}/bin/cache/artifacts/engine/android-arm-* ${pkgdir}/opt/${_pkgname}/bin/cache/artifacts/engine
+  depends=("flutter-light-common")
   
-  find "${pkgdir}/opt/${_pkgname}" -type d -exec chmod a+rx {} +
-  find "${pkgdir}/opt/${_pkgname}" -type f -exec chmod a+r {} +
+  install -dm755 "${pkgdir}/opt/flutter/bin/cache/artifacts/engine"
+  cp -ra "${srcdir}/flutter/bin/cache/artifacts/engine/android-arm" "${pkgdir}/opt/flutter/bin/cache/artifacts/engine"
+  cp -ra ${srcdir}/flutter/bin/cache/artifacts/engine/android-arm-* ${pkgdir}/opt/flutter/bin/cache/artifacts/engine
+  chmod -R a+rw "${pkgdir}/opt/flutter/bin/cache/artifacts/engine"
 }
 
 package_flutter-light-android-arm64() {
-  depends=("flutter")
+  depends=("flutter-light-common")
   
-  install -dm755 "${pkgdir}/opt/${_pkgname}/bin/cache/artifacts/engine"
-  cp -ra ${srcdir}/${_pkgname}/bin/cache/artifacts/engine/android-arm64* ${pkgdir}/opt/${_pkgname}/bin/cache/artifacts/engine
+  install -dm755 "${pkgdir}/opt/flutter/bin/cache/artifacts/engine"
+  cp -ra ${srcdir}/flutter/bin/cache/artifacts/engine/android-arm64* ${pkgdir}/opt/flutter/bin/cache/artifacts/engine
   
-  find "${pkgdir}/opt/${_pkgname}" -type d -exec chmod a+rx {} +
-  find "${pkgdir}/opt/${_pkgname}" -type f -exec chmod a+r {} +
+  chmod -R a+rw "${pkgdir}/opt/flutter/bin/cache/artifacts/engine"
 }
 
 package_flutter-light-android-x86() {
-  depends=("flutter")
+  depends=("flutter-light-common")
 
-  install -dm755 "${pkgdir}/opt/${_pkgname}/bin/cache/artifacts/engine"
-  cp -ra ${srcdir}/${_pkgname}/bin/cache/artifacts/engine/android-x86* ${pkgdir}/opt/${_pkgname}/bin/cache/artifacts/engine
+  install -dm755 "${pkgdir}/opt/flutter/bin/cache/artifacts/engine"
+  cp -ra ${srcdir}/flutter/bin/cache/artifacts/engine/android-x86* ${pkgdir}/opt/flutter/bin/cache/artifacts/engine
   
-  find "${pkgdir}/opt/${_pkgname}" -type d -exec chmod a+rx {} +
-  find "${pkgdir}/opt/${_pkgname}" -type f -exec chmod a+r {} +
+  chmod -R a+rw "${pkgdir}/opt/flutter/bin/cache/artifacts/engine"
 }
 
 package_flutter-light-android-x64() {
-  depends=("flutter")
+  depends=("flutter-light-common")
 
-  install -dm755 "${pkgdir}/opt/${_pkgname}/bin/cache/artifacts/engine"
-  cp -ra ${srcdir}/${_pkgname}/bin/cache/artifacts/engine/android-x64 ${pkgdir}/opt/${_pkgname}/bin/cache/artifacts/engine
+  install -dm755 "${pkgdir}/opt/flutter/bin/cache/artifacts/engine"
+  cp -ra ${srcdir}/flutter/bin/cache/artifacts/engine/android-x64 ${pkgdir}/opt/flutter/bin/cache/artifacts/engine
   
-  find "${pkgdir}/opt/${_pkgname}" -type d -exec chmod a+rx {} +
-  find "${pkgdir}/opt/${_pkgname}" -type f -exec chmod a+r {} +
+  chmod -R a+rw "${pkgdir}/opt/flutter/bin/cache/artifacts/engine"
 }
 
 package_flutter-light-web() {
-  depends=("flutter")
+  depends=("flutter-light-common")
 
-  install -dm755 "${pkgdir}/opt/${_pkgname}/bin/cache"
-  cp -ra "${srcdir}/${_pkgname}/bin/cache/flutter_web_sdk" "${pkgdir}/opt/${_pkgname}/bin/cache"
+  install -dm755 "${pkgdir}/opt/flutter/bin/cache"
+  cp -ra "${srcdir}/flutter/bin/cache/flutter_web_sdk" "${pkgdir}/opt/flutter/bin/cache"
   
-  find "${pkgdir}/opt/${_pkgname}" -type d -exec chmod a+rx {} +
-  find "${pkgdir}/opt/${_pkgname}" -type f -exec chmod a+r {} +
+  chmod -R a+rw "${pkgdir}/opt/flutter/bin/cache/flutter_web_sdk"
 }
 
 package_flutter-light-linux() {
-  depends=("flutter")
+  depends=("flutter-light-common")
 
-  install -dm755 "${pkgdir}/opt/${_pkgname}/bin/cache/artifacts/engine"
-  cp -ra ${srcdir}/${_pkgname}/bin/cache/artifacts/engine/linux* ${pkgdir}/opt/${_pkgname}/bin/cache/artifacts/engine
+  install -dm755 "${pkgdir}/opt/flutter/bin/cache/artifacts/engine"
+  cp -ra ${srcdir}/flutter/bin/cache/artifacts/engine/linux* ${pkgdir}/opt/flutter/bin/cache/artifacts/engine
   
-  find "${pkgdir}/opt/${_pkgname}" -type d -exec chmod a+rx {} +
-  find "${pkgdir}/opt/${_pkgname}" -type f -exec chmod a+r {} +
+  chmod -R a+rw "${pkgdir}/opt/flutter/bin/cache/artifacts/engine"
 }
diff --git a/flutter-light.install b/flutter-light.install
deleted file mode 100644
index 6f7c7f3d18d5..000000000000
--- a/flutter-light.install
+++ /dev/null
@@ -1,40 +0,0 @@
-post_install() {
-  groupadd -f flutterusers
-  chgrp -R flutterusers /opt/flutter
-  chmod -R g+w /opt/flutter
-  tput setaf 0 2>/dev/null
-  if [[ "$?" == "0" ]]; then
-    tput sgr0
-    printf "$(tput setaf 4)Flutter was installed on $(tput setaf 2)/opt/flutter$(tput sgr0)\n"
-    printf "$(tput setaf 4)$(tput sgr0)\n"
-    printf "$(tput setaf 4)In case you encounter problems using Flutter as regular user, add your user into the group flutterusers:$(tput sgr0)\n"
-    printf "$(tput setaf 2)gpasswd -a \${USER} flutterusers$(tput sgr0)\n"
-    printf "$(tput setaf 4)$(tput sgr0)\n"
-    printf "$(tput setaf 4)Re-login your terminal in to the group flutterusers:$(tput sgr0)\n"
-    printf "$(tput setaf 2)newgrp flutterusers$(tput sgr0)\n"
-    printf "$(tput setaf 4)$(tput sgr0)\n"
-    printf "$(tput setaf 4)Run the following command to see if there are any dependencies you need to install to complete the setup (for verbose output, add the -v flag):$(tput sgr0)\n"
-    printf "$(tput setaf 2)flutter doctor$(tput sgr0)\n"
-  else
-    printf "Flutter was installed on /opt/flutter\n"
-    printf "\n"
-    printf "In case you encounter problems using Flutter as regular user, add your user into the group flutterusers:\n"
-    printf "gpasswd -a \${USER} flutterusers\n"
-    printf "\n"
-    printf "Re-login your terminal in to the group flutterusers:\n"
-    printf "newgrp flutterusers\n"
-    printf "\n"
-    printf "Run the following command to see if there are any dependencies you need to install to complete the setup (for verbose output, add the -v flag):\n"
-    printf "flutter doctor\n"
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  groupdel flutterusers
-  printf "$(tput setaf 4)If you had added/modified files or permissions in folder /opt/flutter is possible you need to delete it manually.$(tput sgr0)\n"
-  printf "$(tput setaf 2)rm -rf /opt/flutter$(tput sgr0)\n"
-}
diff --git a/flutter.csh b/flutter.csh
deleted file mode 100644
index fdb197131b7d..000000000000
--- a/flutter.csh
+++ /dev/null
@@ -1,2 +0,0 @@
-setenv FLUTTER_HOME /opt/flutter
-setenv PATH ${PATH}:${FLUTTER_HOME}/bin:
diff --git a/flutter.sh b/flutter.sh
index 5b3db4b8b9be..e63a41979f7d 100644
--- a/flutter.sh
+++ b/flutter.sh
@@ -1,2 +1,4 @@
-export FLUTTER_HOME=/opt/flutter
-export PATH=${PATH}:${FLUTTER_HOME}/bin
+#!/bin/bash
+export FLUTTER_ROOT=/opt/flutter
+export PATH=${PATH}:${FLUTTER_ROOT}/bin
+/bin/dart --disable-dart-dev --packages="$FLUTTER_ROOT/packages/flutter_tools/.dart_tool/package_config.json" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@"