Merge branch 'miscfixes419' into 'master'

Misc fixes

See merge request fdroid/fdroiddata!8210

metadata/com.tutpro.baresip.plus.yml

@@ -371,9 +371,9 @@ Builds:
       - popd
     ndk: r21d
 
-  - versionName: 11.0.0
-    versionCode: 26
-    commit: v11.0.0
+  - versionName: 11.0.1
+    versionCode: 27
+    commit: v11.0.1
     subdir: app
     sudo:
       - apt-get update || apt-get update
@@ -396,5 +396,5 @@ MaintainerNotes: make download-sources checks out master branches of several lib
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags v.*[0-9]$
-CurrentVersion: 11.0.0
-CurrentVersionCode: 26
+CurrentVersion: 11.0.1
+CurrentVersionCode: 27

metadata/com.tutpro.baresip.yml

@@ -1516,26 +1516,9 @@ Builds:
       - popd
     ndk: r21d
 
-  - versionName: 26.0.1
-    versionCode: 150
-    commit: 26.0.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.0
-    versionCode: 151
-    commit: 26.1.0
+  - versionName: 26.1.1
+    versionCode: 152
+    commit: 26.1.1
     subdir: app
     gradle:
       - yes
@@ -1555,5 +1538,5 @@ MaintainerNotes: make download-sources checks out master branches of several lib
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags ^[0-9.]+$
-CurrentVersion: 26.1.0
-CurrentVersionCode: 151
+CurrentVersion: 26.1.1
+CurrentVersionCode: 152

metadata/de.drhoffmannsoft.pizza.yml

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

metadata/eu.faircode.email.yml

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

metadata/org.bandev.buddhaquotes.yml

@@ -62,7 +62,8 @@ Builds:
     subdir: app
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -t stretch-backports androguard openjdk-11-jdk-headless openjdk-11-jre-headless
+      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 

metadata/org.commonvoice.saverio.yml

@@ -172,16 +172,15 @@ Builds:
       - FD-GH
     output: build/outputs/apk/FD-GH/release/app-FD-GH-release-unsigned.apk
 
-  - versionName: 2.2.2
-    versionCode: 130
-    disable: non foss play core see upstream issue 139
-    commit: 2.2.2
+  - versionName: 2.2.3
+    versionCode: 131
+    commit: 2.2.2-131
     subdir: app
     gradle:
       - FD-GH
     output: build/outputs/apk/FD-GH/release/app-FD-GH-release-unsigned.apk
 
-AutoUpdateMode: None
+AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
 CurrentVersion: 2.2.2
-CurrentVersionCode: 130
+CurrentVersionCode: 131