build for ARM as well; use system electron

2 files changed, 44 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db8877e9bde1..959eb2b00f5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,16 @@
 pkgbase = jitsi-meet-desktop
 	pkgdesc = Jitsi Meet desktop application
 	pkgver = 2.3.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://jitsi.org/jitsi-meet/
 	arch = x86_64
+	arch = aarch64
+	arch = armv7h
 	license = Apache
 	makedepends = coreutils
+	makedepends = git
 	makedepends = npm
+	depends = electron
 	depends = gtk3
 	depends = libxss
 	depends = nss
diff --git a/PKGBUILD b/PKGBUILD
index fe94d90a0472..e32f47280b09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,24 @@
-# Maintainer: Sam Whited <sam@samwhited.com>
+# Maintainer: lsf
+# Contributer: Sam Whited <sam@samwhited.com>
 # Contributor: Roman Kupriyanov <mr.eshua@gmail.com>
 
 pkgname=jitsi-meet-desktop
 pkgver=2.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Jitsi Meet desktop application"
-arch=('x86_64')
+arch=('x86_64' 'aarch64' 'armv7h')
 url="https://jitsi.org/jitsi-meet/"
 license=('Apache')
 conflicts=('jitsi-meet-electron-bin'
            'jitsi-meet-electron')
 replaces=('jitsi-meet-electron')
-depends=('gtk3'
+depends=('electron'
+         'gtk3'
          'libxss'
          'nss')
 makedepends=('coreutils'
+             'git'
              'npm')
-backup=()
 
 options=(!strip)
 source=("${pkgname}_${pkgver}.tar.gz::https://github.com/jitsi/jitsi-meet-electron/archive/v${pkgver}.tar.gz"
@@ -25,36 +27,47 @@ sha256sums=('76b2fc6c3fba492f07fc08d6d57acd181425ebc4a06ceb16918a9ba42145aae2'
             '6b718d4cd130bb641ba38fa5893f5aec39ae6ab8770384cc6e1f5eaaa7b791d8')
 
 prepare() {
-	cd jitsi-meet-electron-${pkgver}/
+  cd jitsi-meet-electron-${pkgver}/
 
-	# TODO: create a package for jitsi-meet-elecctron-utils and depend on it instead
-	# of letting this pull it down from git.
-	# TODO: find a way to depend on system electron.
-	npm install
+  sed -r 's#("electron": ").*"#\1'$(cat /usr/lib/electron/version)'"#' -i package.json
+  npm install
 }
 
 build() {
-	cd jitsi-meet-electron-${pkgver}/
-	npm run dist
+  cd jitsi-meet-electron-${pkgver}/
+  npm run pack
 }
 
 package() {
-	cd jitsi-meet-electron-${pkgver}/
+  cd jitsi-meet-electron-${pkgver}/
 
-	install -d     "${pkgdir}/opt/${pkgname}"
-	cp -r          dist/linux-unpacked/* "${pkgdir}/opt/${pkgname}"
+  if [[ ${CARCH} == "aarch64" ]]; then
+    _dist_path=${srcdir}/jitsi-meet-electron-${pkgver}/dist/linux-arm64-unpacked
+  elif [[ ${CARCH} == "armv7h" ]]; then
+    _dist_path=${srcdir}/jitsi-meet-electron-${pkgver}/dist/linux-armv7l-unpacked
+  elif [[ ${CARCH} == "x86_64" ]]; then
+    _dist_path=${srcdir}/jitsi-meet-electron-${pkgver}/dist/linux-unpacked
+  fi
 
-	for icon in `ls resources/icons/*.png`; do
-		size=$(basename $icon)
-		size=${size#"icon_"}
-		size=${size%".png"}
-		install -dm755 "${pkgdir}/usr/share/icons/hicolor/${size}/apps"
-		install -Dm644 "${icon}" "${pkgdir}/usr/share/icons/hicolor/${size}/apps/jitsi-meet-desktop.png"
-	done
+  install -d "${pkgdir}/usr/bin"
+  install -d "${pkgdir}/opt/${pkgname}"
+  cp -r "${_dist_path}"/resources/* "${pkgdir}/opt/${pkgname}"
 
-	install -d     "${pkgdir}/usr/bin"
-	ln -s          "/opt/${pkgname}/jitsi-meet" "${pkgdir}/usr/bin/jitsi-meet"
+  for icon in `ls resources/icons/*.png`; do
+    size=$(basename $icon)
+    size=${size#"icon_"}
+    size=${size%".png"}
+    install -dm755 "${pkgdir}/usr/share/icons/hicolor/${size}/apps"
+    install -Dm644 "${icon}" "${pkgdir}/usr/share/icons/hicolor/${size}/apps/jitsi-meet-desktop.png"
+  done
 
-	install -d     "${pkgdir}/usr/share/applications"
-	install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+ cat << EOF > "$pkgdir"/usr/bin/$pkgname
+#!/bin/sh
+
+NODE_ENV=production ELECTRON_IS_DEV=false exec electron /opt/$pkgname/app.asar "\$@"
+EOF
+
+  chmod +x "$pkgdir"/usr/bin/$pkgname
+
+  install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 }