Release 2.5.2

Add flutter to sources for users who don't have it already installed
(thanks to MithicSpirit)

1 files changed, 36 insertions, 43 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d0aab3201523..76e67e9d7529 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,66 +2,59 @@
 # Maintainer: Dawid Weglarz <dawid.weglarz95@gmail.com>
 
 pkgname=nyrna
-pkgver=2.5.0
+pkgver=2.5.2
 pkgrel=1
 pkgdesc='Suspend games and applications at any time and resume whenever you wish'
 arch=('x86_64')
 url="https://github.com/Merrit/nyrna"
 license=('GPL3')
-depends=('glib2' 'gtk3' 'libkeybinder3' 'util-linux' 'wmctrl' 'xdotool' 'xz')
+provides=('nyrna')
+depends=('glib2' 'gtk3' 'libkeybinder3' 'libappindicator-gtk3' 'util-linux' 'wmctrl' 'xdotool' 'xz')
 makedepends=('flutter' 'clang' 'cmake' 'ninja')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/Merrit/nyrna/archive/refs/tags/v$pkgver.tar.gz")
-sha256sums=('bf63de43b03d694a2736b933f45f2442adffec061021b3a29a6b629bbe32a866')
-
-# Check Flutter configuration
-flutter="flutter --suppress-analytics"
-flutter_channel=$($flutter config --version | head -n1 | awk '{print $5}')
-$flutter config | grep -qE '^\s*enable-linux-desktop: true\b' || flutter_set_linux=y
-flutter_set_linux="$?"
+source=(
+    "$pkgname-$pkgver.tar.gz::https://github.com/Merrit/nyrna/archive/refs/tags/v$pkgver.tar.gz"
+    "flutter::git+https://github.com/flutter/flutter.git"
+)
+sha256sums=(
+    'aacea91934ca59a09c1482f7456c11863e7163f63bdda2af002b93d384b941a8'
+    'SKIP'
+)
+
+_setpath() {
+    PATH="$PATH:$srcdir/flutter/bin:$HOME/.pub-cache/bin:$HOME/.cargo/bin"
+}
 
 prepare() {
-  # Switch to Beta channel if necessary
-  if [ "$flutter_channel" != "beta" ]; then
-    $flutter channel beta
-    $flutter upgrade
-  fi
+    _setpath
 
-  # Enable linux-desktop builds if necessary
-  if [ "$flutter_set_linux" != "y" ];then
-    $flutter config --enable-linux-desktop
-  fi
+    # Enable desktop build
+    flutter channel stable
+    flutter config --enable-linux-desktop
 
-  cd "$pkgname-$pkgver"
-  $flutter clean
-  $flutter pub get
+    # Get dependencies
+    cd "$pkgname-$pkgver"
+    flutter clean
+    flutter pub get
 }
 
 build() {
-  cd "$pkgname-$pkgver"
-  $flutter build linux
-}
+    _setpath
 
-check() {
-  # Cleanup
-  if [ "$flutter_channel" != "beta" ]; then
-    $flutter channel "$flutter_channel"
-    $flutter upgrade
-  fi
-
-  if [ "$flutter_set_linux" != "y" ];then
-    $flutter config --no-enable-linux-desktop
-  fi
+    cd "$pkgname-$pkgver"
+    flutter build linux
 }
 
 package() {
-  install -dm0755 "$pkgdir/opt/$pkgname"
-  cp -r "$srcdir/$pkgname-$pkgver/build/linux/x64/release/bundle/data" "$pkgdir/opt/$pkgname"
-  cp -r "$srcdir/$pkgname-$pkgver/build/linux/x64/release/bundle/lib" "$pkgdir/opt/$pkgname"
-  install -Dm0755 "$srcdir/$pkgname-$pkgver/build/linux/x64/release/bundle/$pkgname" "$pkgdir/opt/$pkgname"
+    _setpath
+
+    install -dm0755 "$pkgdir/opt/$pkgname"
+    cp -r "$srcdir/$pkgname-$pkgver/build/linux/x64/release/bundle/data" "$pkgdir/opt/$pkgname"
+    cp -r "$srcdir/$pkgname-$pkgver/build/linux/x64/release/bundle/lib" "$pkgdir/opt/$pkgname"
+    install -Dm0755 "$srcdir/$pkgname-$pkgver/build/linux/x64/release/bundle/$pkgname" "$pkgdir/opt/$pkgname"
 
-  install -dm0755 "$pkgdir/usr/bin/"
-  ln -s "/opt/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
+    install -dm0755 "$pkgdir/usr/bin/"
+    ln -s "/opt/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
 
-  install -Dm0644 "$srcdir/$pkgname-$pkgver/packaging/linux/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm0644 "$srcdir/$pkgname-$pkgver/assets/icons/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+    install -Dm0644 "$srcdir/$pkgname-$pkgver/packaging/linux/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+    install -Dm0644 "$srcdir/$pkgname-$pkgver/assets/icons/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
 }