[arch-commits] Commit in riot/trunk (PKGBUILD)
Bruno Pagani
archange at archlinux.org
Sat Feb 1 18:52:37 UTC 2020
Date: Saturday, February 1, 2020 @ 18:52:36
Author: archange
Revision: 561079
upgpkg: riot 1.5.8-1
Also enable seshat thanks to indications from Julian Schacher
Modified:
riot/trunk/PKGBUILD
----------+
PKGBUILD | 37 +++++++++++++++++++++++++++----------
1 file changed, 27 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-02-01 18:20:20 UTC (rev 561078)
+++ PKGBUILD 2020-02-01 18:52:36 UTC (rev 561079)
@@ -1,21 +1,22 @@
# Maintainer: Bruno Pagani <archange at archlinux.org>
# Contributor: Luca Weiss <luca (at) z3ntu (dot) xyz>
+# Contributor: Julian Schacher <jspp at posteo.net>
pkgbase=riot
pkgname=('riot-web' 'riot-desktop')
-pkgver=1.5.6
+pkgver=1.5.8
pkgrel=1
pkgdesc="A glossy Matrix collaboration client, web and desktop versions."
-arch=(any)
+arch=(x86_64)
url="https://riot.im"
license=(Apache)
-makedepends=(npm git yarn)
+makedepends=(npm git yarn python rust sqlcipher electron)
_url="https://github.com/vector-im/riot-web"
-source=(${pkgbase}-${pkgver}.tar.gz::"${_url}/archive/v${pkgver}.tar.gz"
- ${pkgbase}-${pkgver}.tar.gz.asc::"${_url}/releases/download/v${pkgver}/v${pkgver}-src.tar.gz.asc"
- "${pkgbase}.desktop"
- "${pkgbase}-desktop.sh")
-sha256sums=('81716845e53cca31ce3dc6ed42640ec56279b9171db2709e3f6f81b93c415a6a'
+source=(${pkgbase}-${pkgver}.tar.gz::${_url}/archive/v${pkgver}.tar.gz
+ ${pkgbase}-${pkgver}.tar.gz.asc::${_url}/releases/download/v${pkgver}/v${pkgver}-src.tar.gz.asc
+ ${pkgbase}.desktop
+ ${pkgbase}-desktop.sh)
+sha256sums=('49e5aa356b72d61096e0f0e649a2a8caff55b8626ba4d65343fd132f1fba62ed'
'SKIP'
'fa1a6756280c678e2193930adbd98c7721071278700e17a0db38de1668365091'
'dc14c79694bac4f523493c26a73c8000f9a2374f36dd21c1945bfb93d19277cd')
@@ -26,10 +27,26 @@
sed -i 's at https://riot.im/download/desktop/update/@null at g' electron_app/riot.im/config.json
sed -i 's/"target": "deb"/"target": "dir"/g' package.json
yarn install
+
+ # Add the matrix-seshat package (which is needed for search in E2E encrypted
+ # rooms) as well as the electron-build-env package, which gets used later to
+ # rebuild the native libraries against electron’s version of node.
+ # See here for more information:
+ # https://github.com/vector-im/riot-web/blob/develop/docs/native-node-modules.md#adding-seshat-for-search-in-e2e-encrypted-rooms
+ cd electron_app
+ yarn add matrix-seshat
+ yarn add electron-build-env
+ # Finally also enable the event indexing feature in the config.
+ sed 's/"features": {/"features": {\n "feature_event_indexing": "enable",/' riot.im/config.json
}
build() {
- cd ${pkgbase}-web-${pkgver}
+ cd ${pkgbase}-web-${pkgver}/electron_app
+ # Recompile matrix-seshat
+ yarn run electron-build-env -- --electron $(cat /usr/lib/electron/version) -- neon build matrix-seshat --release
+
+ cd ..
+ # Do the actual build
yarn build:electron:linux
}
@@ -50,7 +67,7 @@
package_riot-desktop() {
pkgdesc="A glossy Matrix collaboration client for the desktop."
- depends=(riot-web electron)
+ depends=(riot-web electron sqlcipher)
backup=('etc/riot/config.json')
cd ${pkgbase}-web-${pkgver}
More information about the arch-commits
mailing list