From 6a67c9d9c15957243650ec8c5dc4744f9f2ff7ac Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Sun, 3 Mar 2024 15:58:56 +0800
Subject: [PATCH] misc fixes

---
 metadata/app.mlauncher.yml                    |  4 +++
 metadata/com.calcitem.sanmill.yml             | 12 +++----
 .../openfoodfacts.github.scrachx.openfood.yml | 32 +------------------
 metadata/org.pixeldroid.app.yml               |  1 +
 4 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/metadata/app.mlauncher.yml b/metadata/app.mlauncher.yml
index 0119abd6ae..69d5129acb 100644
--- a/metadata/app.mlauncher.yml
+++ b/metadata/app.mlauncher.yml
@@ -48,6 +48,10 @@ Builds:
     versionCode: 67
     commit: 6b147aadcb9ef2286248f30fd4520bf6342622b7
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.calcitem.sanmill.yml b/metadata/com.calcitem.sanmill.yml
index 1133e9a009..c38eb237df 100644
--- a/metadata/com.calcitem.sanmill.yml
+++ b/metadata/com.calcitem.sanmill.yml
@@ -2708,7 +2708,7 @@ Builds:
       - update-java-alternatives -a
     output: build/app/outputs/flutter-apk/app-fdroid-release.apk
     srclibs:
-      - flutter@3.16.5
+      - flutter@stable
     rm:
       - src/test
       - src/ui/flutter_app/ios
@@ -2719,6 +2719,11 @@ Builds:
       - src/ui/qt
       - tests
     prebuild:
+      - export FLUTTER_VERSION=$(sed -n -E "s/.*flutter-version:\s'(.*)'/\1/p" .github/workflows/flutter.yml
+        | head -n 1)
+      - pushd $$flutter$$
+      - git checkout -f $FLUTTER_VERSION
+      - popd
       - mv android/app/build.gradle_fdroid android/app/build.gradle
       - export PUB_CACHE=$(pwd)/.pub-cache
       - export PATH=$$flutter$$/bin:$PATH
@@ -2731,11 +2736,6 @@ Builds:
       - $$flutter$$/bin/flutter build apk --flavor fdroid --release
     ndk: r25b
 
-MaintainerNotes: |-
-  Builds will fail when the srclib ref of flutter and the version with which
-  upstream has been built with differ.
-  In that case we need to manually give the correct ref to srclib.
-
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v.*$
 UpdateCheckData: src/ui/flutter_app/pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
diff --git a/metadata/openfoodfacts.github.scrachx.openfood.yml b/metadata/openfoodfacts.github.scrachx.openfood.yml
index eeb988735e..4e99e7d869 100644
--- a/metadata/openfoodfacts.github.scrachx.openfood.yml
+++ b/metadata/openfoodfacts.github.scrachx.openfood.yml
@@ -565,37 +565,6 @@ Builds:
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter build apk -t lib/entrypoints/android/main_fdroid.dart
 
-  - versionName: 4.13.0
-    versionCode: 1258
-    disable: https://github.com/openfoodfacts/smooth-app/issues/4900
-    commit: v4.13.0
-    subdir: packages/smooth_app
-    output: build/app/outputs/apk/release/app-release-unsigned.apk
-    srclibs:
-      - flutter@stable
-    rm:
-      - packages/smooth_app/ios
-      - packages/scanner/ml_kit
-    prebuild:
-      - version=$(cat ../../flutter-version.txt)
-      - pushd $$flutter$$
-      - git checkout -f $version
-      - popd
-      - sed -i -e '/ml_kit/d' -e '/apple_/d' -e '/google_play/d' -e 's/version:.*/version:\
-        $$VERSION$$+$$VERCODE$$/' pubspec.yaml
-      - pushd android
-      - grep -rli 'org.openfoodfacts.scanner' * | xargs -i@ sed -i 's/org.openfoodfacts.scanner/openfoodfacts.github.scrachx.openfood/g'
-        @
-      - popd
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter pub upgrade
-    scandelete:
-      - packages/smooth_app/.pub-cache
-    build:
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - $$flutter$$/bin/flutter build apk -t lib/entrypoints/android/main_fdroid.dart
-
   - versionName: 4.14.0
     versionCode: 1280
     commit: v4.14.0
@@ -613,6 +582,7 @@ Builds:
       - popd
       - sed -i -e '/ml_kit/d' -e '/apple_/d' -e '/google_play/d' -e 's/version:.*/version:\
         $$VERSION$$+$$VERCODE$$/' pubspec.yaml
+      - sed -i -e 's|app_flutter/smoothie.db|smoothie.db|' android/app/src/main/res/xml/backup_scheme.xml
       - pushd android
       - grep -rli 'org.openfoodfacts.scanner' * | xargs -i@ sed -i 's/org.openfoodfacts.scanner/openfoodfacts.github.scrachx.openfood/g'
         @
diff --git a/metadata/org.pixeldroid.app.yml b/metadata/org.pixeldroid.app.yml
index d70d8ea0d7..2cd9ee0ff0 100644
--- a/metadata/org.pixeldroid.app.yml
+++ b/metadata/org.pixeldroid.app.yml
@@ -328,6 +328,7 @@ Builds:
     gradle:
       - yes
     prebuild:
+      - sed -i -e 's/enable true/enable false/' build.gradle
       - cd ..
       - sed -i -e 's|git@gitlab.shinice.net:|https://gitlab.shinice.net/|g' .gitmodules
       - git submodule update --init --recursive