Merge branch 'miscfixesfallout' into 'master'

Misc fixes - moar

See merge request fdroid/fdroiddata!6077

metadata/com.iven.musicplayergo.yml

@@ -285,7 +285,7 @@ Builds:
 
   - versionName: 3.6.9.2
     versionCode: 131
-    commit: 3.6.9.2
+    commit: v3.6.9.2
     subdir: project/app
     gradle:
       - yes

metadata/dk.kjeldsen.carwingsflutter.yml

@@ -273,28 +273,12 @@ Builds:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter build apk
 
-  - versionName: 1.7.6
-    versionCode: 123
-    disable: fails to build
-    commit: 1.7.6
-    output: build/app/outputs/apk/release/app-release.apk
-    srclibs:
-      - flutter@v1.7.3
-    prebuild:
-      - touch android/key.properties
-      - echo 'android.applicationVariants.all { variant -> variant.outputs.all { output
-        -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter build apk
-
   - versionName: 1.7.7
     versionCode: 124
-    disable: fails to build
     commit: 1.7.7
     output: build/app/outputs/apk/release/app-release.apk
     srclibs:
-      - flutter@v1.7.3
+      - flutter@v1.12.13+hotfix.5
     prebuild:
       - touch android/key.properties
       - echo 'android.applicationVariants.all { variant -> variant.outputs.all { output