fix errors

3 files changed, 35 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bcff482d2393..73b785a3e38f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,18 @@
 pkgbase = kanbanflow-app-bin
 	pkgdesc = A standalone application for Kanbanflow.com
 	pkgver = 1.0.0_beta.4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/metawave/kanbanflow-app
 	arch = x86_64
 	license = MIT
-	depends = bash
+	makedepends = squashfuse
 	depends = electron13
+	depends = libx11
+	depends = gdk-pixbuf2
+	depends = libxext
+	depends = libdbusmenu-glib
+	depends = gtk2
+	depends = dbus-glib
 	provides = kanbanflow-app=1.0.0_beta.4
 	conflicts = kanbanflow-app
 	source = kanbanflow-app-1.0.0_beta.4.AppImage::https://github.com/metawave/kanbanflow-app/releases/download/v1.0.0-beta.4/KanbanFlow-App-1.0.0-beta.4.AppImage
@@ -14,6 +20,6 @@ pkgbase = kanbanflow-app-bin
 	source = kanbanflow-app.sh
 	sha256sums = a8146d290fdf4d9e4e62b4fa57fab35bf6db21aa43876bc685a0bdca4bd4ebba
 	sha256sums = 4dcd2e7fe6343b8c84f2996f9713c67ee8e917c8e3606ce9ec221279ac5bfc26
-	sha256sums = 91426896abb23638c7610666af93b9d1aa86874bbbe9e97d067f9d565f5f3680
+	sha256sums = 48e0c437a8d7060f408376331185a50d7e0c4cd1af42f569393ce7d8f65a2073
 
 pkgname = kanbanflow-app-bin
diff --git a/PKGBUILD b/PKGBUILD
index ddb7d62fd49a..735e988bdaee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,43 @@
 pkgname=kanbanflow-app-bin
 _appname=KanbanFlow-App
 pkgver=1.0.0_beta.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A standalone application for Kanbanflow.com"
 arch=('x86_64')
 url="https://github.com/metawave/kanbanflow-app"
 license=('MIT')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('bash' 'electron13')
-source=("${pkgname%-bin}-${pkgver}.AppImage::${url}/releases/download/v${pkgver//_/-}/${_appname}-${pkgver//_/-}.AppImage"
+depends=(
+    'electron13'
+    'libx11'
+    'gdk-pixbuf2'
+    'libxext'
+    'libdbusmenu-glib'
+    'gtk2'
+    'dbus-glib'
+)
+makedepends=(
+    'squashfuse'
+)
+source=(
+    "${pkgname%-bin}-${pkgver}.AppImage::${url}/releases/download/v${pkgver//_/-}/${_appname}-${pkgver//_/-}.AppImage"
     "LICENSE.md::https://raw.githubusercontent.com/metawave/kanbanflow-app/v${pkgver//_/-}/LICENSE.md"
-    "${pkgname%-bin}.sh")
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('a8146d290fdf4d9e4e62b4fa57fab35bf6db21aa43876bc685a0bdca4bd4ebba'
             '4dcd2e7fe6343b8c84f2996f9713c67ee8e917c8e3606ce9ec221279ac5bfc26'
-            '91426896abb23638c7610666af93b9d1aa86874bbbe9e97d067f9d565f5f3680')
-prepare() {
+            '48e0c437a8d7060f408376331185a50d7e0c4cd1af42f569393ce7d8f65a2073')
+build() {
     chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
     "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
     sed "s|AppRun --no-sandbox %U|${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.asar"
+    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/squashfs-root/swiftshader/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/swiftshader"
+    install -Dm644 "${srcdir}/squashfs-root/usr/lib/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/lib"
     install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/512x512/apps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
     install -Dm644 "${srcdir}/squashfs-root/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/LICENSE.md" -t "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/kanbanflow-app.sh b/kanbanflow-app.sh
index 6bbf79052271..183828d93f1a 100644
--- a/kanbanflow-app.sh
+++ b/kanbanflow-app.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron13
-_ASAR="/opt/kanbanflow-app/kanbanflow-app.asar"
+APPDIR=/usr/lib/kanbanflow-app
+export PATH="${APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else