Update to latest version

3 files changed, 79 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f12243e0c08d..ce1586dfe944 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,25 @@
 pkgbase = datcom-jitsi-meet-electron
 	pkgdesc = DatCom Jitsi Meet Desktop
-	pkgver = 2.4.300
-	pkgrel = 9
+	pkgver = 2.8.500
+	pkgrel = 11
 	url = https://github.com/datcom-unibw/jitsi-meet-electron
 	arch = x86_64
 	license = APACHE-2.0
+	makedepends = coreutils
 	makedepends = git
-	makedepends = make
-	depends = npm
-	optdepends = nodejs-webpack: build-time dependency, to avoid re-downloading it
-	optdepends = nodejs-webpack-cli: build-time dependency, to avoid re-downloading it
-	conflicts = jitsi-meet-electron-bin
-	conflicts = jitsi-meet-electron
-	source = jitsi-meet-electron.desktop
-	source = jitsi-meet-electron-2.4.300.tar.gz::https://github.com/datcom-unibw/jitsi-meet-electron/archive/v2.4.300.tar.gz
-	sha256sums = b88ca14b81b13e1480532b70a1a319a276909c617ac868c233a87e5261a6e119
-	sha256sums = c4973cd5097024bc9026b8b0f07203d8a9a7514594b57ded27e3c3df2df071e7
+	makedepends = npm
+	makedepends = python2
+	makedepends = png++
+	makedepends = libxtst
+	makedepends = nvm
+	depends = electron
+	depends = gtk3
+	depends = libxss
+	depends = nss
+	source = datcom-jitsi-meet-electron.desktop
+	source = jitsi-meet-electron-2.8.500.tar.gz::https://github.com/datcom-unibw/jitsi-meet-electron/archive/v2.8.500.tar.gz
+	sha256sums = 5976b5ced6c707d79cc21666abcbfc11c6d8f1b83eb8505dc8b29d62ca85c7e9
+	sha256sums = 391aae579c639cbe9f569e49fe90303c505ea36fc453c9b868981fd900c08cfc
 
 pkgname = datcom-jitsi-meet-electron
 
diff --git a/PKGBUILD b/PKGBUILD
index c94e6c22825b..315f97f4b7f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,79 @@
 # Maintainer: Philipp Reger <philipp.reger@outlook.com>
 
 pkgname=datcom-jitsi-meet-electron
-pkgver=2.4.300
-pkgrel=9
+pkgver=2.8.500
+pkgrel=11
 pkgdesc="DatCom Jitsi Meet Desktop"
 arch=('x86_64')
 url="https://github.com/datcom-unibw/jitsi-meet-electron"
 
 license=('APACHE-2.0')
 
-conflicts=('jitsi-meet-electron-bin' 'jitsi-meet-electron')
+conflicts=()
 
-depends=('npm')
+depends=('electron'
+         'gtk3'
+         'libxss'
+         'nss')
 
-makedepends=('git' 'make')
+makedepends=('coreutils'
+             'git'
+             'npm'
+             'python2'
+             'png++'
+             'libxtst'
+             'nvm'
+             )
 
-optdepends=(
-    'nodejs-webpack: build-time dependency, to avoid re-downloading it'
-    'nodejs-webpack-cli: build-time dependency, to avoid re-downloading it'
-)
+source=(datcom-jitsi-meet-electron.desktop
+        "jitsi-meet-electron-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
+        )
 
-source=(
-  jitsi-meet-electron.desktop
-  "jitsi-meet-electron-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
-)
+sha256sums=('5976b5ced6c707d79cc21666abcbfc11c6d8f1b83eb8505dc8b29d62ca85c7e9'
+            '391aae579c639cbe9f569e49fe90303c505ea36fc453c9b868981fd900c08cfc'
+            )
 
-sha256sums=('b88ca14b81b13e1480532b70a1a319a276909c617ac868c233a87e5261a6e119'
-            'c4973cd5097024bc9026b8b0f07203d8a9a7514594b57ded27e3c3df2df071e7')
+            
+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 -r 's#("electron": ").*"#\1'$(cat /usr/lib/electron/version)'"#' -i package.json
+
+  export npm_config_cache="${srcdir}/npm_cache"
+  npm install
+  # npm audit fix
+}
+            
 build() {
-	cd jitsi-meet-electron-${pkgver}/
-	npm install
-	npm audit fix
-	npm run dist
+    cd jitsi-meet-electron-${pkgver}/
+    npm run build
+    npx electron-builder --dir
+    npm config set prefix ${_npm_prefix}
+    nvm unalias default
 }
 
 package() {
-	cd "jitsi-meet-electron-${pkgver}"
+	_dist_path=${srcdir}/jitsi-meet-electron-${pkgver}/dist/linux-unpacked
+
+    install -d "${pkgdir}/usr/bin"
+    install -d "${pkgdir}/opt/datcom-jitsi-meet-electron"
+    cp -r "${_dist_path}"/resources/* "${pkgdir}/opt/datcom-jitsi-meet-electron"
+
+    install -Dm644 -- ${srcdir}/jitsi-meet-electron-$pkgver/resources/icon.png "${pkgdir}/usr/share/pixmaps/datcom-jitsi-meet-electron.png"
 
-    mkdir -p -- "$pkgdir"/usr/share/applications
-    cp -a --dereference -- ../jitsi-meet-electron.desktop "$pkgdir"/usr/share/applications/
+    cat << EOF > "$pkgdir"/usr/bin/datcom-jitsi-meet-electron
+#!/bin/sh
 
-    mkdir -p -- "$pkgdir"/usr/share
-    cp -aT -- ./dist/linux-unpacked "$pkgdir"/usr/share/jitsi-meet-electron
+NODE_ENV=production ELECTRON_IS_DEV=false exec electron /opt/datcom-jitsi-meet-electron/app.asar "\$@"
+EOF
 
-    mkdir -p -- "$pkgdir"/usr/bin
-    ln -s -- '../share/jitsi-meet-electron/jitsi-meet' "$pkgdir"/usr/bin/jitsi-meet-electron
+    chmod +x "$pkgdir"/usr/bin/datcom-jitsi-meet-electron
 
-    local icon_size; for icon_size in 16 24 32 48 64 96 128 256 512; do
-    install -Dm644 -- "./resources/icons/icon_${icon_size}x${icon_size}.png" \
-      "${pkgdir}/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps/jitsi-meet-electron.png"
-    done
+    install -Dm644 "${srcdir}/datcom-jitsi-meet-electron.desktop" "${pkgdir}/usr/share/applications/datcom-jitsi-meet-electron.desktop"
 }
diff --git a/datcom-jitsi-meet-electron.desktop b/datcom-jitsi-meet-electron.desktop
new file mode 100644
index 000000000000..4f8a641f3c49
--- /dev/null
+++ b/datcom-jitsi-meet-electron.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=DatCom Jitsi Meet
+Comment=DatCom Jitsi Meet Desktop Application (Electron)
+Exec=datcom-jitsi-meet-electron
+Icon=datcom-jitsi-meet-electron
+Categories=VideoConference;AudioVideo;Audio;Video;Network;
+Terminal=false
+Type=Application