v0.21.3

4 files changed, 15 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c6e37148007..1efe62013ade 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = saber
 	pkgdesc = The cross-platform notes app built for handwriting
-	pkgver = 0.21.2
+	pkgver = 0.21.3
 	pkgrel = 1
 	url = https://github.com/saber-notes/saber
 	arch = x86_64
@@ -20,11 +20,9 @@ pkgbase = saber
 	depends = libepoxy
 	depends = libsecret
 	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-0.21.3.tar.gz::https://github.com/saber-notes/saber/archive/refs/tags/v0.21.3.tar.gz
 	source = saber.sh
-	sha256sums = 54fca828a75728faf77ed699a8ca910445e70920fbbaa896c929a6221c164ac3
-	sha256sums = 93e6e067fefad597117d7f6889df204082898b79dcd29853eaa5c879ab35b2df
-	sha256sums = db48941f0077c7a7e50201d0a5aab93e80d81bcf518bc3eaa900a71e152a627c
+	sha256sums = 1869973a8eb40fa243345235320a34becacdc4d09757fef5aa3307276c69f43a
+	sha256sums = 2b563ad53416aba926c6f6983daefbe3294be44ff95f3406fa5247ae596a4fa0
 
 pkgname = saber
diff --git a/0001-Modify-.desktop-for-Arch-Linux.patch b/0001-Modify-.desktop-for-Arch-Linux.patch
deleted file mode 100644
index a0ddf216e724..000000000000
--- a/0001-Modify-.desktop-for-Arch-Linux.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4ba43ff9f1f9b522ab4a124f04fe949e776a9999 Mon Sep 17 00:00:00 2001
-From: Polarian <polarian@polarian.dev>
-Date: Wed, 31 May 2023 21:19:50 +0100
-Subject: [PATCH] Modify .desktop for Arch Linux
-
----
- flatpak/com.adilhanney.saber.desktop => saber.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rename flatpak/com.adilhanney.saber.desktop => saber.desktop (91%)
-
-diff --git a/flatpak/com.adilhanney.saber.desktop b/saber.desktop
-similarity index 91%
-rename from flatpak/com.adilhanney.saber.desktop
-rename to saber.desktop
-index c6c6fe4a..c7f8017d 100644
---- a/flatpak/com.adilhanney.saber.desktop
-+++ b/saber.desktop
-@@ -7,7 +7,7 @@ Comment=A cross-platform libre handwritten notes app.
- Comment[cs]=Volně dostupná multiplatformní aplikace pro ručně psané poznámky
- Categories=Office;WordProcessor;
- 
--Icon=com.adilhanney.saber
-+Icon=saber
- Exec=saber
- Terminal=false
- StartupWMClass=saber
--- 
-2.40.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 15719986661e..20078a268cd0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
-# Maintainer: Polarian <polarian@polarian.dev>
+# Maintainer: Mahdi Sarikhani <mahdisarikhani@outlook.com>
+# Contributor: Polarian <polarian@polarian.dev>
 
 pkgname=saber
-pkgver=0.21.2
+pkgver=0.21.3
 pkgrel=1
 pkgdesc="The cross-platform notes app built for handwriting"
 arch=('x86_64')
@@ -20,23 +21,18 @@ depends=('at-spi2-core'
          '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=('54fca828a75728faf77ed699a8ca910445e70920fbbaa896c929a6221c164ac3'
-            '93e6e067fefad597117d7f6889df204082898b79dcd29853eaa5c879ab35b2df'
-            'db48941f0077c7a7e50201d0a5aab93e80d81bcf518bc3eaa900a71e152a627c')
+sha256sums=('1869973a8eb40fa243345235320a34becacdc4d09757fef5aa3307276c69f43a'
+            '2b563ad53416aba926c6f6983daefbe3294be44ff95f3406fa5247ae596a4fa0')
 
 prepare() {
     cd "${pkgname}-${pkgver}"
-    fvm global stable
+    echo y | fvm global stable
 
     # Disable analytics and 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
     fvm flutter --no-version-check pub get
 }
@@ -44,20 +40,16 @@ prepare() {
 build() {
     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-512x512.png ./saber.png
 }
 
 package() {
-    # Build directory for the final executable
-    cd "${pkgname}-${pkgver}/build/linux/x64/release/bundle"
+    cd "${pkgname}-${pkgver}"
 
     # Install application, licence and desktop file (with assets)
     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"
+    cp -a --no-preserve=ownership build/linux/x64/release/bundle/* "${pkgdir}/opt/${pkgname}"
+    install -Dm644 -t "${pkgdir}/usr/share/applications" flatpak/com.adilhanney.saber.desktop
+    install -Dm644 assets/icon/icon.png "${pkgdir}/usr/share/pixmaps/com.adilhanney.saber.png"
 
     # Copy wrapper script to /usr/bin
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
diff --git a/saber.sh b/saber.sh
index 67187e332007..5159e45b730c 100644
--- a/saber.sh
+++ b/saber.sh
@@ -1,3 +1,3 @@
-#!/usb/bin/bash
+#!/usr/bin/bash
 # Wrapper for saber binary to prevent loader error by changing LD path
 LD_LIBRARY_PATH=/opt/saber/lib /opt/saber/saber $@