Merge branch 'miscfixes420' into 'master'

Misc fixes

See merge request fdroid/fdroiddata!8232

metadata/com.tutpro.baresip.plus.yml

@@ -371,26 +371,6 @@ Builds:
       - popd
     ndk: r21d
 
-  - versionName: 11.0.1
-    versionCode: 27
-    commit: v11.0.1
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y --no-install-recommends -t testing nasm
-    gradle:
-      - yes
-    srclibs:
-      - libbaresip-android@v10.0
-    build:
-      - pushd $$libbaresip-android$$
-      - sed -i -e 's!$(shell ls -d -1 /opt/Android/ndk/\* | tail -1)!$$NDK$$!' -e
-        's|/usr/src/baresip-studio|../../com.tutpro.baresip.plus|' Makefile
-      - make download-sources
-      - make install-all
-      - popd
-    ndk: r21d
-
   - versionName: 11.0.2
     versionCode: 28
     commit: v11.0.2

metadata/com.tutpro.baresip.yml

@@ -1516,23 +1516,6 @@ Builds:
       - popd
     ndk: r21d
 
-  - versionName: 26.1.1
-    versionCode: 152
-    commit: 26.1.1
-    subdir: app
-    gradle:
-      - yes
-    srclibs:
-      - libbaresip-android@20.0
-    build:
-      - pushd $$libbaresip-android$$
-      - sed -i -e 's!$(shell ls -d -1 /opt/Android/ndk/\* | tail -1)!$$NDK$$!' -e
-        's|/usr/src/baresip-studio|../../com.tutpro.baresip|' Makefile
-      - make download-sources
-      - make install-all
-      - popd
-    ndk: r21d
-
   - versionName: 26.1.2
     versionCode: 153
     commit: 26.1.2

metadata/de.drhoffmannsoft.pizza.yml

@@ -32,7 +32,7 @@ Builds:
     commit: 1.05-11
     gradle:
       - yes
-    prebuild: sed -e -i '/keystore/d' app/build.gradle
+    prebuild: sed -i -e '/keystore/d' app/build.gradle
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags

metadata/eu.faircode.email.yml

@@ -3658,9 +3658,19 @@ Builds:
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
     ndk: r21d
 
+  - versionName: '1.1470'
+    versionCode: 1470
+    commit: '1.1470'
+    subdir: app
+    submodules: true
+    gradle:
+      - fdroid
+    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
+    ndk: r21d
+
 MaintainerNotes: Dynamic versionName and version code, so no autoupdates anymore.
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '1.1466'
-CurrentVersionCode: 1466
+CurrentVersion: '1.1470'
+CurrentVersionCode: 1470

metadata/org.commonvoice.saverio.yml

@@ -172,7 +172,7 @@ Builds:
       - FD-GH
     output: build/outputs/apk/FD-GH/release/app-FD-GH-release-unsigned.apk
 
-  - versionName: 2.2.3
+  - versionName: 2.2.2
     versionCode: 131
     commit: 2.2.2-131
     subdir: app

metadata/org.openobservatory.ooniprobe.yml

@@ -294,6 +294,7 @@ Builds:
 
   - versionName: 2.9.0
     versionCode: 69
+    disable: fails to build
     commit: v2.9.0
     subdir: app
     gradle:

metadata/org.yuttadhammo.BodhiTimer.yml

@@ -179,6 +179,7 @@ Builds:
 
   - versionName: 5.3.5
     versionCode: 72
+    disable: kotlin repos
     commit: 5.3.5
     subdir: app
     gradle: