diff options
author | lsf | 2022-01-10 18:34:38 +0100 |
---|---|---|
committer | lsf | 2022-01-10 18:34:38 +0100 |
commit | 98d163ed6c2f41da4bf50eee6e503268809fa052 (patch) | |
tree | 7f39e3a56cbaaea18d11e6177550ca38090e8a52 | |
parent | 7078a2e26803a2009e3c9e79c428c47bf1fad166 (diff) | |
download | aur-98d163ed6c2f41da4bf50eee6e503268809fa052.tar.gz |
v2022.1; also temporarily switch to electron15 due to some odd wayland crashing on 16
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 16 |
2 files changed, 13 insertions, 11 deletions
@@ -1,6 +1,6 @@ pkgbase = jitsi-meet-desktop pkgdesc = Jitsi Meet desktop application - pkgver = 2021.12.2 + pkgver = 2022.1.1 pkgrel = 1 url = https://jitsi.org/jitsi-meet/ arch = x86_64 @@ -13,15 +13,15 @@ pkgbase = jitsi-meet-desktop makedepends = png++ makedepends = libxtst makedepends = nvm - depends = electron>=16.0.4 + depends = electron15 conflicts = jitsi-meet-electron-bin conflicts = jitsi-meet-electron replaces = jitsi-meet-electron options = !strip - source = jitsi-meet-desktop_2021.12.2.tar.gz::https://github.com/jitsi/jitsi-meet-electron/archive/v2021.12.2.tar.gz + source = jitsi-meet-desktop_2022.1.1.tar.gz::https://github.com/jitsi/jitsi-meet-electron/archive/v2022.1.1.tar.gz source = no_targets.patch source = jitsi-meet-desktop.desktop - sha256sums = 6d3e896f7e53906cf8d48597e6953d1af6177ed6c28ec86eed4c1c83131a298a + sha256sums = 2f11bfe8829e485f174f039b901673aaf4ca375a6c09661bde27ec43998c72d5 sha256sums = ab22749aa1570cc5d6050711011f849ec3f4fa49080231f98957255fa5250e36 sha256sums = 36a30a15613d53b2a01626a5551315c6970889ce3c2688bce71e26c3333081a4 @@ -3,7 +3,7 @@ # Contributor: Roman Kupriyanov <mr.eshua@gmail.com> pkgname=jitsi-meet-desktop -pkgver=2021.12.2 +pkgver=2022.1.1 pkgrel=1 pkgdesc="Jitsi Meet desktop application" arch=('x86_64' 'aarch64') @@ -15,7 +15,8 @@ replaces=('jitsi-meet-electron') depends=('gtk3' 'libxss' 'nss') -depends=('electron>=16.0.4') +# depends=('electron>=16.0.6') +depends=('electron15') makedepends=('coreutils' 'git' 'npm' @@ -24,14 +25,12 @@ makedepends=('coreutils' 'libxtst' 'nvm' ) -# _node_version="v16.13.0" -# v16 seems to make robotjs-installation/building break, so 14 it is for now _node_version="16" options=(!strip) source=("${pkgname}_${pkgver}.tar.gz::https://github.com/jitsi/jitsi-meet-electron/archive/v${pkgver}.tar.gz" 'no_targets.patch' 'jitsi-meet-desktop.desktop') -sha256sums=('6d3e896f7e53906cf8d48597e6953d1af6177ed6c28ec86eed4c1c83131a298a' +sha256sums=('2f11bfe8829e485f174f039b901673aaf4ca375a6c09661bde27ec43998c72d5' 'ab22749aa1570cc5d6050711011f849ec3f4fa49080231f98957255fa5250e36' '36a30a15613d53b2a01626a5551315c6970889ce3c2688bce71e26c3333081a4') @@ -57,7 +56,7 @@ prepare() { # target when calling electron-builder.. patch -Np1 -i ${srcdir}/no_targets.patch - _electron_dist=/usr/lib/electron + _electron_dist=/usr/lib/electron15 _electron_ver=$(cat ${_electron_dist}/version) sed -r 's#("electron": ").*"#\1'${_electron_ver}'"#' -i package.json sed 's#git+ssh://git@github.com#git+https://github.com#g' -i package-lock.json @@ -73,6 +72,9 @@ build() { _ensure_local_nvm nvm use ${_node_version} + _electron_dist=/usr/lib/electron15 + _electron_ver=$(cat ${_electron_dist}/version) + # npm run build # no npx anymore, see https://github.com/electron-userland/electron-builder/issues/6411 npm exec -c 'webpack --config ./webpack.main.js --mode production' @@ -94,7 +96,7 @@ package() { cat << EOF > "$pkgdir"/usr/bin/$pkgname #!/bin/sh -NODE_ENV=production ELECTRON_IS_DEV=false exec electron /opt/$pkgname/app.asar "\$@" +NODE_ENV=production ELECTRON_IS_DEV=false exec electron15 /opt/$pkgname/app.asar "\$@" EOF chmod +x "$pkgdir"/usr/bin/$pkgname |