From ca0c59c1a6f94747afa3325622bbecb99a8a10b9 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Sat, 9 Apr 2022 11:58:59 +0000
Subject: [PATCH] Install npm from NodeSource

---
 metadata/im.vector.app.yml | 38 ++++----------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/metadata/im.vector.app.yml b/metadata/im.vector.app.yml
index f0feecffa4..8ff2ba481f 100644
--- a/metadata/im.vector.app.yml
+++ b/metadata/im.vector.app.yml
@@ -900,47 +900,17 @@ Builds:
       - cp -r node_modules/jsc-android/dist/org/webkit/android-jsc "$HOME/.m2/repository/org/webkit"
     ndk: r21d
 
-  - versionName: 1.4.10
-    versionCode: 40104100
-    commit: v1.4.10
-    subdir: vector
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y -t stretch-backports jq openjdk-11-jdk-headless openjdk-11-jre-headless
-      - apt-get install -y --no-install-recommends -t testing npm zlib1g{,-dev}
-      - update-alternatives --auto java
-      - sysctl fs.inotify.max_user_watches=524288
-      - sysctl -p
-    patch:
-      - build_gradle_remove_jitsi_repo.patch
-    gradle:
-      - fdroid
-    srclibs:
-      - jitsi-meet@android-sdk-5.0.2
-    prebuild:
-      - sed -i -e '/com.google.gms.google-services/d' build.gradle ../build.gradle
-      - sed -i -e 's/enable true/enable false/g' build.gradle
-      - sed -i -e '/repositories {/a\        mavenLocal()' ../build.gradle
-      - sed -i -e '/gplayImplementation(.*) {/,/}/d; /gplayImplementation/d' build.gradle
-    build:
-      - cd $$jitsi-meet$$
-      - export LIBRE_BUILD=true
-      - npm install --save false webpack-bundle-analyzer
-      - npm ci
-      - mkdir -p "$HOME/.m2"
-      - bash android/scripts/release-sdk.sh "$HOME/.m2/repository"
-      - mkdir -p "$HOME/.m2/repository/org/webkit"
-      - cp -r node_modules/jsc-android/dist/org/webkit/android-jsc "$HOME/.m2/repository/org/webkit"
-    ndk: r21d
-
   - versionName: 1.4.11
     versionCode: 40104110
     commit: v1.4.11
     subdir: vector
     sudo:
+      - curl -Lo node.tar.xz https://nodejs.org/dist/v16.14.2/node-v16.14.2-linux-x64.tar.xz
+      - echo "e40c6f81bfd078976d85296b5e657be19e06862497741ad82902d0704b34bb1b node.tar.xz"
+        | sha256sum -c -
+      - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
       - apt-get update || apt-get update
       - apt-get install -y -t stretch-backports jq openjdk-11-jdk-headless openjdk-11-jre-headless
-      - apt-get install -y --no-install-recommends -t testing npm zlib1g{,-dev}
       - update-alternatives --auto java
       - sysctl fs.inotify.max_user_watches=524288
       - sysctl -p