updated to version 4.0.0

4 files changed, 26 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2ffb48e621f8..77d079798fa8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cabal-desktop-git
 	pkgdesc = Desktop client for Cabal, the p2p/decentralized/local-first chat platform.
-	pkgver = 3.1.1.r11.g23e1c10
-	pkgrel = 1.2
+	pkgver = 4.0.0.r0.g9efb32b
+	pkgrel = 1
 	url = https://github.com/cabal-club/cabal-desktop
 	install = cabal-desktop-git.install
 	arch = x86_64
@@ -10,17 +10,17 @@ pkgbase = cabal-desktop-git
 	makedepends = npm
 	makedepends = libicns
 	makedepends = imagemagick
-	depends = electron
+	depends = electron5
 	provides = cabal-desktop-git
 	conflicts = cabal-desktop-git
-	source = cabal-desktop-git::git+https://github.com/cabal-club/cabal-desktop.git#commit=23e1c107792cfb4c5205d3acdb28a95b8a43cad5
+	source = cabal-desktop-git::git+https://github.com/cabal-club/cabal-desktop.git#tag=v4.0.0
 	source = cabal-desktop-git.sh
 	source = cabal-desktop-git.desktop
 	source = cabal-desktop-git.install
 	md5sums = SKIP
-	md5sums = 5062bddcfedf537cc5a214f6a9bd9ced
+	md5sums = a64677d2e3fc1a39ec60f6d2a3addef2
 	md5sums = 8448a411c5cf2621959f7d33ce2110fb
-	md5sums = c9f23c6410b51ca0d92c2ebba081b4d2
+	md5sums = bbbc6b7a1102ca32c9ac39b47d7742de
 
 pkgname = cabal-desktop-git
 
diff --git a/PKGBUILD b/PKGBUILD
index aa9f4470bba9..4a946f50bcae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,33 @@
 # Maintainer: davedatum <ask at davedatum dot com>
 
 pkgname=cabal-desktop-git
-pkgver=3.1.1.r11.g23e1c10
-pkgrel=1.2
+pkgver=4.0.0.r0.g9efb32b
+pkgrel=1
 pkgdesc="Desktop client for Cabal, the p2p/decentralized/local-first chat platform."
 arch=("x86_64")
 url="https://github.com/cabal-club/cabal-desktop"
 license=("AGPL3")
-depends=("electron")
+depends=("electron5")
 makedepends=("git" "npm" "libicns" "imagemagick")
 provides=("${pkgname}")
 conflicts=("${pkgname}")
 install=${pkgname}.install
-source=("${pkgname}::git+$url.git#commit=23e1c107792cfb4c5205d3acdb28a95b8a43cad5"
+source=("${pkgname}::git+$url.git#tag=v4.0.0"
 		"${pkgname}.sh"
 		"${pkgname}.desktop"
 		"${pkgname}.install")
 md5sums=('SKIP'
-         '5062bddcfedf537cc5a214f6a9bd9ced'
+         'a64677d2e3fc1a39ec60f6d2a3addef2'
          '8448a411c5cf2621959f7d33ce2110fb'
-         'c9f23c6410b51ca0d92c2ebba081b4d2')
+         'bbbc6b7a1102ca32c9ac39b47d7742de')
 
 prepare() {
-    sed -i -e '/"scripts": {/a "linux": "npm run build && electron-builder --dir",' "$srcdir/$pkgname/package.json"
+    sed -i -e '/"scripts": {/a "linux": "npm run build && electron-rebuild -f -w sodium-native && electron-builder --dir ",' \
+    "$srcdir/$pkgname/package.json"
+
+    sed -i -e '/"devDependencies": {/a "electron-rebuild": "^1.8.8",' \
+    "$srcdir/$pkgname/package.json"
+
     icns2png -x -s 1024 "${srcdir}/${pkgname}/build/icon.icns" -o \
       "${srcdir}/${pkgname}/build/"
 }
@@ -38,8 +43,13 @@ build() {
 }
 
 package() {
-	install -Dm755 "${srcdir}/${pkgname}/dist/linux-unpacked/resources/app.asar" "${pkgdir}/opt/${pkgname}/app.asar"
+
+  install -d "${pkgdir}/opt/${pkgname}"
+  cp -a "${srcdir}/${pkgname}/dist/linux-unpacked/resources/." "${pkgdir}/opt/${pkgname}"
+  chmod -R 755 "${pkgdir}/opt/${pkgname}"
+
 	install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
 	install -Dm644 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
 
 	install -Dm644 "${srcdir}/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/cabal-desktop-git.install b/cabal-desktop-git.install
index 30d11e1a675f..4c206af26589 100644
--- a/cabal-desktop-git.install
+++ b/cabal-desktop-git.install
@@ -1,5 +1,5 @@
 post_install() {
-		chmod +x /usr/bin/cabal-desktop-git
+	chmod +x /usr/bin/cabal-desktop-git
 }
 
 post_upgrade() {
diff --git a/cabal-desktop-git.sh b/cabal-desktop-git.sh
index 32c2656d42fc..b273339dc1a8 100755
--- a/cabal-desktop-git.sh
+++ b/cabal-desktop-git.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Launch application
-exec electron /opt/cabal-desktop-git/app.asar "$@"
\ No newline at end of file
+exec electron5 /opt/cabal-desktop-git/app.asar "$@"
\ No newline at end of file