Merge branch 'miscfix33' into 'master'

Misc fixes after cycle

See merge request fdroid/fdroiddata!7036

metadata/com.DartChecker.yml

@@ -84,6 +84,7 @@ Builds:
 
   - versionName: 0.5.3
     versionCode: 12
+    disable: fails to build
     commit: v.0.5.3
     subdir: app
     gradle:

metadata/com.b44t.messenger.yml

@@ -806,44 +806,9 @@ Builds:
       - ./ndk-make.sh
     ndk: r20b
 
-  - versionName: 1.10.3
-    versionCode: 586
-    commit: v1.10.3
-    timeout: 20000
-    submodules: true
-    gradle:
-      - fat
-    srclibs:
-      - rustup@1.21.1
-    prebuild: sed -i -e '/applicationIdSuffix/d' build.gradle
-    build:
-      - cd jni/deltachat-core-rust
-      - ../../$$rustup$$/rustup-init.sh -y
-      - export PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/
-      - source $HOME/.cargo/env
-      - rustup default $(cat rust-toolchain)
-      - rustup target add aarch64-linux-android
-      - echo "[target.aarch64-linux-android]" > $HOME/.cargo/config
-      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang"'
-        >> $HOME/.cargo/config
-      - rustup target add i686-linux-android
-      - echo "[target.i686-linux-android]" >> $HOME/.cargo/config
-      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android18-clang"'
-        >> $HOME/.cargo/config
-      - rustup target add armv7-linux-androideabi
-      - echo "[target.armv7-linux-androideabi]" >> $HOME/.cargo/config
-      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi18-clang"'
-        >> $HOME/.cargo/config
-      - rustup target add x86_64-linux-android
-      - echo "[target.x86_64-linux-android]" >> $HOME/.cargo/config
-      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang"'
-        >> $HOME/.cargo/config
-      - cd ../..
-      - ./ndk-make.sh
-    ndk: r20b
-
   - versionName: 1.10.4
     versionCode: 587
+    disable: fails to build, rust-init.sh missing
     commit: v1.10.4
     timeout: 20000
     submodules: true

metadata/com.dosse.speedtest/fr/summary.txt

@@ -1 +0,0 @@
-Vérifier votre vitesse de connexion Internet

metadata/com.dosse.speedtest/sq/summary.txt

@@ -1 +0,0 @@
-Kontrolloni shpejtësinë tuaj në Internet

metadata/com.flxrs.dankchat.yml

@@ -225,6 +225,7 @@ Builds:
     subdir: app
     gradle:
       - yes
+    ndk: r21d
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags

metadata/com.sduduzog.slimlauncher.yml

@@ -89,6 +89,7 @@ Builds:
     subdir: app
     gradle:
       - yes
+    prebuild: sed -i -e '/play\ {/,+11d' -e '/triplet/d' build.gradle.kts
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags

metadata/de.marmaro.krt.ffupdater.yml

@@ -215,6 +215,7 @@ Builds:
     subdir: ffupdater
     gradle:
       - yes
+    prebuild: sed -i -e 's/6.5-milestone-1/6.5/' gradle/wrapper/gradle-wrapper.properties
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags

metadata/org.adaway.yml

@@ -515,7 +515,7 @@ Builds:
     subdir: app
     gradle:
       - yes
-    ndk: r21
+    ndk: r21d
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags .*[0-9]$

metadata/org.ttrssreader.yml

@@ -567,25 +567,9 @@ Builds:
       - fdroid
     prebuild: sed -i -e '/playCompile/d' build.gradle
 
-  - versionName: 1.95.0
-    versionCode: 1951
-    commit: v1.95.0
-    subdir: ttrssreader
-    gradle:
-      - fdroid
-    prebuild: sed -i -e '/playCompile/d' build.gradle
-
-  - versionName: 1.95.1
-    versionCode: 1952
-    commit: v1.95.1
-    subdir: ttrssreader
-    gradle:
-      - fdroid
-    prebuild: sed -i -e '/playCompile/d' build.gradle
-
   - versionName: 1.95.1
     versionCode: 1953
-    commit: v1.95.1
+    commit: v1.95.1_1953
     subdir: ttrssreader
     gradle:
       - fdroid
@@ -601,7 +585,7 @@ MaintainerNotes: |-
     * Repo Type:hg
     * Repo:https://ttrss-reader-fork.googlecode.com/hg
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version v%v_%c
 UpdateCheckMode: Tags
 CurrentVersion: 1.95.1
 CurrentVersionCode: 1953

metadata/wseemann.media.romote.yml

@@ -121,9 +121,14 @@ Builds:
     submodules: true
     gradle:
       - yes
+    rm:
+      - app/src/main/libs/jaku-1.6.jar
     prebuild:
       - sed -i -e 's/gradle-3\.3/gradle-4.6/' ../gradle/wrapper/gradle-wrapper.properties
       - $$MVN3$$ install -f ../Jaku/pom.xml -Dmaven.test.skip=true
+      - cp ~/.m2/repository/com/wseemann/jaku/1.6/jaku-1.6.jar src/main/libs/
+    scanignore:
+      - app/src/main/libs/jaku-1.6.jar
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags