Date: Wednesday, August 4, 2021 @ 15:13:42 Author: archange Revision: 993653
upgpkg: element.io 1.7.34-1 Includes FS#69019 and FS#71380 Added: element.io/trunk/autolaunch.patch Modified: element.io/trunk/PKGBUILD element.io/trunk/element-desktop.sh --------------------+ PKGBUILD | 32 +++++++++++++++++++------------- autolaunch.patch | 11 +++++++++++ element-desktop.sh | 4 ++-- 3 files changed, 32 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-08-04 15:10:27 UTC (rev 993652) +++ PKGBUILD 2021-08-04 15:13:42 UTC (rev 993653) @@ -5,43 +5,49 @@ pkgbase=element.io pkgname=(element-web element-desktop) -pkgver=1.7.33 +pkgver=1.7.34 pkgrel=1 pkgdesc="Glossy Matrix collaboration client — " arch=(x86_64) url="https://element.io"; license=(Apache) -makedepends=(npm git yarn python rust sqlcipher electron12 nodejs-lts-fermium) +makedepends=(npm git yarn python rust sqlcipher electron nodejs-lts-fermium) _url="https://github.com/vector-im/element"; source=(element-web-${pkgver}.tar.gz::${_url}-web/archive/v${pkgver}.tar.gz element-web-${pkgver}.tar.gz.asc::${_url}-web/releases/download/v${pkgver}/v${pkgver}-src.tar.gz.asc element-desktop-${pkgver}.tar.gz::${_url}-desktop/archive/v${pkgver}.tar.gz element-desktop-${pkgver}.tar.gz.asc::${_url}-desktop/releases/download/v${pkgver}/v${pkgver}-src.tar.gz.asc + autolaunch.patch io.element.Element.desktop element-desktop.sh) -sha256sums=('9a7dcf29a5fbb68d2e6763f3985ecce38b2b503f68e60279225ca045a3ca8f0a' +sha256sums=('16625882ac4c877ae0df12b203dd14438a48d744234dd3a5c72c681cf4e7ab2a' 'SKIP' - 'fe00af8c20c7f7b87180f9e950db29667096a9bb22f9f9337501f5e561bd325e' + '5eb795f0f9cf3a6d73bd05faac223d3cfa835d6a9d6d2e13f21ca214d827e516' 'SKIP' + 'aaae4ffa41590361dac0c159aecc1166f69e459e89faa9d5cab1202f0277e06f' '0103f28a32fe31f698836516783c1c70a76a0117b5df7fd0af5c422c224220f9' - '31b5f7e6efb9643daba7e0edb04284f1d153c05264ee15670c79364746e3e155') + 'c1bd9ace215e3ec9af14d7f28b163fc8c8b42e23a2cf04ce6f4ce2fcc465feba') validpgpkeys=(712BFBEE92DCA45252DB17D7C7BE97EFA179B100) # Element Releases <[email protected]> +_electron=electron prepare() { + # Specify electron version in launcher + sed -i "s|@ELECTRON@|${_electron}|" element-desktop.sh + cd element-web-${pkgver} - # Switch target to output to directory rather than .deb package - sed -i 's/"target": "deb"/"target": "dir"/g' package.json - yarn install + yarn install --no-fund cd ../element-desktop-${pkgver} - sed -i 's@"electronVersion": "12.0.14"@"electronVersion": "12.0.15"@g' package.json - sed -i 's@"https://packages.riot.im/desktop/update/"@null@g' element.io/release/config.json - yarn install + patch -p1 < ../autolaunch.patch + sed -i 's|"target": "deb"|"target": "dir"|' package.json + sed -i 's|"electronVersion": "13.1.6"|"electronVersion": "13.1.8"|' package.json + sed -i 's|"https://packages.riot.im/desktop/update/";|null|' element.io/release/config.json + yarn install --no-fund } build() { cd element-web-${pkgver} - yarn build + yarn build --offline cd ../element-desktop-${pkgver} yarn run build:native @@ -65,7 +71,7 @@ package_element-desktop() { pkgdesc+="desktop version." replaces=(riot-desktop) - depends=("element-web=${pkgver}" electron12 sqlcipher) + depends=("element-web=${pkgver}" ${_electron} sqlcipher) backup=('etc/element/config.json') cd element-desktop-${pkgver} Added: autolaunch.patch =================================================================== --- autolaunch.patch (rev 0) +++ autolaunch.patch 2021-08-04 15:13:42 UTC (rev 993653) @@ -0,0 +1,11 @@ +diff --git a/src/electron-main.ts b/src/electron-main.ts +--- a/src/electron-main.ts ++++ b/src/electron-main.ts +@@ -229,6 +229,7 @@ async function setupGlobals() { + launcher = new AutoLaunch({ + name: vectorConfig.brand || 'Element', + isHidden: true, ++ path: "/usr/bin/element-desktop", + mac: { + useLaunchAgent: true, + }, Modified: element-desktop.sh =================================================================== --- element-desktop.sh 2021-08-04 15:10:27 UTC (rev 993652) +++ element-desktop.sh 2021-08-04 15:13:42 UTC (rev 993653) @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh -electron12 /usr/lib/element/app.asar "$@" +exec @ELECTRON@ /usr/lib/element/app.asar --disable-dev-mode "$@"
