fix: AUR helper dependency cycle

Signed-off-by: The one with the braid <info@braid.business>

2 files changed, 18 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 277baca715b1..a00e54991412 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = flutter
 	pkgdesc = A new mobile app SDK to help developers and designers build modern mobile apps for iOS and Android.
 	pkgver = 3.19.5
-	pkgrel = 2
+	pkgrel = 3
 	url = https://flutter.dev
 	arch = x86_64
 	arch = aarch64
@@ -45,12 +45,15 @@ pkgname = flutter
 pkgname = flutter-common
 	pkgdesc = Flutter SDK component - common SDK files and pub cache
 	install = flutter-common.install
-	conflicts = flutter<=3.19.3
+	conflicts = flutter<3.19.5
+	conflicts = flutter-engine-common<3.19.5
+	conflicts = flutter-intellij-patch<3.19.5
 
 pkgname = flutter-gradle
 	pkgdesc = Flutter SDK component - gradle wrapper
 	provides = flutter-gradle=3.19.5
 	conflicts = flutter-gradle
+	conflicts = flutter-target-android<3.19.5
 
 pkgname = flutter-tool
 	pkgdesc = Flutter SDK component - CLI tool (for packaging only)
@@ -66,11 +69,16 @@ pkgname = flutter-tool
 	depends = xz
 	depends = zip
 	depends = glu
+	conflicts = flutter-devel<3.19.5
+	conflicts = flutter-target-android<3.19.5
+	conflicts = flutter-target-linux<3.19.5
+	conflicts = flutter-target-web<3.19.5
 
 pkgname = flutter-devel
 	pkgdesc = Flutter SDK component - CLI tool (for application development)
 	depends = flutter-tool=3.19.5
 	depends = dart>=3.2.0
+	conflicts = flutter<3.19.5
 	replaces = flutter-tool-developer
 
 pkgname = flutter-target-linux
diff --git a/PKGBUILD b/PKGBUILD
index 1bdc453e5f10..c0f281b5493c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ _enginever=e76c956498841e1ab458577d3892003e553e4f3c
 _materialfontsver=3012db47f3130e62f7cc0beabff968a33cbec8d8
 _gradlewver=fd5c1f2c013565a3bea56ada6df9d2b8e96d56aa
 _flutterarch=$(uname -m | sed s/aarch64/arm64/ | sed s/x86_64/x64/)
-pkgrel=2
+pkgrel=3
 pkgdesc="A new mobile app SDK to help developers and designers build modern mobile apps for iOS and Android."
 _pkgdesc="Flutter SDK component"
 arch=("x86_64" "aarch64")
@@ -147,7 +147,7 @@ _package() {
 _package-common() {
   pkgdesc="${_pkgdesc} - common SDK files and pub cache"
   install="${_group}-common.install"
-  conflicts=("${_group}<=3.19.3")
+  conflicts=("${_group}<${pkgver}" "${_group}-engine-common<${pkgver}" "${_group}-intellij-patch<${pkgver}")
 
   install -Dm644 "${srcdir}/${_group}/LICENSE" "${pkgdir}/usr/share/licenses/${_group}/LICENSE"
 
@@ -233,6 +233,7 @@ _package-gradle() {
   )
   conflicts=(
 	"${_group}-gradle"
+	"${_group}-target-android<${pkgver}"
   )
 
   install -dm755 "${pkgdir}/usr/lib/${_group}/bin/cache/artifacts"
@@ -259,6 +260,7 @@ _package-tool() {
 	"zip"
 	"glu" # libGLU.so.1 required for flutter test
   )
+  conflicts=("${_group}-devel<${pkgver}" "${_group}-target-android<${pkgver}" "${_group}-target-linux<${pkgver}" "${_group}-target-web<${pkgver}")
 
 
   install -dm755 "${pkgdir}/usr/lib/${_group}"
@@ -288,6 +290,7 @@ _package-devel() {
 	# "dart<${_dartver[1]}"
   )
   replaces=("${_group}-tool-developer")
+  conflicts=("${_group}<${pkgver}")
 
   install -dm755 "${pkgdir}/usr/lib/${_group}"
   install -dm755 "${pkgdir}/usr/lib/${_group}/packages/flutter_tools"
@@ -303,9 +306,9 @@ _package-intellij-patch() {
   pkgdesc="${_pkgdesc} - IntelliJ Flutter plugin hotfix"
   depends=("${_group}-common=${pkgver}")
   optdepends=(
-	"android-studio"
-        "intellij-idea-community-edition"
-        "intellij-idea-ultimate-edition"
+    "android-studio"
+    "intellij-idea-community-edition"
+    "intellij-idea-ultimate-edition"
   )
 
   # this is required in case people try to build with `aur/dart-sdk-dev` instead of `extra/dart`