From 4413b7582846f6db29c0caaf37b4a2387204c1c2 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Tue, 3 Oct 2023 14:16:57 +0800
Subject: [PATCH] misc fixes

---
 metadata/com.tutpro.baresip.yml            | 2 +-
 metadata/de.westnordost.streetcomplete.yml | 4 ++++
 metadata/dev.linwood.butterfly.nightly.yml | 5 +++++
 metadata/io.ente.photos.fdroid.yml         | 1 -
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/metadata/com.tutpro.baresip.yml b/metadata/com.tutpro.baresip.yml
index b00ed7b5bc..3147ab3285 100644
--- a/metadata/com.tutpro.baresip.yml
+++ b/metadata/com.tutpro.baresip.yml
@@ -3486,7 +3486,7 @@ Builds:
       - cd ../libbaresip-android
       - make download-sources
       - make install-all
-    ndk: r25c
+    ndk: r26
 
 MaintainerNotes: make download-sources checks out master branches of several libraries;
   this can cause build failures.
diff --git a/metadata/de.westnordost.streetcomplete.yml b/metadata/de.westnordost.streetcomplete.yml
index aa23ffb659..2a2768c9fb 100644
--- a/metadata/de.westnordost.streetcomplete.yml
+++ b/metadata/de.westnordost.streetcomplete.yml
@@ -1175,6 +1175,10 @@ Builds:
     versionCode: 5402
     commit: 3a5232a4035bbb5ff1e656535ae053dc98d08850
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     prebuild: sed -i -e '/keystorePropertiesFile.*{/,/}/d' build.gradle.kts
diff --git a/metadata/dev.linwood.butterfly.nightly.yml b/metadata/dev.linwood.butterfly.nightly.yml
index a13cb43932..153350a1d5 100644
--- a/metadata/dev.linwood.butterfly.nightly.yml
+++ b/metadata/dev.linwood.butterfly.nightly.yml
@@ -847,6 +847,10 @@ Builds:
     versionCode: 72
     commit: b3350a9a21b00cf099de3e1176ced8b5e92ea88a
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-alternatives --auto java
     output: build/app/outputs/flutter-apk/app-nightly-release.apk
     srclibs:
       - flutter@stable
@@ -863,6 +867,7 @@ Builds:
       - popd
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter config --no-analytics
+      - $$flutter$$/bin/flutter pub get
     scandelete:
       - app/.pub-cache
     build:
diff --git a/metadata/io.ente.photos.fdroid.yml b/metadata/io.ente.photos.fdroid.yml
index d38f7096f7..b849273944 100644
--- a/metadata/io.ente.photos.fdroid.yml
+++ b/metadata/io.ente.photos.fdroid.yml
@@ -1112,7 +1112,6 @@ Builds:
       - transistor-background-fetch@fb883de16ff3fbaaaa5ce84d829911c8a5894d2
     rm:
       - ios
-      - thirdparty/extended_image/example
       - android/app/src/main/jniLibs/*/*libtensor*.so
     prebuild:
       - export PUB_CACHE=$(pwd)/.pub-cache