Merge branch 'miscfxes26' into 'master'

Misc fixes after cycle

See merge request fdroid/fdroiddata!6846

metadata/ar.rulosoft.mimanganu.yml

@@ -1413,36 +1413,13 @@ Builds:
       - sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g'
         ../build.gradle
 
-  - versionName: '1.130'
-    versionCode: 130
-    disable: fails to build
-    commit: '1.130'
-    subdir: app
-    gradle:
-      - fdroid
-    srclibs:
-      - RapidDecoderRaulhaag@0.3.1Ax
-    prebuild:
-      - cp -fR $$RapidDecoderRaulhaag$$/library/src/main/java/rapid src/main/java/
-      - sed -i -e '/rapid.decoder/d' -e '/githubImplementation/d' -e '/versionNameSuffix/d'
-        build.gradle
-      - sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g'
-        ../build.gradle
-
   - versionName: '1.132'
     versionCode: 132
     commit: '1.132'
     subdir: app
     gradle:
       - fdroid
-    srclibs:
-      - RapidDecoderRaulhaag@0.3.1Ax
-    prebuild:
-      - cp -fR $$RapidDecoderRaulhaag$$/library/src/main/java/rapid src/main/java/
-      - sed -i -e '/rapid.decoder/d' -e '/githubImplementation/d' -e '/versionNameSuffix/d'
-        build.gradle
-      - sed -i -e 's@https://github.com/suckgamony/RapidDecoder/raw/master/repository@https://jitpack.io@g'
-        ../build.gradle
+    prebuild: sed -i -e '/githubImplementation/d' build.gradle
 
 MaintainerNotes: We use the dev fork of RapidDecoder
 

metadata/com.duckduckgo.mobile.android.yml

@@ -611,6 +611,7 @@ Builds:
     gradle:
       - yes
     output: app/build/outputs/apk/release/duckduckgo-$$VERSION$$-release-unsigned.apk
+    prebuild: sed -i -e 's/21.0.6113669/21.1.6352462/' app/build.gradle
     ndk: r21b
 
 MaintainerNotes: Cannot use AUM/UCM because version code and version name are dynamic.

metadata/com.ichi2.anki.yml

@@ -491,6 +491,7 @@ Builds:
       - docs
     scanignore:
       - AnkiDroid/src/main/java/com/ichi2/libanki/hooks/ExternalHookLoader.java
+    ndk: r21b
 
 MaintainerNotes: Uses DexLoader to load custom decks and plugins (?).
 

metadata/eu.faircode.email.yml

@@ -2425,7 +2425,8 @@ Builds:
     submodules: true
     gradle:
       - full
-    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
+    prebuild: sed -i -e '/keystoreProperties/d' -e 's/21.0.6113669/21.1.6352462/'
+        build.gradle
     ndk: r21b
 
 AutoUpdateMode: Version %v

metadata/org.openobservatory.ooniprobe.yml

@@ -210,6 +210,7 @@ Builds:
 
   - versionName: 2.4.0
     versionCode: 60
+    disable: unknown maven
     commit: v2.4.0
     subdir: app
     gradle:

metadata/org.wownero.cyberwow.yml

@@ -71,6 +71,7 @@ Builds:
 
   - versionName: 0.8.0.0
     versionCode: 26
+    disable: fails to build
     commit: v0.8.0.0
     subdir: cyberwow
     sudo:

metadata/org.xcsoar.yml

@@ -242,25 +242,9 @@ Builds:
     build: make TARGET=ANDROID7NEON DEBUG=n TESTING=n -j`nproc`
     ndk: r15c
 
-  - versionName: 6.8.13b
-    versionCode: 115
-    disable: fails to build
-    commit: v6.8.13b
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y g++ vorbis-tools librsvg2-bin
-      - apt-get install -y -t testing imagemagick
-    output: output/ANDROID7NEON/opt/build/unsigned.apk
-    rm:
-      - android/ioio/software/IOIODude/lib
-      - android/ioio/software/IOIOLib/target/pc/lib
-      - android/ioio/software/applications/IOIOConnectionTester/lib
-    build: make TARGET=ANDROID7NEON DEBUG=n TESTING=n -j`nproc`
-    ndk: r15c
-
   - versionName: 6.8.14
     versionCode: 116
+    disable: fails to build
     commit: v6.8.14
     submodules: true
     sudo: