upgpkg: franz 5.6.1-1

- Version bump.
- PKGBUILD cleanups.
- Using latest supported Electron package (yay :D)

2 files changed, 10 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5eb1d078e78e..8e980cacbf79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = franz
 	pkgdesc = Free messaging app for services like WhatsApp, Slack, Messenger and many more.
-	pkgver = 5.5.0
-	pkgrel = 4
+	pkgver = 5.6.1
+	pkgrel = 1
 	epoch = 1
 	url = https://meetfranz.com
 	arch = x86_64
@@ -12,16 +12,14 @@ pkgbase = franz
 	makedepends = npm
 	makedepends = python
 	makedepends = python2
-	depends = electron9
-	source = git+https://github.com/meetfranz/franz#tag=v5.5.0
+	depends = electron
+	source = git+https://github.com/meetfranz/franz#tag=v5.6.1
 	source = franz.desktop
 	source = franz.sh.in
-	source = electron-9.patch::https://github.com/archlinuxcn/repo/raw/eb2e113ff042ef5353450c0ec4f4f621689a23d7/archlinuxcn/franz/0001-.patch
 	sha512sums = SKIP
 	sha512sums = 049c4bf2e0f362f892e8eef28dd18a6c321251c686a9c9e49e4abfb778057de2fc68b95b4ff7bb8030a828a48b58554a56b810aba078c220cb01d5837083992e
 	sha512sums = 7ccf058421b173830493f35417d204e3a735fc20f801283dad3f658abeb484f6244bc535634c2f02ab2cb8e35a0e1a92dd3d06be5943e121ddccbbee7ad74b48
-	sha512sums = 463b07949c789d2be7568b93e0c7f79ab5fc753aef4c869c40ba29444ba10c12db4ad1bc0353d8b73a51619bcd8666ed3c72c070cb24b05087604e04791bda52
 
 pkgname = franz
-	depends = electron9=
+	depends = electron=
 
diff --git a/PKGBUILD b/PKGBUILD
index 4aa7b492018d..4257dcdab301 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgname=franz
 #pkgver=${_pkgver//-/_} # Leaving it here for possible dev/beta package :)
-pkgver=5.5.0
-pkgrel=4
+pkgver=5.6.1
+pkgrel=1
 # Due to the previous "_beta" naming
 epoch=1
 pkgdesc='Free messaging app for services like WhatsApp, Slack, Messenger and many more.'
@@ -16,17 +16,15 @@ license=(Apache)
 # Expected one is 'electron9' (Electron 9). May change soon.
 # This is automatically replaced in `franz.sh` with the package name, as
 # the executable matches the package name (as of 2020-11-15).
-_electron='electron9'
+_electron='electron'
 depends=($_electron)
 makedepends=(expac git npm python python2)
 source=("git+https://github.com/meetfranz/$pkgname#tag=v$pkgver"
         franz.desktop
-        franz.sh.in
-        'electron-9.patch::https://github.com/archlinuxcn/repo/raw/eb2e113ff042ef5353450c0ec4f4f621689a23d7/archlinuxcn/franz/0001-.patch')
+        franz.sh.in)
 sha512sums=('SKIP'
             '049c4bf2e0f362f892e8eef28dd18a6c321251c686a9c9e49e4abfb778057de2fc68b95b4ff7bb8030a828a48b58554a56b810aba078c220cb01d5837083992e'
-            '7ccf058421b173830493f35417d204e3a735fc20f801283dad3f658abeb484f6244bc535634c2f02ab2cb8e35a0e1a92dd3d06be5943e121ddccbbee7ad74b48'
-            '463b07949c789d2be7568b93e0c7f79ab5fc753aef4c869c40ba29444ba10c12db4ad1bc0353d8b73a51619bcd8666ed3c72c070cb24b05087604e04791bda52')
+            '7ccf058421b173830493f35417d204e3a735fc20f801283dad3f658abeb484f6244bc535634c2f02ab2cb8e35a0e1a92dd3d06be5943e121ddccbbee7ad74b48')
 
 prepare() {
   # Small patching
@@ -37,9 +35,6 @@ prepare() {
   electron_version="`expac %v $_electron | cut -d'-' -f1`"
   sed -i -E "s|(\s+\"electron\":).*,|\1 \"$electron_version\",|" package.json
 
-  # Thanks @yuyichao from archlinuxcn for this! :)
-  patch -Np1 -i "$srcdir/electron-9.patch"
-
   # Prevent franz from being launched in dev mode
   sed -i \
     "s|export const isDevMode = .*|export const isDevMode = false;|g" \
@@ -48,10 +43,6 @@ prepare() {
     "s|import isDevMode from 'electron-is-dev'|export const isDevMode = false|g" \
     src/index.js
 
-  # Fix tricky dependencies versions before-hand
-  node_sass_version="4.14.1"
-  sed -i -E "s|(\s+\"node-sass\":).*,|\1 \"$node_sass_version\",|" package.json
-
   # Better configuration for npm cache and calling installed binaries
   export npm_config_cache="$srcdir/npm_cache"