From 79b81e09ff293c02233a6b1a1cdef33457968b82 Mon Sep 17 00:00:00 2001
From: linsui <linsui@inbox.lv>
Date: Sat, 3 Jul 2021 20:58:51 +0800
Subject: [PATCH] misc fixes

---
 metadata/com.agateau.tinywheels.android.yml |  4 +---
 metadata/com.calcitem.sanmill.yml           |  7 ++++---
 metadata/com.mishiranu.dashchan.yml         |  1 +
 metadata/dev.lucanlm.antimine.yml           | 15 +--------------
 metadata/info.dvkr.screenstream.yml         |  1 +
 5 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/metadata/com.agateau.tinywheels.android.yml b/metadata/com.agateau.tinywheels.android.yml
index 9cdb057510..c2616c2649 100644
--- a/metadata/com.agateau.tinywheels.android.yml
+++ b/metadata/com.agateau.tinywheels.android.yml
@@ -247,9 +247,7 @@ Builds:
       - apt-get install -y imagemagick-6.q16
     gradle:
       - itchio
-    prebuild:
-      - sed -i -e 's#./gradlew#gradle#' ../Makefile
-      - git cherry-pick --no-commit 4a56032cc4e823ba8d3fd35d5b1941951537b208
+    prebuild: sed -i -e 's#./gradlew#gradle#' ../Makefile
     scandelete:
       - android/libs/
     build:
diff --git a/metadata/com.calcitem.sanmill.yml b/metadata/com.calcitem.sanmill.yml
index 910b766ec5..790c074828 100644
--- a/metadata/com.calcitem.sanmill.yml
+++ b/metadata/com.calcitem.sanmill.yml
@@ -708,7 +708,7 @@ Builds:
     commit: c8ac37c0c05ad9985572fee7206d8aa76501ada0
     output: src/ui/flutter_app/build/app/outputs/flutter-apk/app-fdroid-release.apk
     srclibs:
-      - flutter@2.2.2
+      - flutter@2.2.3
     rm:
       - ci
       - src/perfect
@@ -720,8 +720,9 @@ Builds:
       - resources
       - tests
     prebuild:
-      - rm src/ui/flutter_app/android/app/build.gradle
-      - mv src/ui/flutter_app/android/app/build.gradle_fdroid src/ui/flutter_app/android/app/build.gradle
+      - cd src/ui/flutter_app/android/app
+      - rm build.gradle
+      - mv build.gradle_fdroid build.gradle
     build:
       - export PATH=$$flutter$$/bin:$PATH
       - ./flutter-init.sh
diff --git a/metadata/com.mishiranu.dashchan.yml b/metadata/com.mishiranu.dashchan.yml
index 78fe1c4b7b..26f7131eaa 100644
--- a/metadata/com.mishiranu.dashchan.yml
+++ b/metadata/com.mishiranu.dashchan.yml
@@ -31,6 +31,7 @@ Builds:
 
   - versionName: 3.1.4
     versionCode: 1043
+    disable: https://github.com/Mishiranu/Dashchan/issues/298
     commit: 9cb7bc3b4fdec3aa06fbc6dd9496efcfbe6ad03e
     gradle:
       - yes
diff --git a/metadata/dev.lucanlm.antimine.yml b/metadata/dev.lucanlm.antimine.yml
index 2be43873ee..3e277b4e6a 100644
--- a/metadata/dev.lucanlm.antimine.yml
+++ b/metadata/dev.lucanlm.antimine.yml
@@ -587,22 +587,9 @@ Builds:
       - sed -i -e "/':proprietary'/d" build.gradle
     ndk: r21
 
-  - versionName: 12.4.0
-    versionCode: 1204001
-    commit: a1794ed73026c27188cfe559c98ac03ab46a0dc3
-    subdir: app
-    gradle:
-      - foss
-    rm:
-      - proprietary
-      - wear
-    prebuild:
-      - sed -i -e "s/':proprietary', //; s/':wear', //" ../settings.gradle
-      - sed -i -e "/':proprietary'/d" build.gradle
-    ndk: r21
-
   - versionName: 12.4.1
     versionCode: 1204011
+    disable: https://github.com/lucasnlm/antimine-android/issues/298
     commit: 1228791fd3a28cac09f04893af0a4176d89bc698
     subdir: app
     gradle:
diff --git a/metadata/info.dvkr.screenstream.yml b/metadata/info.dvkr.screenstream.yml
index 358ab0114e..38f12066ba 100644
--- a/metadata/info.dvkr.screenstream.yml
+++ b/metadata/info.dvkr.screenstream.yml
@@ -632,6 +632,7 @@ Builds:
 
   - versionName: 3.7.1
     versionCode: 30701
+    disable: https://github.com/dkrivoruchko/ScreenStream/issues/177
     commit: c2912d120a8b88d391fb815394beb2d180115db8
     subdir: app
     gradle: