summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Santini2020-05-05 19:06:37 +0200
committerGiovanni Santini2020-05-05 19:06:37 +0200
commit0e657cb0e7872bc38c9ed1a3c721e23f7630eefc (patch)
tree754b953d571865e518aa00882df2de03e095434b
parent0467a6547ce0e6bae52d61276613f5b7e99dae26 (diff)
downloadaur-0e657cb0e7872bc38c9ed1a3c721e23f7630eefc.tar.gz
upgpkg: franz 5.5.0-1
- Version bump. - Slight improvements to PKGBUILD.
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD19
-rw-r--r--franz.sh2
3 files changed, 16 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 93ef49aa410f..ef34ed00ac9a 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.4.1
- pkgrel = 3
+ pkgver = 5.5.0
+ pkgrel = 1
epoch = 1
url = https://meetfranz.com
arch = x86_64
@@ -11,13 +11,13 @@ pkgbase = franz
makedepends = git
makedepends = npm
makedepends = python
- depends = electron6
- source = git+https://github.com/meetfranz/franz#tag=v5.4.1
+ depends = electron
+ source = git+https://github.com/meetfranz/franz#tag=v5.5.0
source = franz.desktop
source = franz.sh
sha512sums = SKIP
sha512sums = 049c4bf2e0f362f892e8eef28dd18a6c321251c686a9c9e49e4abfb778057de2fc68b95b4ff7bb8030a828a48b58554a56b810aba078c220cb01d5837083992e
- sha512sums = d9045b23fd8f2867f845d1c3b579b0fc6c7cf1a4120b9add3d545ff68736b444a21795526eb191b5e76622bd848c75e599ac145137f63375b4fae67490d99f8a
+ sha512sums = 8584507cfc2736f4736637925536b2c06063c59cd943346717633564ae88b64c5eea294c8897f1250812478ed493f54a470501e98e99d084a2ff012dff9671f8
pkgname = franz
diff --git a/PKGBUILD b/PKGBUILD
index 1899bb4af11e..8dd6a3b6ceb1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
# Contributor: Pieter Goetschalckx <3.14.e.ter <at> gmail <dot> com>
pkgname=franz
-_pkgver=5.4.1
-pkgver=${_pkgver//-/_}
-pkgrel=3
+#pkgver=${_pkgver//-/_} # Leaving it here for possible dev/beta package :)
+pkgver=5.5.0
+pkgrel=1
# Due to the previous "_beta" naming
epoch=1
pkgdesc='Free messaging app for services like WhatsApp, Slack, Messenger and many more.'
@@ -13,17 +13,17 @@ arch=(x86_64 i686)
url='https://meetfranz.com'
license=(Apache)
# Allow to easily switch between Electron versions.
-# Expected one is 'electron6', but you can easily switch to mainstream one with
-# 'electron'; remember to replace it also in `franz.sh`
-_electron='electron6'
+# Expected one is 'electron' (Electron 8). May change soon.
+# Remember to replace it also in `franz.sh`.
+_electron='electron'
depends=($_electron)
makedepends=(expac git npm python)
-source=("git+https://github.com/meetfranz/$pkgname#tag=v$_pkgver"
+source=("git+https://github.com/meetfranz/$pkgname#tag=v$pkgver"
'franz.desktop'
'franz.sh')
sha512sums=('SKIP'
'049c4bf2e0f362f892e8eef28dd18a6c321251c686a9c9e49e4abfb778057de2fc68b95b4ff7bb8030a828a48b58554a56b810aba078c220cb01d5837083992e'
- 'd9045b23fd8f2867f845d1c3b579b0fc6c7cf1a4120b9add3d545ff68736b444a21795526eb191b5e76622bd848c75e599ac145137f63375b4fae67490d99f8a')
+ '8584507cfc2736f4736637925536b2c06063c59cd943346717633564ae88b64c5eea294c8897f1250812478ed493f54a470501e98e99d084a2ff012dff9671f8')
prepare() {
# Small patching
@@ -45,7 +45,8 @@ prepare() {
export npm_config_cache="$srcdir"/npm_cache
# Install tricky dependencies before-hand
- npm install node-sass@4.13.1
+ node_sass_version="4.14.1"
+ sed -i "s|\(\s\+\"node-sass\":\).*,|\1 \"$node_sass_version\",|" package.json
# Prepare the packages for building
npx lerna bootstrap
diff --git a/franz.sh b/franz.sh
index 85cedbaf75b4..a4a6ab118425 100644
--- a/franz.sh
+++ b/franz.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-electron6 /usr/lib/franz/resources/app.asar "$@"
+electron /usr/lib/franz/resources/app.asar "$@"