Split package

3 files changed, 119 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 95fdda8267a0..c45e7bfce330 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,13 @@
 pkgbase = flutter-light
-	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)
 	pkgver = 3.3.8
-	pkgrel = 1
+	pkgrel = 2
 	url = https://flutter.dev
-	install = flutter-light.install
 	arch = x86_64
 	arch = aarch64
 	license = custom
 	license = BSD
 	license = CCPL
 	makedepends = python
-	depends = git
-	depends = glu
-	depends = java-environment
-	depends = libglvnd
-	depends = unzip
-	depends = dart
 	optdepends = android-sdk
 	optdepends = android-studio
 	optdepends = intellij-idea-community-edition
@@ -23,11 +15,7 @@ pkgbase = flutter-light
 	optdepends = ninja
 	optdepends = perl
 	optdepends = python
-	provides = flutter
-	conflicts = flutter
 	options = !emptydirs
-	backup = opt/flutter/packages/flutter_test/pubspec.yaml
-	backup = opt/flutter/packages/flutter/pubspec.yaml
 	source = flutter-3.3.8.tar.xz::https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.3.8-stable.tar.xz
 	source = flutter.sh
 	source = flutter.csh
@@ -35,4 +23,38 @@ pkgbase = flutter-light
 	sha256sums = 1dea1952d386c43948b9970382c2da5b65b7870684b8ad2ad89124e873aa485a
 	sha256sums = 7ef10d753cfaac52d243549764a793f44f8284a1f4b11715ccd2fa915b026a6f
 
-pkgname = flutter-light
+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
+	depends = glu
+	depends = java-environment>=8
+	depends = libglvnd
+	depends = unzip
+	depends = dart
+	depends = flutter-light-android-arm64
+	depends = dart
+	provides = flutter
+	conflicts = flutter
+	backup = opt/flutter/packages/flutter_test/pubspec.yaml
+	backup = opt/flutter/packages/flutter/pubspec.yaml
+
+pkgname = flutter-light-android-arm
+	depends = flutter
+
+pkgname = flutter-light-android-arm64
+	depends = flutter
+
+pkgname = flutter-light-android-x86
+	depends = flutter
+
+pkgname = flutter-light-android-x64
+	depends = flutter
+
+pkgname = flutter-light-web
+	depends = flutter
+
+pkgname = flutter-light-linux
+	depends = flutter
diff --git a/PKGBUILD b/PKGBUILD
index 67afce91d808..2df2c9ca967c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,18 @@
 # Contributor: Fredy García <frealgagu at gmail dot com>
 # Contributor: Philip Goto <philip.goto@gmail.com>, WithTheBraid <the-one@with-the-braid.cf>
 
-pkgname=flutter-light
+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
-provides=(flutter)
-conflicts=(flutter)
 pkgver=3.3.8
-pkgrel=1
-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)"
+pkgrel=2
+makedepends=("python")
+optdepends=("android-sdk" "android-studio" "intellij-idea-community-edition" "intellij-idea-ultimate-edition" "ninja" "perl" "python")
+
 arch=("x86_64" "aarch64")
 url="https://${_pkgname}.dev"
 license=("custom" "BSD" "CCPL")
-depends=("git" "glu" "java-environment" "libglvnd" "unzip" "dart")
-optdepends=("android-sdk" "android-studio" "intellij-idea-community-edition" "intellij-idea-ultimate-edition" "ninja" "perl" "python")
-makedepends=("python")
-backup=("opt/${_pkgname}/packages/${_pkgname}_test/pubspec.yaml" "opt/${_pkgname}/packages/${_pkgname}/pubspec.yaml")
 options=("!emptydirs")
-install="${pkgname}.install"
 source=(
   "${_pkgname}-${pkgver}.tar.xz::https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/${_pkgname}_linux_${pkgver/.hotfix/+hotfix}-stable.tar.xz"
   "${_pkgname}.sh"
@@ -29,25 +25,97 @@ sha256sums=('407fb5d05e9ad17604bc17ad8808b8e527f2ed64dd559d62f1538ee09b92236e'
             '7ef10d753cfaac52d243549764a793f44f8284a1f4b11715ccd2fa915b026a6f')
 
 build() {
-  rm -rf "${srcdir}/${_pkgname}/bin/cache/" "${srcdir}/${_pkgname}/.pub-cache"
-  sed -i "s/\$FLUTTER_ROOT\/bin\/cache\/dart-sdk/\/opt\/dart-sdk/g" "${srcdir}/${_pkgname}/bin/internal/shared.sh"
+  rm -rf "${srcdir}/${_pkgname}/bin/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 "${srcdir}/${_pkgname}/bin/cache/"
+  mkdir -p "${srcdir}/${_pkgname}/bin/cache/"
+  rm -rf ${srcdir}/${_pkgname}/bin/cache/{dart-sdk,engine.stamp}
   ln -sf "/opt/dart-sdk" "${srcdir}/${_pkgname}/bin/cache/dart-sdk"
-  cp "${srcdir}/${_pkgname}//bin/internal/engine.version" "${srcdir}/${_pkgname}/bin/cache/engine.stamp"
+  ln -s "${srcdir}/${_pkgname}/bin/internal/engine.version" "${srcdir}/${_pkgname}/bin/cache/engine.stamp"
   "${srcdir}/${_pkgname}/bin/flutter" precache
 }
 
-package() {
+package_flutter-light-common() {
+  provides=(flutter)
+  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")
+  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 -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 {} +
   # 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/"
 }
+
+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
+  
+  find "${pkgdir}/opt/${_pkgname}" -type d -exec chmod a+rx {} +
+  find "${pkgdir}/opt/${_pkgname}" -type f -exec chmod a+r {} +
+}
+
+package_flutter-light-android-arm64() {
+  depends=("flutter")
+  
+  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
+  
+  find "${pkgdir}/opt/${_pkgname}" -type d -exec chmod a+rx {} +
+  find "${pkgdir}/opt/${_pkgname}" -type f -exec chmod a+r {} +
+}
+
+package_flutter-light-android-x86() {
+  depends=("flutter")
+
+  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
+  
+  find "${pkgdir}/opt/${_pkgname}" -type d -exec chmod a+rx {} +
+  find "${pkgdir}/opt/${_pkgname}" -type f -exec chmod a+r {} +
+}
+
+package_flutter-light-android-x64() {
+  depends=("flutter")
+
+  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
+  
+  find "${pkgdir}/opt/${_pkgname}" -type d -exec chmod a+rx {} +
+  find "${pkgdir}/opt/${_pkgname}" -type f -exec chmod a+r {} +
+}
+
+package_flutter-light-web() {
+  depends=("flutter")
+
+  install -dm755 "${pkgdir}/opt/${_pkgname}/bin/cache"
+  cp -ra "${srcdir}/${_pkgname}/bin/cache/flutter_web_sdk" "${pkgdir}/opt/${_pkgname}/bin/cache"
+  
+  find "${pkgdir}/opt/${_pkgname}" -type d -exec chmod a+rx {} +
+  find "${pkgdir}/opt/${_pkgname}" -type f -exec chmod a+r {} +
+}
+
+package_flutter-light-linux() {
+  depends=("flutter")
+
+  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
+  
+  find "${pkgdir}/opt/${_pkgname}" -type d -exec chmod a+rx {} +
+  find "${pkgdir}/opt/${_pkgname}" -type f -exec chmod a+r {} +
+}
diff --git a/dart.sh b/dart.sh
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dart.sh
+++ /dev/null