summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD12
2 files changed, 9 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f484f55b13ec..a1ad4c877a04 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = signal-desktop
pkgdesc = Electron application that links with Signal on mobile
pkgver = 1.27.4
- pkgrel = 1
+ pkgrel = 2
url = https://signal.org
arch = x86_64
license = GPL3
@@ -11,7 +11,6 @@ pkgbase = signal-desktop
makedepends = nodejs>=12
makedepends = npm
makedepends = python
- makedepends = openssl-1.0
depends = electron
conflicts = signal
source = signal-desktop-1.27.4.tar.gz::https://github.com/signalapp/Signal-Desktop/archive/v1.27.4.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 08a46b21facd..0417e1489c26 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
pkgname=signal-desktop
_pkgname=Signal-Desktop
pkgver=1.27.4
-pkgrel=1
+pkgrel=2
pkgdesc='Electron application that links with Signal on mobile'
arch=(x86_64)
url=https://signal.org
license=(GPL3)
depends=(electron)
-makedepends=(yarn git python2 'nodejs>=12' npm python openssl-1.0)
+makedepends=(yarn git python2 'nodejs>=12' npm python)
conflicts=(signal)
source=($pkgname-$pkgver.tar.gz::https://github.com/signalapp/Signal-Desktop/archive/v$pkgver.tar.gz
$pkgname.desktop)
@@ -19,12 +19,16 @@ sha512sums=('92a934d7680f33803bd7be21f4604719b211036931a6e00565e21a7008d0b35da7d
prepare() {
cd $_pkgname-$pkgver
- # Allow higher node versions
+ # Set known working Electron version
+ sed 's#\("electron": "\).*"#\16.1.2"#' -i package.json
+
+ # Allow higher Node versions
sed 's#"node": "#&>=#' -i package.json
yarn install
- # Have SQLCipher statically link from openssl-1.0
+ # Have SQLCipher dynamically link from OpenSSL
+ # See https://github.com/signalapp/Signal-Desktop/issues/2634
sed '76s#<.*.a#-lcrypto#;144d' -i node_modules/@journeyapps/sqlcipher/deps/sqlite3.gyp
}