From 6e022d6900ca8dd5ce3583278a4f06c4656ae5e0 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Thu, 2 May 2024 21:11:31 +0800
Subject: [PATCH] misc fixes

---
 metadata/ch.rmy.android.http_shortcuts.yml | 3 ++-
 metadata/com.exifthumbnailadder.app.yml    | 2 +-
 metadata/com.game.asteroids_revenge.yml    | 7 +++++++
 metadata/com.massive.yml                   | 2 +-
 metadata/com.orgzlyrevived.yml             | 1 -
 metadata/com.paultirk.yatoo.yml            | 8 +++-----
 metadata/io.jozo.prayerbook.yml            | 1 -
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/metadata/ch.rmy.android.http_shortcuts.yml b/metadata/ch.rmy.android.http_shortcuts.yml
index dfd45b9a62..6183f561bc 100644
--- a/metadata/ch.rmy.android.http_shortcuts.yml
+++ b/metadata/ch.rmy.android.http_shortcuts.yml
@@ -581,7 +581,8 @@ Builds:
     gradle:
       - yes
     prebuild: sed -i -e '/isEnable = true/d' -e 's:File("app/:File(":' -e 's:inputFile
-      = ":inputFile = "../:g' -e 's:templateFile = ":templateFile = "../:g' build.gradle.kts
+      = ":inputFile = "../:g' -e 's:templateFile = ":templateFile = "../:g' -e '/googleShortcuts/d'
+      build.gradle.kts
     ndk: 23.2.8568313
 
 AutoUpdateMode: Version
diff --git a/metadata/com.exifthumbnailadder.app.yml b/metadata/com.exifthumbnailadder.app.yml
index 0c12fc2bce..8b01a20b38 100644
--- a/metadata/com.exifthumbnailadder.app.yml
+++ b/metadata/com.exifthumbnailadder.app.yml
@@ -254,7 +254,7 @@ Builds:
     scandelete:
       - library
       - libs.prebuilt
-    ndk: r25b
+    ndk: r26d
 
 MaintainerNotes: versionCode/Name are updated as static just before tagging, being
   dynamic during development in between.
diff --git a/metadata/com.game.asteroids_revenge.yml b/metadata/com.game.asteroids_revenge.yml
index 4ab47856b7..e7e09eeb19 100644
--- a/metadata/com.game.asteroids_revenge.yml
+++ b/metadata/com.game.asteroids_revenge.yml
@@ -286,6 +286,13 @@ Builds:
     output: asteroids_revenge.apk
     srclibs:
       - Godot@4.2.2-stable
+    prebuild:
+      - pushd $$Godot$$
+      - scons --clean platform=linuxbsd target=editor use_llvm=yes tools=yes
+      - scons --clean platform=android arch=armv7 production=yes target=template_release
+      - cd platform/android/java
+      - gradle cleanGodotTemplates
+      - popd
     build:
       - export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which javac))))
       - export ANDROID_SDK_ROOT=$$SDK$$
diff --git a/metadata/com.massive.yml b/metadata/com.massive.yml
index 0dc6257242..7f21e5df9e 100644
--- a/metadata/com.massive.yml
+++ b/metadata/com.massive.yml
@@ -3740,7 +3740,7 @@ Builds:
 
   - versionName: '2.34'
     versionCode: 36249
-    commit: 4aa2c662e5c4abad8c06b8aa1f6b64dead0ed926
+    commit: 26f1e95db033eaa7943a339c07b4af591c80a526
     subdir: android/app
     sudo:
       - apt-get update
diff --git a/metadata/com.orgzlyrevived.yml b/metadata/com.orgzlyrevived.yml
index cfe4e5d4a1..76da2116a0 100644
--- a/metadata/com.orgzlyrevived.yml
+++ b/metadata/com.orgzlyrevived.yml
@@ -75,7 +75,6 @@ Builds:
       - update-java-alternatives --set java-1.11.0-openjdk-amd64
     gradle:
       - fdroid
-    prebuild: echo 1
 
 AllowedAPKSigningKeys: 6fc9c2e22d07d25ce77e2e963455053c38b8318a1a2491b3ed95d50cba85493d
 
diff --git a/metadata/com.paultirk.yatoo.yml b/metadata/com.paultirk.yatoo.yml
index a6f6ecdc39..b866c0f09d 100644
--- a/metadata/com.paultirk.yatoo.yml
+++ b/metadata/com.paultirk.yatoo.yml
@@ -132,12 +132,8 @@ Builds:
     commit: 272b140a14beb0ef3bf986d224584df4da63f703
     subdir: android/app
     sudo:
-      - sysctl fs.inotify.max_user_watches=524288 || true
-      - curl -Lo node.tar.gz https://nodejs.org/dist/v18.16.1/node-v18.16.1-linux-x64.tar.gz
-      - echo "59582f51570d0857de6333620323bdeee5ae36107318f86ce5eca24747cabf5b node.tar.gz"
-        | sha256sum -c -
-      - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
       - apt-get update
+      - apt-get install -y npm
     output: build/outputs/apk/release/app-release-unsigned.apk
     prebuild:
       - cd ../..
@@ -151,6 +147,8 @@ Builds:
       - pushd ../..
       - npm run build-prod
       - npx cap sync android
+      - sed -i -e "s/\"COMMIT_HASH\",void 0/\"COMMIT_HASH\",\"$(git rev-parse --short=7
+        HEAD)\"/" android/app/src/main/assets/public/main.js
       - popd
       - gradle assembleRelease
 
diff --git a/metadata/io.jozo.prayerbook.yml b/metadata/io.jozo.prayerbook.yml
index 17e38a1fcc..33acd87be9 100644
--- a/metadata/io.jozo.prayerbook.yml
+++ b/metadata/io.jozo.prayerbook.yml
@@ -61,7 +61,6 @@ Builds:
 
   - versionName: 0.2.0
     versionCode: 4
-    disable: https://codeberg.org/jozo/prayer-book/issues/7
     commit: 8bf805bb1fefde055006e40bb3f6ab2452cac2ea
     subdir: android/app
     sudo: