From 1f0813bc71b1627b17af293008f8275a60f9bd4e Mon Sep 17 00:00:00 2001
From: Licaon_Kter <licaon.kter@protonmail.com>
Date: Mon, 25 May 2020 06:11:28 +0000
Subject: [PATCH] Misc fixes after cycle

---
 metadata/ar.rulosoft.mimanganu.yml         | 25 +---------------------
 metadata/com.duckduckgo.mobile.android.yml |  1 +
 metadata/com.ichi2.anki.yml                |  1 +
 metadata/eu.faircode.email.yml             |  3 ++-
 metadata/org.openobservatory.ooniprobe.yml |  1 +
 metadata/org.wownero.cyberwow.yml          |  1 +
 metadata/org.xcsoar.yml                    | 18 +---------------
 7 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/metadata/ar.rulosoft.mimanganu.yml b/metadata/ar.rulosoft.mimanganu.yml
index 6718a46234..4cc05ae7c3 100644
--- a/metadata/ar.rulosoft.mimanganu.yml
+++ b/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
 
diff --git a/metadata/com.duckduckgo.mobile.android.yml b/metadata/com.duckduckgo.mobile.android.yml
index 335e04cd79..1f5cf672fb 100644
--- a/metadata/com.duckduckgo.mobile.android.yml
+++ b/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.
diff --git a/metadata/com.ichi2.anki.yml b/metadata/com.ichi2.anki.yml
index ad197ab940..1a912cea2e 100644
--- a/metadata/com.ichi2.anki.yml
+++ b/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 (?).
 
diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index 3c110f1b7b..169dc96d09 100644
--- a/metadata/eu.faircode.email.yml
+++ b/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
diff --git a/metadata/org.openobservatory.ooniprobe.yml b/metadata/org.openobservatory.ooniprobe.yml
index 93be5be98e..8c2c1bf13d 100644
--- a/metadata/org.openobservatory.ooniprobe.yml
+++ b/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:
diff --git a/metadata/org.wownero.cyberwow.yml b/metadata/org.wownero.cyberwow.yml
index f880c4d249..ca61fb31c3 100644
--- a/metadata/org.wownero.cyberwow.yml
+++ b/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:
diff --git a/metadata/org.xcsoar.yml b/metadata/org.xcsoar.yml
index 84252ff1d3..826a04090d 100644
--- a/metadata/org.xcsoar.yml
+++ b/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: