Merge branch 'miscfixes436' into 'master'

Misc Fixes, update Fairemail, i2p

See merge request fdroid/fdroiddata!8563

metadata/com.madlonkay.orgro.yml

@@ -54,6 +54,7 @@ Builds:
 
   - versionName: 1.15.0
     versionCode: 40
+    disable: fails to build
     commit: v1.15.0+40
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:

metadata/eu.faircode.email.yml

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

metadata/eu.siacs.conversations.yml

@@ -1972,11 +1972,21 @@ Builds:
         '/splits/,+5d' -e '/Variants.all/,+8d' build.gradle
     ndk: r21d
 
+  - versionName: 2.9.8+fcr
+    versionCode: 42006
+    commit: 2.9.8
+    gradle:
+      - conversationsFreeCompat
+    prebuild: sed -i -e '/MissingTranslation/aabortOnError\ false' -e '/libwebrtc/d'
+        -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.32006'" -e
+        '/splits/,+5d' -e '/Variants.all/,+8d' build.gradle
+    ndk: r21d
+
 MaintainerNotes: |-
     For 2.8.0 we replace the webrtc.aar with the latest M79 from maven, but
     that won't be updated anymore so we'll need to start building locally in the future.
 
 AutoUpdateMode: Version ++fcr %v
 UpdateCheckMode: Tags
-CurrentVersion: 2.9.7
-CurrentVersionCode: 42000
+CurrentVersion: 2.9.8
+CurrentVersionCode: 42006

metadata/im.quicksy.client.yml

@@ -470,7 +470,17 @@ Builds:
         '/splits/,+5d' -e '/Variants.all/,+8d' build.gradle
     ndk: r21d
 
+  - versionName: 2.9.8+fcr
+    versionCode: 42006
+    commit: 2.9.8
+    gradle:
+      - quicksyFreeCompat
+    prebuild: sed -i -e '/MissingTranslation/aabortOnError\ false' -e '/libwebrtc/d'
+        -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.32006'" -e
+        '/splits/,+5d' -e '/Variants.all/,+8d' build.gradle
+    ndk: r21d
+
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 2.9.7+fcr
-CurrentVersionCode: 42000
+CurrentVersion: 2.9.8+fcr
+CurrentVersionCode: 42006

metadata/net.i2p.android.router.yml

@@ -603,6 +603,24 @@ Builds:
     scandelete:
       - lib/client/src/main/jniLibs
 
+  - versionName: 0.9.49
+    versionCode: 4745260
+    commit: android-0.9.49
+    subdir: app
+    gradle:
+      - legacy
+    srclibs:
+      - I2P@i2p-0.9.49
+    rm:
+      - gradle/wrapper
+    prebuild:
+      - echo -e "i2psrc=../$$I2P$$" >> ../lib/client/local.properties
+      - echo -e "sdk.dir=$$SDK$$\nndk.dir=$$NDK$$\ni2psrc=$$I2P$$" >> ../routerjars/local.properties
+      - sed -i -e '/^props\ =/,+22d' -e 's!../i2p.i2p!$$I2P$$!g' build.gradle
+      - curl https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz | tar xJv -C $$I2P$$/core/c/jbigi/
+    scandelete:
+      - lib/client/src/main/jniLibs
+
 MaintainerNotes: |-
     --Always update net.i2p.android aswell!--
     Don't do so until reproducible.
@@ -611,5 +629,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 0.9.47
-CurrentVersionCode: 4745257
+CurrentVersion: 0.9.49
+CurrentVersionCode: 4745260

metadata/org.tasks.yml

@@ -1952,6 +1952,7 @@ Builds:
 
   - versionName: '11.7'
     versionCode: 110701
+    disable: needs Java 11
     commit: '11.7'
     subdir: app
     submodules: true