From b2887d7169005b3b670fdb9686b6316fb48099b0 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Sun, 25 Jun 2023 14:33:42 +0800
Subject: [PATCH] misc fixes

---
 metadata/com.calcitem.sanmill.yml    |  3 ++-
 metadata/com.machiav3lli.backup.yml  |  4 ++++
 metadata/com.tutpro.baresip.plus.yml |  9 +++------
 metadata/com.tutpro.baresip.yml      | 11 ++++-------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/metadata/com.calcitem.sanmill.yml b/metadata/com.calcitem.sanmill.yml
index 3a8203d0ce..4388c91301 100644
--- a/metadata/com.calcitem.sanmill.yml
+++ b/metadata/com.calcitem.sanmill.yml
@@ -2340,11 +2340,12 @@ Builds:
 
   - versionName: 3.5.13
     versionCode: 3558
+    disable: https://github.com/calcitem/Sanmill/issues/725
     commit: 580ccc6f4f1be7f38959872479a3473bfec753dc
     subdir: src/ui/flutter_app
     output: build/app/outputs/flutter-apk/app-fdroid-release.apk
     srclibs:
-      - flutter@3.10.0
+      - flutter@3.10.5
     rm:
       - src/perfect
       - src/test
diff --git a/metadata/com.machiav3lli.backup.yml b/metadata/com.machiav3lli.backup.yml
index de2e5fbe08..b674f4ecb2 100644
--- a/metadata/com.machiav3lli.backup.yml
+++ b/metadata/com.machiav3lli.backup.yml
@@ -270,6 +270,10 @@ Builds:
     versionCode: 8309
     commit: ef8818ee264d22f1454fcf914126330a7b068f51
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - yes
 
diff --git a/metadata/com.tutpro.baresip.plus.yml b/metadata/com.tutpro.baresip.plus.yml
index 46ce4b39de..6ff7653985 100644
--- a/metadata/com.tutpro.baresip.plus.yml
+++ b/metadata/com.tutpro.baresip.plus.yml
@@ -2404,7 +2404,7 @@ Builds:
 
   - versionName: 44.1.1
     versionCode: 156
-    commit: 157b693a1a7c15e71d76b6ab4a64862e5fb1e106
+    commit: f65fa64ecc7cc155ddd49cc5a027867c26bc4da4
     subdir: app
     submodules: true
     sudo:
@@ -2415,11 +2415,8 @@ Builds:
       - update-java-alternatives -a
     gradle:
       - yes
-    prebuild:
-      - sed -i -e 's/-XX:MaxPermSize=512m//' ../gradle.properties
-      - cd ../libbaresip-android.video
-      - sed -i -e 's|/opt/Android/ndk/.*|$$NDK$$|' -e 's|/usr/src/baresip-studio|../../com.tutpro.baresip.plus|'
-        Makefile
+    prebuild: sed -i -e 's|/opt/Android/ndk/.*|$$NDK$$|' -e 's|/usr/src/baresip-studio|..|'
+        ../libbaresip-android.video/Makefile
     build:
       - cd ../libbaresip-android.video
       - make download-sources
diff --git a/metadata/com.tutpro.baresip.yml b/metadata/com.tutpro.baresip.yml
index cedbafcacd..8aa343c212 100644
--- a/metadata/com.tutpro.baresip.yml
+++ b/metadata/com.tutpro.baresip.yml
@@ -3426,7 +3426,7 @@ Builds:
 
   - versionName: 57.1.1
     versionCode: 290
-    commit: 451721e17c9d04a20d4ba5dddeaeba69ba963eb7
+    commit: 022299177ce27a77418d22b4fda5002a2699f655
     subdir: app
     submodules: true
     sudo:
@@ -3437,13 +3437,10 @@ Builds:
       - update-java-alternatives -a
     gradle:
       - yes
-    prebuild:
-      - sed -i -e 's/-XX:MaxPermSize=512m//' ../gradle.properties
-      - cd ../libbaresip-android.video
-      - sed -i -e 's|/opt/Android/ndk/.*|$$NDK$$|' -e 's|/usr/src/baresip-studio|../../com.tutpro.baresip|'
-        Makefile
+    prebuild: sed -i -e 's|/opt/Android/ndk/.*|$$NDK$$|' -e 's|/usr/src/baresip-studio|..|'
+        ../libbaresip-android/Makefile
     build:
-      - cd ../libbaresip-android.video
+      - cd ../libbaresip-android
       - make download-sources
       - make install-all
     ndk: r25c