fix aarch64 build

3 files changed, 80 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aea27fa7df53..9c1f06edee92 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jitsi-meet-desktop
 	pkgdesc = Jitsi Meet desktop application
 	pkgver = 2.8.7
-	pkgrel = 1
+	pkgrel = 2
 	url = https://jitsi.org/jitsi-meet/
 	arch = x86_64
 	arch = aarch64
@@ -20,9 +20,11 @@ pkgbase = jitsi-meet-desktop
 	options = !strip
 	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 = no_targets.patch
 	source = jitsi-meet-desktop.desktop
 	sha256sums = 32da999ed1ac2c60a3498639633fcfc84b21e09e447d55adb9da7159cba79017
 	sha256sums = 7c6198c5bd1cb7bb4b082d5da31ef9b21582d77453f9677c24e13e20e1ee337e
+	sha256sums = 4074fd3e629d1997d2bd080bef8050727b3a446acf388f71c8ed26ed6a8c0390
 	sha256sums = 36a30a15613d53b2a01626a5551315c6970889ce3c2688bce71e26c3333081a4
 
 pkgname = jitsi-meet-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 8ffa631f5f55..951f01de1fa6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=jitsi-meet-desktop
 pkgver=2.8.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Jitsi Meet desktop application"
 arch=('x86_64' 'aarch64')
 url="https://jitsi.org/jitsi-meet/"
@@ -28,9 +28,11 @@ 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'
+        'no_targets.patch'
         'jitsi-meet-desktop.desktop')
 sha256sums=('32da999ed1ac2c60a3498639633fcfc84b21e09e447d55adb9da7159cba79017'
             '7c6198c5bd1cb7bb4b082d5da31ef9b21582d77453f9677c24e13e20e1ee337e'
+            '4074fd3e629d1997d2bd080bef8050727b3a446acf388f71c8ed26ed6a8c0390'
             '36a30a15613d53b2a01626a5551315c6970889ce3c2688bce71e26c3333081a4')
 
 case "$CARCH" in
@@ -50,6 +52,11 @@ prepare() {
   _ensure_local_nvm
   nvm install 14
 
+  # remove all hardcoded (x64) electron-builder targets
+  # for some reason, it's not enough to explicitely specify the desired (dir)
+  # target when calling electron-builder..
+  patch -Np1 -i ${srcdir}/no_targets.patch
+
   _electron_dist=/usr/lib/electron12
   _electron_ver=$(cat ${_electron_dist}/version)
   sed -r 's#("electron": ").*"#\1'${_electron_ver}'"#' -i package.json
@@ -70,7 +77,9 @@ build() {
   _ensure_local_nvm
   nvm use 14
 
-  npm run build
+  # npm run build
+  npx webpack --config ./webpack.main.js --mode production
+  npx webpack --config ./webpack.renderer.js --mode production
   npx electron-builder --linux --${_electronbuilderrarch} --dir $dist -c.electronDist=${_electron_dist} -c.electronVersion=${_electron_ver}
 }
 
diff --git a/no_targets.patch b/no_targets.patch
new file mode 100644
index 000000000000..6c4532e7ca19
--- /dev/null
+++ b/no_targets.patch
@@ -0,0 +1,66 @@
+diff --git a/package.json b/package.json
+index 1d6807f..9dfd510 100644
+--- a/package.json
++++ b/package.json
+@@ -27,35 +27,6 @@
+       "!app",
+       "!main.js"
+     ],
+-    "mac": {
+-      "artifactName": "jitsi-meet.${ext}",
+-      "target": [
+-        {
+-          "arch": "universal",
+-          "target": "dmg"
+-        },
+-        {
+-          "arch": "universal",
+-          "target": "zip"
+-        }
+-      ],
+-      "category": "public.app-category.video",
+-      "darkModeSupport": true,
+-      "hardenedRuntime": true,
+-      "entitlements": "entitlements.mac.plist",
+-      "entitlementsInherit": "entitlements.mac.plist",
+-      "asarUnpack": "**/*.node",
+-      "extendInfo": {
+-        "NSCameraUsageDescription": "Jitsi Meet requires access to your camera in order to make video-calls.",
+-        "NSMicrophoneUsageDescription": "Jitsi Meet requires access to your microphone in order to make calls (audio/video).",
+-        "LSMultipleInstancesProhibited": true
+-      }
+-    },
+-    "mas": {
+-      "entitlements": "resources/entitlements.mas.plist",
+-      "entitlementsInherit": "resources/entitlements.mas.inherit.plist",
+-      "hardenedRuntime": false
+-    },
+     "linux": {
+       "artifactName": "jitsi-meet-${arch}.${ext}",
+       "category": "VideoConference;AudioVideo;Audio;Video;Network",
+@@ -63,24 +34,7 @@
+       "executableName": "jitsi-meet",
+       "target": [
+         {
+-          "arch": "x64",
+-          "target": "AppImage"
+-        },
+-        {
+-          "arch": "x64",
+-          "target": "deb"
+-        }
+-      ]
+-    },
+-    "win": {
+-      "artifactName": "jitsi-meet.${ext}",
+-      "target": [
+-        {
+-          "arch": [
+-            "ia32",
+-            "x64"
+-          ],
+-          "target": "nsis"
++          "target": "dir"
+         }
+       ]
+     },