v0.21.2

Use fvm instead of flutter

3 files changed, 51 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e6b718fc0e19..1c6e37148007 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,30 @@
 pkgbase = saber
-	pkgdesc = A cross-platform libre notes app written in Flutter
-	pkgver = 0.17.0
+	pkgdesc = The cross-platform notes app built for handwriting
+	pkgver = 0.21.2
 	pkgrel = 1
-	url = https://github.com/adil192/saber
+	url = https://github.com/saber-notes/saber
 	arch = x86_64
-	license = GPL3
-	makedepends = flutter
+	license = GPL-3.0-or-later
 	makedepends = clang
 	makedepends = cmake
+	makedepends = fvm
 	makedepends = ninja
-	makedepends = rustup
-	depends = gtk3
+	depends = at-spi2-core
 	depends = bash
-	depends = jsoncpp
+	depends = cairo
+	depends = fontconfig
+	depends = gcc-libs
+	depends = glib2
+	depends = glibc
+	depends = gtk3
+	depends = libepoxy
 	depends = libsecret
-	depends = xdg-user-dirs
-	source = https://github.com/adil192/saber/archive/refs/tags/v0.17.0.tar.gz
+	depends = pango
+	source = saber-0.21.2.tar.gz::https://github.com/saber-notes/saber/archive/refs/tags/v0.21.2.tar.gz
 	source = 0001-Modify-.desktop-for-Arch-Linux.patch
 	source = saber.sh
-	sha256sums = 56cf3c0b3d654491329a77518f981a80366718dadb98844172fabdef2d83c929
+	sha256sums = 54fca828a75728faf77ed699a8ca910445e70920fbbaa896c929a6221c164ac3
 	sha256sums = 93e6e067fefad597117d7f6889df204082898b79dcd29853eaa5c879ab35b2df
-	sha256sums = 7beadd69cd9fc88ccc8916b27057498da652afbe4265d00cf9de20ea84bb2488
+	sha256sums = db48941f0077c7a7e50201d0a5aab93e80d81bcf518bc3eaa900a71e152a627c
 
 pkgname = saber
diff --git a/PKGBUILD b/PKGBUILD
index 8c89ddb3437b..15719986661e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,64 @@
 # Maintainer: Polarian <polarian@polarian.dev>
 
 pkgname=saber
-pkgver=0.17.0
+pkgver=0.21.2
 pkgrel=1
-pkgdesc="A cross-platform libre notes app written in Flutter"
+pkgdesc="The cross-platform notes app built for handwriting"
 arch=('x86_64')
-url="https://github.com/adil192/saber"
-license=('GPL3')
-depends=('gtk3' 'bash' 'jsoncpp' 'libsecret' 'xdg-user-dirs')
-makedepends=('flutter' 'clang' 'cmake' 'ninja' 'rustup')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/adil192/$pkgname/archive/refs/tags/v$pkgver.tar.gz"
+url="https://github.com/saber-notes/saber"
+license=('GPL-3.0-or-later')
+depends=('at-spi2-core'
+         'bash'
+         'cairo'
+         'fontconfig'
+         'gcc-libs'
+         'glib2'
+         'glibc'
+         'gtk3'
+         'libepoxy'
+         'libsecret'
+         'pango')
+makedepends=('clang' 'cmake' 'fvm' 'ninja')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
         "0001-Modify-.desktop-for-Arch-Linux.patch"
         "saber.sh")
-sha256sums=('56cf3c0b3d654491329a77518f981a80366718dadb98844172fabdef2d83c929'
+sha256sums=('54fca828a75728faf77ed699a8ca910445e70920fbbaa896c929a6221c164ac3'
             '93e6e067fefad597117d7f6889df204082898b79dcd29853eaa5c879ab35b2df'
-            '7beadd69cd9fc88ccc8916b27057498da652afbe4265d00cf9de20ea84bb2488')
+            'db48941f0077c7a7e50201d0a5aab93e80d81bcf518bc3eaa900a71e152a627c')
 
 prepare() {
-    cd "$pkgname-$pkgver"
+    cd "${pkgname}-${pkgver}"
+    fvm global stable
 
     # Disable analytics and enable linux desktop
-    flutter --no-version-check config --no-analytics
-    flutter --no-version-check config --enable-linux-desktop
+    fvm flutter --no-version-check config --no-analytics
+    fvm flutter --no-version-check config --enable-linux-desktop
 
     # Patch source to allow for better .desktop naming
     patch -p1 -i "$srcdir/0001-Modify-.desktop-for-Arch-Linux.patch"
 
     # Pull dependencies within prepare, allowing for offline builds later on
-    flutter --no-version-check pub get
+    fvm flutter --no-version-check pub get
 }
 
 build() {
-    cd "$pkgname-$pkgver"
-    flutter --no-version-check build linux --release --prefixed-errors
+    cd "${pkgname}-${pkgver}"
+    fvm flutter --no-version-check build linux --release --prefixed-errors
 
     # Copy icon to source directory for installing
-    cp assets/icon/resized/icon-128x128.png ./saber.png
+    cp assets/icon/resized/icon-512x512.png ./saber.png
 }
 
 package() {
     # Build directory for the final executable
-    cd "$pkgname-$pkgver/build/linux/x64/release/bundle/"
+    cd "${pkgname}-${pkgver}/build/linux/x64/release/bundle"
 
     # Install application, licence and desktop file (with assets)
-    install -dm 755 "$pkgdir/opt/$pkgname" "$pkgdir/usr/bin/"
-    cp -rdp --no-preserve=ownership . "$pkgdir/opt/$pkgname/"
-    install -Dm644 "$srcdir/$pkgname-$pkgver/saber.desktop" -t "$pkgdir/usr/share/applications/"
-    install -Dm644 "$srcdir/$pkgname-$pkgver/saber.png" -t "$pkgdir/usr/share/pixmaps/"
+    install -d "${pkgdir}/opt/${pkgname}"
+    cp -rdp --no-preserve=ownership . "${pkgdir}/opt/${pkgname}"
+    install -Dm644 -t "${pkgdir}/usr/share/applications" "${srcdir}/${pkgname}-${pkgver}/saber.desktop"
+    install -Dm644 -t "${pkgdir}/usr/share/pixmaps" "${srcdir}/${pkgname}-${pkgver}/saber.png"
 
     # Copy wrapper script to /usr/bin
-    install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+    install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
 }
diff --git a/saber.sh b/saber.sh
index 8b5099f57992..67187e332007 100644
--- a/saber.sh
+++ b/saber.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usb/bin/bash
 # Wrapper for saber binary to prevent loader error by changing LD path
 LD_LIBRARY_PATH=/opt/saber/lib /opt/saber/saber $@