update to version 1.2.0

2 files changed, 29 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5adff02320a1..8a639027ae9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = fluffychat
 	pkgdesc = Chat with your friends
-	pkgver = 1.1.0
+	pkgver = 1.2.0
 	pkgrel = 1
 	url = https://fluffychat.im/
 	arch = x86_64
@@ -11,16 +11,13 @@ pkgbase = fluffychat
 	makedepends = cmake
 	makedepends = git
 	makedepends = unzip
-	depends = libolm
-	depends = xdg-user-dirs
+	makedepends = flutter
 	depends = gtk3
 	depends = jsoncpp
 	depends = libsecret
 	provides = fluffychat
 	conflicts = fluffychat
-	source = flutter-2.5.3-stable.tar.xz::https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_2.5.3-stable.tar.xz
-	source = fluffychat-v1.1.0.tar.gz::https://gitlab.com/famedly/fluffychat/-/archive/v1.1.0/fluffychat-v1.1.0.tar.gz
-	sha256sums = b32d04a9fa5709326b4e724e0de64ff1b2b70268f89dd3c748e6360ac937fe01
-	sha256sums = 92c4ae1a8a329e1139b95947ca8fb3e6a48435066f9aed9ca48a9ed84caddbbf
+	source = fluffychat-v1.2.0.tar.gz::https://gitlab.com/famedly/fluffychat/-/archive/v1.2.0/fluffychat-v1.2.0.tar.gz
+	sha256sums = ca6f2409e7bc303e7afe3c59fc92f425776c313cf1c93f9e7047d9f460dec280
 
 pkgname = fluffychat
diff --git a/PKGBUILD b/PKGBUILD
index 99d9c53c5f55..7f0e4d5e9a9d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,38 +2,50 @@
 # thanks to celogeek, sseneca, dr460nf1r3, dr460nf1r3 and AverytheFurry for pointing out multiple things
 
 pkgname=fluffychat
-pkgver=1.1.0
-_flutterversion=2.5.3-stable
+pkgver=1.2.0
+_flutterversion=2.8.1-stable
 pkgrel=1
 pkgdesc="Chat with your friends"
 arch=('x86_64' 'aarch64')
 url="https://fluffychat.im/"
 license=('AGPL3')
-depends=('libolm' 'xdg-user-dirs' 'gtk3' 'jsoncpp' 'libsecret')
+depends=('gtk3' 'jsoncpp' 'libsecret')
 makedepends=('clang'
              'ninja'
              'cmake'
              'git'
-             'unzip')
+             'unzip'
+             'flutter')
 provides=("$pkgname")
 conflicts=("$pkgname")
-source=(
-    "flutter-${_flutterversion}.tar.xz::https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${_flutterversion}.tar.xz"
-    "fluffychat-v${pkgver}.tar.gz::https://gitlab.com/famedly/fluffychat/-/archive/v${pkgver}/fluffychat-v${pkgver}.tar.gz")
-sha256sums=('b32d04a9fa5709326b4e724e0de64ff1b2b70268f89dd3c748e6360ac937fe01'
-            '92c4ae1a8a329e1139b95947ca8fb3e6a48435066f9aed9ca48a9ed84caddbbf')
+source=("fluffychat-v${pkgver}.tar.gz::https://gitlab.com/famedly/fluffychat/-/archive/v${pkgver}/fluffychat-v${pkgver}.tar.gz")
+sha256sums=('ca6f2409e7bc303e7afe3c59fc92f425776c313cf1c93f9e7047d9f460dec280')
 
 prepare() {
-  export PATH="${srcdir}/flutter/bin:$PATH"
+  #####
+  #thanks to @dreieck
+  _flutter_dir="${srcdir}/flutter"
+  PATH="${_flutter_dir}/bin:${PATH}"
+  export PATH
+
+  msg2 "Copying '/opt/flutter' to '${_flutter_dir}' ..."
+  cp -a /opt/flutter "${_flutter_dir}"
+  #####
+
   flutter config --no-analytics
   flutter config --enable-linux-desktop
+  
+  cd ${pkgname}-v$pkgver
+  flutter clean
+  flutter pub get
 }
 
 build() {
-  export PATH="${srcdir}/flutter/bin:$PATH"
+  _flutter_dir="${srcdir}/flutter"
+  PATH="${_flutter_dir}/bin:${PATH}"
+  export PATH  
+
   cd ${pkgname}-v$pkgver
-  flutter clean
-  #flutter pub get
   flutter build linux --release --verbose
 }