summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornoxx2022-01-16 19:47:18 +0100
committernoxx2022-01-16 19:47:18 +0100
commit82676f9c82b1b4e8138104013f9a560c441d9be2 (patch)
tree799e37d358944870c1766f6646fbf7994d2e46ac
parente4a5ccee7068668cb049042c3af8bdac9f56340f (diff)
downloadaur-82676f9c82b1b4e8138104013f9a560c441d9be2.tar.gz
fix hung build process in rare cases
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD30
2 files changed, 22 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ab28a0520493..3e03c2a32e99 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = datcom-jitsi-meet-electron
pkgdesc = DatCom Jitsi Meet Desktop
pkgver = 2021.12.300
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/datcom-unibw/jitsi-meet-electron
arch = x86_64
license = APACHE-2.0
@@ -16,10 +16,12 @@ pkgbase = datcom-jitsi-meet-electron
depends = gtk3
depends = libxss
depends = nss
+ conflicts = jitsi-meet-electron-bin
+ conflicts = jitsi-meet-electron
+ replaces = jitsi-meet-electron
source = datcom-jitsi-meet-electron.desktop
source = jitsi-meet-electron-2021.12.300.tar.gz::https://github.com/datcom-unibw/jitsi-meet-electron/archive/v2021.12.300.tar.gz
sha256sums = 5976b5ced6c707d79cc21666abcbfc11c6d8f1b83eb8505dc8b29d62ca85c7e9
- sha256sums = 391aae579c639cbe9f569e49fe90303c505ea36fc453c9b868981fd900c08cfc
+ sha256sums = 44cfdf34d04231d5b37327a9daa2e1f9f49c880329d5742e5d77537a0a64df8f
pkgname = datcom-jitsi-meet-electron
-
diff --git a/PKGBUILD b/PKGBUILD
index bb5b9bff8250..0b72fb5c453d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=datcom-jitsi-meet-electron
pkgver=2021.12.300
-pkgrel=1
+pkgrel=2
pkgdesc="DatCom Jitsi Meet Desktop"
arch=('x86_64')
url="https://github.com/datcom-unibw/jitsi-meet-electron"
@@ -37,23 +37,27 @@ sha256sums=('5976b5ced6c707d79cc21666abcbfc11c6d8f1b83eb8505dc8b29d62ca85c7e9'
prepare() {
- export npm_config_cache="$srcdir/npm_cache"
- _npm_prefix=$(npm config get prefix)
- npm config delete prefix
- source /usr/share/nvm/init-nvm.sh
- nvm install 14 && nvm use 14
-
- cd jitsi-meet-electron-${pkgver}/
- sed -i 's#git+ssh://git@github.com#https://github.com#' package-lock.json
- sed -r 's#("electron": ").*"#\1'$(cat /usr/lib/electron/version)'"#' -i package.json
-
- export npm_config_cache="${srcdir}/npm_cache"
- npm install
+ export npm_config_cache="${srcdir}/npm_cache"
+ _npm_prefix=$(npm config get prefix)
+ npm config delete prefix
+ source /usr/share/nvm/init-nvm.sh
+ nvm install 14 && nvm use 14
+
+ cd jitsi-meet-electron-${pkgver}/
+ sed -r 's#("electron": ").*"#\1'$(cat /usr/lib/electron/version)'"#' -i package.json
+ sed -i 's#git+ssh://git@github.com#https://github.com#g' package-lock.json
+
+ export npm_config_cache="${srcdir}/npm_cache"
+ npm install
}
build() {
cd jitsi-meet-electron-${pkgver}/
+ export npm_config_cache="${srcdir}/npm_cache"
+ nvm use 14
+
npm run build
+
npx electron-builder --dir
npm config set prefix ${_npm_prefix}
nvm unalias default