Merge branch 'miscfixes412' into 'master'

Misc fixes after build

See merge request fdroid/fdroiddata!8116

metadata/eu.faircode.email.yml

@@ -3618,9 +3618,19 @@ Builds:
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
     ndk: r21d
 
+  - versionName: '1.1448'
+    versionCode: 1448
+    commit: '1.1448'
+    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.1446'
+CurrentVersion: '1.1448'
-CurrentVersionCode: 1446
+CurrentVersionCode: 1448

metadata/flunzmas.seasoncalendar.yml

@@ -16,24 +16,6 @@ RepoType: git
 Repo: https://github.com/Flunzmas/seasoncalendar
 
 Builds:
-  - versionName: 1.4.5
-    versionCode: 39
-    commit: v1.4.5
-    subdir: android/app
-    gradle:
-      - yes
-    output: ../../build/app/outputs/flutter-apk/app-foss-release.apk
-    srclibs:
-      - flutter@stable
-    prebuild:
-      - export flutter=$(realpath $$flutter$$)
-      - echo "flutter.sdk=$flutter" >> ../local.properties
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter packages pub get
-      - $$flutter$$/bin/flutter update-packages
-      - $$flutter$$/bin/flutter build apk --release --flavor foss --verbose
-
   - versionName: 1.4.6
     versionCode: 40
     commit: v1.4.6

metadata/info.metadude.android.rc3.schedule.yml

@@ -70,7 +70,7 @@ Builds:
 
   - versionName: 1.49.0-rC3-Edition
     versionCode: 80
-    commit: v.1.49.0-rC3-Edition
+    commit: v.1.49.0
     subdir: app
     gradle:
       - rc3

metadata/io.github.muntashirakon.AppManager.yml

@@ -49,7 +49,6 @@ Builds:
 
   - versionName: 2.5.20
     versionCode: 375
-    disable: fails to build
     commit: v2.5.20
     subdir: app
     submodules: true

metadata/io.treehouses.remote.yml

@@ -427,19 +427,13 @@ Builds:
       - yes
     output: app/build/outputs/apk/release/remote-$$VERSION$$.apk
 
-  - versionName: '6052'
-    versionCode: 6052
-    commit: fdroid-6052
-    gradle:
-      - yes
-    output: app/build/outputs/apk/release/remote-$$VERSION$$.apk
-
   - versionName: '6054'
     versionCode: 6054
     commit: fdroid-6054
     gradle:
       - yes
     output: app/build/outputs/apk/release/remote-$$VERSION$$.apk
+    ndk: r21d
 
 MaintainerNotes: The root build.gradle contains custom code that uses relative paths.
     Thus we cannot apply subdir.

metadata/mn.tck.semitone.yml

@@ -74,7 +74,7 @@ Builds:
     build:
       - tools/build_ffmpeg.sh
       - tools/copy_ffmpeg.sh
-    ndk: r19c
+    ndk: r22
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags

metadata/org.courville.nova.yml

@@ -335,34 +335,9 @@ Builds:
     gradleprops:
       - universal
 
-  - versionName: 4.49.12
-    versionCode: 404912
-    disable: fails to build
-    commit: v4.49.12_c404912
-    subdir: Video
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y -t testing nasm
-      - apt-get install -y ninja-build maven build-essential
-      - pip3 install meson==0.53.2
-    gradle:
-      - noamazon
-    output: build/outputs/apk/noamazon/release/Video-universal-release-unsigned.apk
-    rm:
-      - native/libtorrent/bin*
-      - native/torrentd/libs
-      - native/dav1d-android-builder/build-*
-      - native/ffmpeg-android-builder/dist-full-*
-      - MediaLib/libs/*jar
-      - native/opus-android-builder/lib
-    prebuild: rm -f FileCoreLibrary/libs/*jar
-    ndk: r21d
-    gradleprops:
-      - universal
-
   - versionName: 4.49.16
     versionCode: 404916
+    disable: fails to build
     commit: v4.49.16_c404916
     subdir: Video
     submodules: true

metadata/org.totschnig.myexpenses.yml

@@ -1491,7 +1491,7 @@ Builds:
 
   - versionName: 3.2.1.1
     versionCode: 452
-    commit: r452
+    commit: r450
     subdir: myExpenses
     output: build/outputs/universal_apk/conscriptExternRelease/myExpenses-conscript-extern-release-universal-unsigned.apk
     rm: