v2.8.7; hopefully fix nvm prefix and folder clutter issues; revert patch that causes issue on wayland/sway

2 files changed, 47 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 293ca36f072b..aea27fa7df53 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jitsi-meet-desktop
 	pkgdesc = Jitsi Meet desktop application
-	pkgver = 2.8.6
-	pkgrel = 3
+	pkgver = 2.8.7
+	pkgrel = 1
 	url = https://jitsi.org/jitsi-meet/
 	arch = x86_64
 	arch = aarch64
@@ -18,9 +18,11 @@ pkgbase = jitsi-meet-desktop
 	conflicts = jitsi-meet-electron
 	replaces = jitsi-meet-electron
 	options = !strip
-	source = jitsi-meet-desktop_2.8.6.tar.gz::https://github.com/jitsi/jitsi-meet-electron/archive/v2.8.6.tar.gz
+	source = jitsi-meet-desktop_2.8.7.tar.gz::https://github.com/jitsi/jitsi-meet-electron/archive/v2.8.7.tar.gz
+	source = pipewire_wayland.patch::https://github.com/jitsi/jitsi-meet-electron/commit/0e0483cbc52a9cad1fef51ed5abb846bd6445b11.patch
 	source = jitsi-meet-desktop.desktop
-	sha256sums = 957654aa5aeca6c201e42a0f8c2c72adbd89adc7546a974f08cc878215f79e8c
+	sha256sums = 32da999ed1ac2c60a3498639633fcfc84b21e09e447d55adb9da7159cba79017
+	sha256sums = 7c6198c5bd1cb7bb4b082d5da31ef9b21582d77453f9677c24e13e20e1ee337e
 	sha256sums = 36a30a15613d53b2a01626a5551315c6970889ce3c2688bce71e26c3333081a4
 
 pkgname = jitsi-meet-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 58f66ecd056a..8ffa631f5f55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Roman Kupriyanov <mr.eshua@gmail.com>
 
 pkgname=jitsi-meet-desktop
-pkgver=2.8.6
-pkgrel=3
+pkgver=2.8.7
+pkgrel=1
 pkgdesc="Jitsi Meet desktop application"
 arch=('x86_64' 'aarch64')
 url="https://jitsi.org/jitsi-meet/"
@@ -27,8 +27,10 @@ makedepends=('coreutils'
 
 options=(!strip)
 source=("${pkgname}_${pkgver}.tar.gz::https://github.com/jitsi/jitsi-meet-electron/archive/v${pkgver}.tar.gz"
+        'pipewire_wayland.patch::https://github.com/jitsi/jitsi-meet-electron/commit/0e0483cbc52a9cad1fef51ed5abb846bd6445b11.patch'
         'jitsi-meet-desktop.desktop')
-sha256sums=('957654aa5aeca6c201e42a0f8c2c72adbd89adc7546a974f08cc878215f79e8c'
+sha256sums=('32da999ed1ac2c60a3498639633fcfc84b21e09e447d55adb9da7159cba79017'
+            '7c6198c5bd1cb7bb4b082d5da31ef9b21582d77453f9677c24e13e20e1ee337e'
             '36a30a15613d53b2a01626a5551315c6970889ce3c2688bce71e26c3333081a4')
 
 case "$CARCH" in
@@ -43,29 +45,33 @@ case "$CARCH" in
 esac
 
 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}/
+  cd jitsi-meet-electron-${pkgver}
+  export npm_config_cache="${srcdir}/npm_cache"
+  _ensure_local_nvm
+  nvm install 14
 
   _electron_dist=/usr/lib/electron12
   _electron_ver=$(cat ${_electron_dist}/version)
   sed -r 's#("electron": ").*"#\1'${_electron_ver}'"#' -i package.json
 
-  export npm_config_cache="${srcdir}/npm_cache"
+  # This patch from https://github.com/jitsi/jitsi-meet-electron/commit/0e0483cbc52a9cad1fef51ed5abb846bd6445b11
+  # broke jitsi-meet-electron for me on when running on sway with full wayland support via flags
+  # If you you want to use that feature flag (--WebRTCPipeWireCapturer), I'd recommend putting it in
+  # ~/.config/electron12-flags.conf manually instead of having it applied by default
+  patch -Rp1 -i ${srcdir}/pipewire_wayland.patch
+
   npm install
   # npm audit fix
 }
 
 build() {
-  cd jitsi-meet-electron-${pkgver}/
+  cd jitsi-meet-electron-${pkgver}
+  export npm_config_cache="$srcdir/npm_cache"
+  _ensure_local_nvm
+  nvm use 14
+
   npm run build
   npx electron-builder --linux --${_electronbuilderrarch} --dir $dist -c.electronDist=${_electron_dist} -c.electronVersion=${_electron_ver}
-  npm config set prefix ${_npm_prefix}
-  nvm unalias default
 }
 
 package() {
@@ -87,4 +93,25 @@ EOF
   chmod +x "$pkgdir"/usr/bin/$pkgname
 
   install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+  # # https://wiki.archlinux.org/title/Node.js_package_guidelines#Package_contains_reference_to_$srcdir/$pkgdir
+  # find "$pkgdir" -name package.json -print0 | xargs -r -0 sed -i '/_where/d'
+
+  # local tmppackage="$(mktemp)"
+  # local pkgjson="$pkgdir/usr/lib/node_modules/$pkgname/package.json"
+  # jq '.|=with_entries(select(.key|test("_.+")|not))' "$pkgjson" > "$tmppackage"
+  # mv "$tmppackage" "$pkgjson"
+  # chmod 644 "$pkgjson"
+}
+
+# https://wiki.archlinux.org/title/Node.js_package_guidelines#Using_nvm
+_ensure_local_nvm() {
+    # let's be sure we are starting clean
+    which nvm >/dev/null 2>&1 && nvm deactivate && nvm unload
+    export NVM_DIR="${srcdir}/.nvm"
+
+    # The init script returns 3 if version specified
+    # in ./.nvrc is not (yet) installed in $NVM_DIR
+    # but nvm itself still gets loaded ok
+    source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
 }