From e40c47e9f9c918185c59538d054c27d93dd701ea Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Sun, 4 Feb 2024 12:49:21 +0800
Subject: [PATCH] misc fixes

---
 metadata/fr.onyx.lyon1.yml      | 50 ++-------------------------------
 metadata/org.atalk.android.yml  |  3 ++
 metadata/org.linphone.yml       |  3 ++
 metadata/org.pixeldroid.app.yml |  1 +
 4 files changed, 10 insertions(+), 47 deletions(-)

diff --git a/metadata/fr.onyx.lyon1.yml b/metadata/fr.onyx.lyon1.yml
index 49cdb0f794..20f5a9a43c 100644
--- a/metadata/fr.onyx.lyon1.yml
+++ b/metadata/fr.onyx.lyon1.yml
@@ -59,54 +59,10 @@ Builds:
         --no-tree-shake-icons
     ndk: r25c
 
-  - versionName: 2.0.8
-    versionCode: 2050
-    commit: 0e7e61950dda7e687f5f687c6b28e3badf8c2548
-    subdir: apps/onyx
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-17-jdk-headless
-      - update-java-alternatives -a
-      - apt-get install -y jq python3-pip gcc-multilib libc-dev make
-      - pip3 install yq
-    output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
-    srclibs:
-      - rustup@1.26.0
-    rm:
-      - apps/onyx/ios
-      - apps/onyx/linux
-      - apps/onyx/macos
-      - apps/onyx/web
-      - apps/onyx/windows
-    prebuild:
-      - export JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64/"
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - ../.flutter/bin/flutter config --no-analytics
-      - echo "Adding geolocator_android package override to pubspec.yaml"
-      - yq -i -Y '.dependency_overrides.geolocator_android.git = { url:"https://github.com/onyx-lyon1/flutter-geolocator.git",
-        ref:"floss", path:"geolocator_android"}' pubspec.yaml
-      - ../.flutter/bin/flutter pub get
-      - sdkmanager "ndk;21.1.6352462"
-    scanignore:
-      - apps/onyx/assets/graph.json.gz
-      - apps/.flutter/bin/cache
-    scandelete:
-      - apps/.flutter
-      - apps/onyx/.pub-cache
-    build:
-      - $$rustup$$/rustup-init.sh -y --default-toolchain 1.74.0 --target aarch64-linux-android
-      - source $HOME/.cargo/env
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - bash ./scripts/fdroid_build_isar.sh
-      - ../.flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64"
-        --no-tree-shake-icons
-    ndk: r25c
-
 AutoUpdateMode: Version
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags ^v[\d.]+$
 VercodeOperation:
   - '%c + 2000'
 UpdateCheckData: apps/onyx/pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
-CurrentVersion: 2.0.8
-CurrentVersionCode: 2050
+CurrentVersion: 2.0.7
+CurrentVersionCode: 2048
diff --git a/metadata/org.atalk.android.yml b/metadata/org.atalk.android.yml
index 0c552645c9..0eb447fa0c 100644
--- a/metadata/org.atalk.android.yml
+++ b/metadata/org.atalk.android.yml
@@ -2569,6 +2569,7 @@ Builds:
 
   - versionName: 3.3.4
     versionCode: 303040
+    disable: The certificate of gitlab.linphone.org has expired.
     commit: e53ab97e7d7bdb7555d73c8963574a894a0cdb88
     subdir: aTalk
     sudo:
@@ -2577,6 +2578,8 @@ Builds:
       - cp /opt/android-sdk/build-tools/30.0.3/dx /opt/android-sdk/build-tools/33.0.2/dx
       - apt-get update
       - apt-get install bzip2 file gcc make pkg-config wget
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - fdroid
     rm:
diff --git a/metadata/org.linphone.yml b/metadata/org.linphone.yml
index cd4b90b451..ce3ba7b68f 100644
--- a/metadata/org.linphone.yml
+++ b/metadata/org.linphone.yml
@@ -3966,6 +3966,7 @@ Builds:
 
   - versionName: 5.2.3
     versionCode: 520031
+    disable: https://github.com/BelledonneCommunications/linphone-android/issues/2092
     commit: 113b142c3730a473ccc932f9053028eddc26ac10
     sudo:
       - apt-get update
@@ -4022,6 +4023,7 @@ Builds:
 
   - versionName: 5.2.3
     versionCode: 520032
+    disable: https://github.com/BelledonneCommunications/linphone-android/issues/2092
     commit: 113b142c3730a473ccc932f9053028eddc26ac10
     sudo:
       - apt-get update
@@ -4078,6 +4080,7 @@ Builds:
 
   - versionName: 5.2.3
     versionCode: 520033
+    disable: https://github.com/BelledonneCommunications/linphone-android/issues/2092
     commit: 113b142c3730a473ccc932f9053028eddc26ac10
     sudo:
       - apt-get update
diff --git a/metadata/org.pixeldroid.app.yml b/metadata/org.pixeldroid.app.yml
index a00258740a..31b0a3788b 100644
--- a/metadata/org.pixeldroid.app.yml
+++ b/metadata/org.pixeldroid.app.yml
@@ -274,6 +274,7 @@ Builds:
 
   - versionName: 1.0.beta28
     versionCode: 28
+    disable: https://gitlab.com/fdroid/fdroiddata/-/commit/99c0e37249d1c8ac3e7b6ee874a8fe66203c49db#note_1756894525
     commit: 05cb615f1594124e8689fd59484eb1828ab0d531
     subdir: app
     sudo: