From a9ae1ff6b0f5423a5969626b6d3c81903e5dce9f Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Mon, 7 Nov 2022 12:51:42 +0800
Subject: [PATCH] misc fixes

---
 metadata/net.taler.wallet.fdroid.yml       | 12 ++++++------
 metadata/net.vonforst.evmap.yml            |  2 --
 metadata/org.hollowbamboo.chordreader2.yml |  1 +
 metadata/org.krita.yml                     |  8 ++++----
 metadata/org.mozilla.fennec_fdroid.yml     |  2 ++
 metadata/se.manyver.yml                    |  1 +
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/metadata/net.taler.wallet.fdroid.yml b/metadata/net.taler.wallet.fdroid.yml
index 1f61731936..67bca599a9 100644
--- a/metadata/net.taler.wallet.fdroid.yml
+++ b/metadata/net.taler.wallet.fdroid.yml
@@ -46,18 +46,18 @@ Builds:
       - multiplatform/wallet
     prebuild: gradle :wallet:verifyWalletLibrary
 
-  - versionName: wallet-v0.9.0
+  - versionName: v0.9.0
     versionCode: 20
     commit: 963fe8f3bee1971d6873d93737e5e6056ca1a6c2
     subdir: wallet
     submodules: true
     gradle:
       - fdroid
-    rm:
-      - multiplatform/wallet
-    prebuild: gradle :wallet:verifyWalletLibrary
+    preassemble:
+      - :wallet:verifyWalletLibrary
 
-AutoUpdateMode: Version wallet-%v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags ^wallet-v?[0-9.]+$
-CurrentVersion: wallet-v0.9.0
+UpdateCheckData: wallet/build.gradle|versionCode (\d+)|.|walletCoreVersion = "(.+)"
+CurrentVersion: v0.9.0
 CurrentVersionCode: 20
diff --git a/metadata/net.vonforst.evmap.yml b/metadata/net.vonforst.evmap.yml
index 29b4cfed64..2551b79319 100644
--- a/metadata/net.vonforst.evmap.yml
+++ b/metadata/net.vonforst.evmap.yml
@@ -242,8 +242,6 @@ Builds:
     gradle:
       - foss
       - normal
-    scanignore:
-      - app/build.gradle
     gradleprops:
       - GOINGELECTRIC_API_KEY=7ef9a064ec4602a853c9201ac35be94b
       - GOOGLE_MAPS_API_KEY=
diff --git a/metadata/org.hollowbamboo.chordreader2.yml b/metadata/org.hollowbamboo.chordreader2.yml
index c0e002d8cb..31323b646e 100644
--- a/metadata/org.hollowbamboo.chordreader2.yml
+++ b/metadata/org.hollowbamboo.chordreader2.yml
@@ -25,6 +25,7 @@ Builds:
 
   - versionName: 2.1.0
     versionCode: 2
+    disable: https://github.com/AndInTheClouds/chordreader2/issues/5
     commit: fed7ea2b6844e921367a2578c60f5b6fb3f7568f
     subdir: app
     gradle:
diff --git a/metadata/org.krita.yml b/metadata/org.krita.yml
index b5657b72f6..636c86ccb4 100644
--- a/metadata/org.krita.yml
+++ b/metadata/org.krita.yml
@@ -610,7 +610,7 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y -t bullseye-backports cmake
-      - apt-get install -y make g++ python-is-python3 gettext subversion
+      - apt-get install -y make g++ python-is-python3 gettext subversion bzip2 xz-utils
       - rm -rf /opt/android-sdk/platforms
       - sdkmanager 'platforms;android-28' 'platforms;android-31'
     output: build/krita_build_apk/build/outputs/apk/release/krita-armeabi-v7a-$$VERSION$$-release-unsigned.apk
@@ -641,7 +641,7 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y -t bullseye-backports cmake
-      - apt-get install -y make g++ python-is-python3 gettext subversion
+      - apt-get install -y make g++ python-is-python3 gettext subversion bzip2 xz-utils
       - rm -rf /opt/android-sdk/platforms
       - sdkmanager 'platforms;android-28' 'platforms;android-31'
     output: build/krita_build_apk/build/outputs/apk/release/krita-arm64-v8a-$$VERSION$$-release-unsigned.apk
@@ -672,7 +672,7 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y -t bullseye-backports cmake
-      - apt-get install -y make g++ python-is-python3 gettext subversion
+      - apt-get install -y make g++ python-is-python3 gettext subversion bzip2 xz-utils
       - rm -rf /opt/android-sdk/platforms
       - sdkmanager 'platforms;android-28' 'platforms;android-31'
     output: build/krita_build_apk/build/outputs/apk/release/krita-x86-$$VERSION$$-release-unsigned.apk
@@ -703,7 +703,7 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y -t bullseye-backports cmake
-      - apt-get install -y make g++ python-is-python3 gettext subversion
+      - apt-get install -y make g++ python-is-python3 gettext subversion bzip2 xz-utils
       - rm -rf /opt/android-sdk/platforms
       - sdkmanager 'platforms;android-28' 'platforms;android-31'
     output: build/krita_build_apk/build/outputs/apk/release/krita-x86_64-$$VERSION$$-release-unsigned.apk
diff --git a/metadata/org.mozilla.fennec_fdroid.yml b/metadata/org.mozilla.fennec_fdroid.yml
index b7c396fc0d..9e7d93bfcd 100644
--- a/metadata/org.mozilla.fennec_fdroid.yml
+++ b/metadata/org.mozilla.fennec_fdroid.yml
@@ -12384,6 +12384,7 @@ Builds:
 
   - versionName: 106.1.0
     versionCode: 1061000
+    disable: build failed
     commit: v106.1.0
     timeout: 18000
     sudo:
@@ -12408,6 +12409,7 @@ Builds:
 
   - versionName: 106.1.0
     versionCode: 1061020
+    disable: build failed
     commit: v106.1.0
     timeout: 18000
     sudo:
diff --git a/metadata/se.manyver.yml b/metadata/se.manyver.yml
index fa8d047245..c93f80f05d 100644
--- a/metadata/se.manyver.yml
+++ b/metadata/se.manyver.yml
@@ -2953,6 +2953,7 @@ Builds:
 
   - versionName: 0.2211.4-beta-fdroid
     versionCode: 139
+    disable: https://gitlab.com/staltz/manyverse/-/issues/2103
     commit: 38d858884231760c377de0bb0b2c513d00eca284
     timeout: 80000
     subdir: android/app