From 384a25b6c43696a5a1cad89525d5b09e261dc956 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Sun, 27 Nov 2022 23:11:35 +0800
Subject: [PATCH] misc fixes

---
 metadata/cc.narumi.chaldea.fdroid.yml         |  2 +-
 .../com.martinmimigames.littlemusicplayer.yml |  1 +
 metadata/eu.faircode.email.yml                | 10 +++++-----
 metadata/io.github.chronosx88.yggdrasil.yml   | 19 +++++++++----------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/metadata/cc.narumi.chaldea.fdroid.yml b/metadata/cc.narumi.chaldea.fdroid.yml
index 5f6ff442da..36471af7ac 100644
--- a/metadata/cc.narumi.chaldea.fdroid.yml
+++ b/metadata/cc.narumi.chaldea.fdroid.yml
@@ -274,7 +274,7 @@ Builds:
     commit: c0975f6db5393879c46b60bb4f9561bde66c3e05
     output: build/app/outputs/flutter-apk/app-fdroid-release.apk
     srclibs:
-      - flutter@3.3.2
+      - flutter@3.6.0-0.1.pre
     rm:
       - ios
       - linux
diff --git a/metadata/com.martinmimigames.littlemusicplayer.yml b/metadata/com.martinmimigames.littlemusicplayer.yml
index 2aa6eb2cfa..994f458bfb 100644
--- a/metadata/com.martinmimigames.littlemusicplayer.yml
+++ b/metadata/com.martinmimigames.littlemusicplayer.yml
@@ -107,6 +107,7 @@ Builds:
 
   - versionName: '2.7'
     versionCode: 9
+    disable: https://github.com/martinmimigames/little-music-player/issues/22
     commit: df4773dd939d6c7591ececc3a52d8a5112284eec
     subdir: app
     submodules: true
diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index f953eb9b83..685e83adee 100644
--- a/metadata/eu.faircode.email.yml
+++ b/metadata/eu.faircode.email.yml
@@ -3,7 +3,7 @@ Categories:
 License: GPL-3.0-only
 AuthorName: Marcel Bokhorst (M66B)
 WebSite: https://email.faircode.eu/
-SourceCode: https://github.com/M66B/FairEmail
+SourceCode: https://github.com/M66B/Fa  irEmail
 IssueTracker: https://forum.xda-developers.com/android/apps-games/source-email-t3824168
 Translation: https://crowdin.com/project/open-source-email
 Changelog: https://github.com/M66B/FairEmail/blob/HEAD/CHANGELOG.md
@@ -5344,9 +5344,9 @@ Builds:
       - app/lib
     ndk: r25
 
-  - versionName: 1.2010b
+  - versionName: '1.2010'
     versionCode: 2010
-    commit: 155ed8d698097543d2a5887c4fffd5246a9e2a84
+    commit: c34a18b20cf5ee42c61984bd197c39cf1cd82c25
     subdir: app
     submodules: true
     gradle:
@@ -5360,6 +5360,6 @@ Builds:
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
-UpdateCheckData: app/build.gradle|getVersionCode.*return (\d+)||
-CurrentVersion: 1.2010b
+UpdateCheckData: app/build.gradle|getVersionCode.*return (\d+)||([\d.]+)
+CurrentVersion: '1.2010'
 CurrentVersionCode: 2010
diff --git a/metadata/io.github.chronosx88.yggdrasil.yml b/metadata/io.github.chronosx88.yggdrasil.yml
index dcde3d6685..3cce9bc91a 100644
--- a/metadata/io.github.chronosx88.yggdrasil.yml
+++ b/metadata/io.github.chronosx88.yggdrasil.yml
@@ -163,30 +163,29 @@ Builds:
     commit: d6ac6fcca64865b203a281382a9e93670d756d24
     subdir: app
     submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -t bullseye-backports -y golang-go
+      - apt-get install -y make
     gradle:
       - yes
     prebuild:
-      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'platforms;android-31'
-        'build-tools;31.0.0' > /dev/null
+      - sdkmanager 'platforms;android-31' 'build-tools;31.0.0'
       - mv ../acra.properties.sample ../acra.properties
-      - sed -i -e '/signingConfig\ signing/d' -e '/ndkVersion/d' build.gradle
+      - sed -i -e '/signingConfig signing/d' build.gradle
     build:
       - export ANDROID_SDK_ROOT=$$SDK$$
       - export ANDROID_NDK_ROOT=$$NDK$$
-      - curl -Lso go.tar.gz https://go.dev/dl/go1.18.1.linux-amd64.tar.gz
-      - echo "b3b815f47ababac13810fc6021eb73d65478e0b2db4b09d348eefad9581a2334 go.tar.gz"
-        | sha256sum -c -
-      - tar xzf go.tar.gz
       - export GOPATH="$PWD/golang"
-      - export PATH="$GOPATH/bin:$PWD/go/bin:$PATH"
+      - export PATH="$GOPATH/bin:$PATH"
       - cd ../yggdrasil/yggdrasil-go
       - go install golang.org/x/mobile/cmd/gomobile
       - gomobile init
       - cd ..
       - make
-    ndk: r21e
+    ndk: r21c
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 2.1.4
 CurrentVersionCode: 40