From 3c69bcd336e00700c3fe27710a442941e8b5c762 Mon Sep 17 00:00:00 2001
From: Licaon_Kter <licaon.kter@protonmail.com>
Date: Tue, 8 Oct 2024 11:37:17 +0000
Subject: [PATCH] Update materialio recipe

---
 metadata/us.materialio.app.yml | 35 +++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/metadata/us.materialio.app.yml b/metadata/us.materialio.app.yml
index c7ea183316..407a7e8ebe 100644
--- a/metadata/us.materialio.app.yml
+++ b/metadata/us.materialio.app.yml
@@ -62,26 +62,47 @@ Builds:
       - popd
       - mv $$esbuild$$/esbuild ../../node_modules/@esbuild/linux-x64/bin/esbuild
 
-  - versionName: 1.6.1
-    versionCode: 52
-    disable: https://gitlab.com/fdroid/fdroiddata/-/merge_requests/15832
-    commit: 3154d83b05489e580a0ed47a7484432b83dcde20
+  - versionName: 1.6.2
+    versionCode: 53
+    commit: 14be7697d86278c52442924ce3bc8f5091845340
+    timeout: 20000
     subdir: materialious/android/app
     sudo:
       - apt-get update
-      - apt-get install -y npm golang-go make
+      - apt-get install -y build-essential cmake golang-go gcc-multilib g++-multilib
+        make npm
     gradle:
       - yes
+    srclibs:
+      - esbuild@v0.24.0
+      - NodejsMobile@v18.17.3
     prebuild:
       - sed -i -e '/gms/d' ../build.gradle
+      - sed -i -e 's/-Xmx1536m/-Xmx4096m/' ../gradle.properties
       - cd ../..
+      - npm install --build-from-source
+      - pushd static/nodejs-android
       - npm install
+      - popd
       - npm run build
       - npx cap sync
     scandelete:
       - materialious/node_modules
+    build:
+      - pushd $$NodejsMobile$$
+      - ./tools/android_build.sh $$NDK$$ 24
+      - popd
+      - cp -a $$NodejsMobile$$/out_android/* ../../node_modules/capacitor-nodejs/android/libnode/bin/
+      - pushd $$esbuild$$
+      - make esbuild
+      - popd
+      - cp $$esbuild$$/esbuild ../../node_modules/vite/node_modules/esbuild/bin/esbuild
+      - cp $$esbuild$$/esbuild ../../node_modules/vite/node_modules/@esbuild/linux-x64/bin/esbuild
+      - cp $$esbuild$$/esbuild ../../node_modules/svelte-i18n/node_modules/esbuild/bin/esbuild
+      - cp $$esbuild$$/esbuild ../../node_modules/svelte-i18n/node_modules/@esbuild/linux-x64/bin/esbuild
+    ndk: r25b
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
-CurrentVersion: 1.6.1
-CurrentVersionCode: 52
+CurrentVersion: 1.6.2
+CurrentVersionCode: 53