From 1900348a234375fb659613b89e2d2af3b63a3acf Mon Sep 17 00:00:00 2001
From: linsui <2873532-linsui@users.noreply.gitlab.com>
Date: Tue, 14 Dec 2021 16:28:43 +0000
Subject: [PATCH] misc fixes

---
 metadata/com.example.forgottenumbrella.cardboardmuseum.yml | 5 +++++
 metadata/com.manimarank.spell4wiki.yml                     | 1 +
 metadata/cz.martykan.forecastie.yml                        | 7 -------
 metadata/de.freehamburger.yml                              | 2 +-
 metadata/de.kromke.andreas.safmediascanner.yml             | 2 +-
 metadata/io.muetsch.anchrandroid.yml                       | 1 +
 metadata/net.kollnig.missioncontrol.fdroid.yml             | 4 ++++
 metadata/org.droidtr.keyboard.yml                          | 1 +
 metadata/org.proninyaroslav.libretorrent.yml               | 4 ++--
 9 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/metadata/com.example.forgottenumbrella.cardboardmuseum.yml b/metadata/com.example.forgottenumbrella.cardboardmuseum.yml
index 0ba8fd48b2..630ec5b394 100644
--- a/metadata/com.example.forgottenumbrella.cardboardmuseum.yml
+++ b/metadata/com.example.forgottenumbrella.cardboardmuseum.yml
@@ -63,8 +63,13 @@ Builds:
 
   - versionName: 1.2.0
     versionCode: 12
+    disable: https://gitlab.com/ForgottenUmbrella/cardboardmuseum/-/issues/12
     commit: 97141a3e31ef675a95a2c32496f354931d8769e1
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     prebuild: sed -i -e '/testImplementation/d' build.gradle
diff --git a/metadata/com.manimarank.spell4wiki.yml b/metadata/com.manimarank.spell4wiki.yml
index 5c54bd2b99..5602574ecb 100644
--- a/metadata/com.manimarank.spell4wiki.yml
+++ b/metadata/com.manimarank.spell4wiki.yml
@@ -55,6 +55,7 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - yes
+    prebuild: sed -i -e '/firebase/d' build.gradle
     ndk: r21
 
 AutoUpdateMode: Version v%v
diff --git a/metadata/cz.martykan.forecastie.yml b/metadata/cz.martykan.forecastie.yml
index 729948ab0c..bb246102cf 100644
--- a/metadata/cz.martykan.forecastie.yml
+++ b/metadata/cz.martykan.forecastie.yml
@@ -429,13 +429,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 1.19.1
-    versionCode: 70
-    commit: 86a64e831c44467df563a3d898d5b4f73a86249a
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: '1.20'
     versionCode: 71
     commit: 27c06829daa7b803c6431b70f71684a33fa2262c
diff --git a/metadata/de.freehamburger.yml b/metadata/de.freehamburger.yml
index b7805b1899..b27ae47bf5 100644
--- a/metadata/de.freehamburger.yml
+++ b/metadata/de.freehamburger.yml
@@ -31,7 +31,7 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - yes
-    prebuild: sed -i -e '/keystorePropertiesFile/d' build.gradle
+    prebuild: sed -i -e '/keystorePropertiesFile/d' -e '/enable true/' build.gradle
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
diff --git a/metadata/de.kromke.andreas.safmediascanner.yml b/metadata/de.kromke.andreas.safmediascanner.yml
index 541775098f..e1b1fe8a18 100644
--- a/metadata/de.kromke.andreas.safmediascanner.yml
+++ b/metadata/de.kromke.andreas.safmediascanner.yml
@@ -50,7 +50,7 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - yes
-    ndk: r21e
+    ndk: r23b
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
diff --git a/metadata/io.muetsch.anchrandroid.yml b/metadata/io.muetsch.anchrandroid.yml
index 4eae405fb0..aecfdae85c 100644
--- a/metadata/io.muetsch.anchrandroid.yml
+++ b/metadata/io.muetsch.anchrandroid.yml
@@ -29,6 +29,7 @@ Builds:
 
   - versionName: 1.2.3
     versionCode: 31
+    disable: https://monitor.f-droid.org/builds/log/io.muetsch.anchrandroid/31#site-footer
     commit: e60f305b9d9cbb010bf5d3cf21cc8e01ab2f41de
     output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk
     srclibs:
diff --git a/metadata/net.kollnig.missioncontrol.fdroid.yml b/metadata/net.kollnig.missioncontrol.fdroid.yml
index 919cbff371..dfac8a247a 100644
--- a/metadata/net.kollnig.missioncontrol.fdroid.yml
+++ b/metadata/net.kollnig.missioncontrol.fdroid.yml
@@ -260,6 +260,10 @@ Builds:
     versionCode: 2021120901
     commit: 205960fa0b8e0ee4a21e936fa7536f49d3413c9c
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - fdroid
     prebuild: sed -i -e 's/21.0.6113669/21.4.7075529/' build.gradle
diff --git a/metadata/org.droidtr.keyboard.yml b/metadata/org.droidtr.keyboard.yml
index 5de19f37f8..ae7f564abf 100644
--- a/metadata/org.droidtr.keyboard.yml
+++ b/metadata/org.droidtr.keyboard.yml
@@ -229,6 +229,7 @@ Builds:
 
   - versionName: 7.7.3
     versionCode: 66
+    disable: https://gitlab.com/droidtr/org.droidtr.keyboard/-/issues/5
     commit: 59ea13047fa2b8eab670e0c89af2289e83fc01e2
     output: bin/app.apk
     prebuild:
diff --git a/metadata/org.proninyaroslav.libretorrent.yml b/metadata/org.proninyaroslav.libretorrent.yml
index 4e700ceb5f..aa165df8d1 100644
--- a/metadata/org.proninyaroslav.libretorrent.yml
+++ b/metadata/org.proninyaroslav.libretorrent.yml
@@ -168,11 +168,11 @@ Builds:
     subdir: app
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
+      - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
     gradle:
       - main
-    output: build/outputs/apk/main/release/app-main-universal-release-unsigned.apk
+    prebuild: sed -i -e '/enable true/d' build.gradle
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags