misc fixes

2026-05-18 19:59:12 +00:00 · 2022-10-15 20:39:52 +08:00 · 2022-10-15 20:39:52 +08:00 · 98a7f02aaa
commit 98a7f02aaa
parent 2d2f834b32
20 changed files with 26 additions and 128 deletions
--- a/metadata/app.alextran.immich.yml
+++ b/metadata/app.alextran.immich.yml
@ -635,10 +635,6 @@ Builds:
    versionCode: 50
    commit: c271f0c224c250cc3afa3bf2b2656322079757fa
    subdir: mobile
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
    output: build/app/outputs/flutter-apk/app-release.apk
    srclibs:
      - flutter@3.3.0
--- a/metadata/at.techbee.jtx.yml
+++ b/metadata/at.techbee.jtx.yml
@ -261,24 +261,6 @@ Builds:
      - ose
    prebuild: sed -i -e '/developer.huawei.com/d' ../build.gradle

-  - versionName: 2.00.00-rc09.ose
-    versionCode: 200000026
-    commit: 28c26049d6aff8e9f655e82768ab34839f66f289
-    subdir: app
-    submodules: true
-    gradle:
-      - ose
-    prebuild: sed -i -e '/developer.huawei.com/d' ../build.gradle
-
-  - versionName: 2.00.01-rc05.ose
-    versionCode: 200010005
-    commit: 177d8d1d4f800d873c8256b1aacd9aff9efd1399
-    subdir: app
-    submodules: true
-    gradle:
-      - ose
-    prebuild: sed -i -e '/developer.huawei.com/d' ../build.gradle
-
  - versionName: 2.00.02-rc01.ose
    versionCode: 200020001
    commit: 12d8f4e8718502ba8bcd0f49343a2fd7e4b3b491
@ -286,7 +268,9 @@ Builds:
    submodules: true
    gradle:
      - ose
-    prebuild: sed -i -e '/developer.huawei.com/d' ../build.gradle
+    prebuild:
+      - sed -i -e '/developer.huawei.com/d' ../build.gradle
+      - sed -i -e 's|/app||' build.gradle

 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v[0-9.]*$
--- a/metadata/cc.narumi.chaldea.fdroid.yml
+++ b/metadata/cc.narumi.chaldea.fdroid.yml
@ -254,10 +254,6 @@ Builds:
  - versionName: 2.1.2
    versionCode: 915
    commit: 30445ff9cecd9bef4ad26b3a3e98a0ee645012d2
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
    output: build/app/outputs/flutter-apk/app-fdroid-release.apk
    srclibs:
      - flutter@3.3.2
@ -268,8 +264,7 @@ Builds:
      - test
      - web
      - windows
-    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
-        'cmake;3.10.2.4988404'
+    prebuild: sdkmanager 'cmake;3.10.2.4988404'
    build:
      - $$flutter$$/bin/flutter config --no-analytics
      - $$flutter$$/bin/flutter build apk --flavor fdroid
--- a/metadata/com.alaory.wallmewallpaper.yml
+++ b/metadata/com.alaory.wallmewallpaper.yml
@ -194,10 +194,6 @@ Builds:
    versionCode: 19
    commit: f12c02c5ab2cb36f26522e02db1653d32c46cf7e
    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
    gradle:
      - yes

--- a/metadata/com.amrdeveloper.linkhub.yml
+++ b/metadata/com.amrdeveloper.linkhub.yml
@ -39,10 +39,6 @@ Builds:
    versionCode: 15
    commit: c086fb67f46ce621d22c64fb00e8f92dacadd14b
    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
    gradle:
      - yes

--- a/metadata/com.greenaddress.greenbits_android_wallet.yml
+++ b/metadata/com.greenaddress.greenbits_android_wallet.yml
@ -2230,6 +2230,7 @@ Builds:

  - versionName: 3.8.7
    versionCode: 22000387
+    disable: com.google.android.play:review-ktx
    commit: 88c15767d8dbf8de4f5e30a36670d940847b68a5
    timeout: 25200
    subdir: green
@ -2263,16 +2264,18 @@ Builds:

  - versionName: 3.8.9
    versionCode: 22000389
+    disable: https://github.com/Blockstream/green_android/issues/155
    commit: c8239d1de8b6982590daf5d7222f0f8bc991e185
    timeout: 25200
    subdir: green
    sudo:
      - apt-get update
-      - apt-get install -y build-essential clang jq libffi-dev virtualenv
+      - apt-get install -y make clang jq libffi-dev virtualenv swig autoconf automake
+        libtool
    gradle:
      - production
    srclibs:
-      - rustup@1.24.3
+      - rustup@1.25.1
    prebuild: sed -i -e '/signingConfigs/,/^            }/d' build.gradle
    build:
      - $$rustup$$/rustup-init.sh -y
--- a/metadata/com.junkfood.seal.yml
+++ b/metadata/com.junkfood.seal.yml
@ -233,6 +233,7 @@ Builds:

  - versionName: 1.3.5-(F-Droid)
    versionCode: 10350
+    disable: https://github.com/JunkFood02/Seal/issues/278
    commit: 8bface2a73812a3680bc64e0fdbb69d0a8db6ffd
    subdir: app
    gradle:
--- a/metadata/com.shabinder.spotiflyer.yml
+++ b/metadata/com.shabinder.spotiflyer.yml
@ -259,6 +259,8 @@ Builds:
      - infra
      - art
      - spotiflyer-ios
+    prebuild: sed -i -e '/googleapis/d' -e '/jetbrains.space/d' ../build.gradle.kts
+        ../buildSrc/build.gradle.kts
    build:
      - export ANDROID_SDK_HOME=$$SDK$$
      - export ANDROID_NDK_HOME=$$NDK$$
--- a/metadata/com.simplemobiletools.clock.yml
+++ b/metadata/com.simplemobiletools.clock.yml
@ -268,10 +268,6 @@ Builds:
    versionCode: 34
    commit: 74417125d5f92864f354c35b449f0b313dd0d7b8
    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
    gradle:
      - fdroid
    prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
--- a/metadata/com.simplemobiletools.draw.pro.yml
+++ b/metadata/com.simplemobiletools.draw.pro.yml
@ -229,14 +229,6 @@ Builds:
      - fdroid
    prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle

-  - versionName: 6.8.1
-    versionCode: 74
-    commit: e4264e1df4687a0f83cc5f1bf956500b72b98b5e
-    subdir: app
-    gradle:
-      - fdroid
-    prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
-
  - versionName: 6.8.2
    versionCode: 75
    commit: a617dd550c7484e66cd3077941ea42e90fc5adcf
@ -245,7 +237,7 @@ Builds:
      - fdroid
    prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle

-AutoUpdateMode: Version %v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 6.8.2
 CurrentVersionCode: 75
--- a/metadata/com.simplemobiletools.gallery.pro.yml
+++ b/metadata/com.simplemobiletools.gallery.pro.yml
@ -1080,10 +1080,6 @@ Builds:
    versionCode: 378
    commit: b9dea17ea2c5e6451857ffe49f4cd6849d084ccf
    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
    patch:
      - build.patch
    gradle:
--- a/metadata/com.simplemobiletools.launcher.yml
+++ b/metadata/com.simplemobiletools.launcher.yml
@ -45,10 +45,6 @@ Builds:
    versionCode: 5
    commit: cb9093e78ff8a783daa03b7a768f15e0aac7b1c8
    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
    gradle:
      - fdroid
    prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
--- a/metadata/com.tailscale.ipn.yml
+++ b/metadata/com.tailscale.ipn.yml
@ -1024,52 +1024,18 @@ Builds:
      - make -C .. release_aar
    ndk: r23b

-  - versionName: 1.31.167-t6d76764f3-g5ed3921ad62
-    versionCode: 128
-    commit: f27f4567f0fd70f6207a41c59729f642537b93c7
-    subdir: android
-    sudo:
-      - apt-get update
-      - apt-get install -y golang-go
-    gradle:
-      - fdroid
-    prebuild: sdkmanager 'platforms;android-31' 'build-tools;31.0.0'
-    build:
-      - export ANDROID_SDK_ROOT=$$SDK$$
-      - export ANDROID_NDK_ROOT=$$NDK$$
-      - make -C .. release_aar
-    ndk: r23b
-
-  - versionName: 1.32.0-tfc688fe02-g13fc35a8bd5
-    versionCode: 130
-    commit: 547b29e9795d16d961246f93eb259fa1e5e0bcd9
-    subdir: android
-    sudo:
-      - apt-get update
-      - apt-get install -y golang-go
-    gradle:
-      - fdroid
-    prebuild: sdkmanager 'platforms;android-31' 'build-tools;31.0.0'
-    build:
-      - export ANDROID_SDK_ROOT=$$SDK$$
-      - export ANDROID_NDK_ROOT=$$NDK$$
-      - make -C .. release_aar
-    ndk: r23b
-
  - versionName: 1.33.20-t899b4cae1-g185cc3dd8f9
    versionCode: 132
    commit: f7c662ca4af22c27530e4eb86b4389b73f733fa7
    subdir: android
    sudo:
      - apt-get update
-      - apt-get install -y golang-go
+      - apt-get install -y -t bullseye-backports golang-go
+      - apt-get install -y make
    gradle:
      - fdroid
    prebuild: sdkmanager 'platforms;android-31' 'build-tools;31.0.0'
-    build:
-      - export ANDROID_SDK_ROOT=$$SDK$$
-      - export ANDROID_NDK_ROOT=$$NDK$$
-      - make -C .. release_aar
+    build: ANDROID_NDK_ROOT=$$NDK$$ make -C .. release_aar
    ndk: r23b

 AutoUpdateMode: Version
--- a/metadata/com.zell_mbc.medilog.yml
+++ b/metadata/com.zell_mbc.medilog.yml
@ -393,14 +393,10 @@ Builds:
    versionCode: 5418
    commit: 099520f48951c99d4676a63b1936f392ca72ed44
    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
    gradle:
      - yes

-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 2.5.3
 CurrentVersionCode: 5418
--- a/metadata/de.blau.android.yml
+++ b/metadata/de.blau.android.yml
@ -1351,14 +1351,10 @@ Builds:
  - versionName: 18.0.3.0
    versionCode: 2204
    commit: df16f19652d92927e83ff0ec0765ceac1e35dd39
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
    gradle:
      - current
-    rm:
-      - src/androidTest/resources/bicycle_parking.zip
+    scandelete:
+      - src/androidTest/resources

 MaintainerNotes: synonyms.so is a translation file for Somali.

--- a/metadata/de.wger.flutter.yml
+++ b/metadata/de.wger.flutter.yml
@ -58,33 +58,20 @@ Builds:
      - $$flutter$$/bin/flutter packages pub get
      - $$flutter$$/bin/flutter build apk

-  - versionName: 1.4.2
-    versionCode: 26
-    disable: https://github.com/wger-project/flutter/issues/152
-    commit: 2cacc229182ae28f964f1f645228361f455dd721
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@2.10.4
-    prebuild: $$SDK$$/tools/bin/sdkmanager "build-tools;30.0.3" "build-tools;31.0.0"
-        "platforms;android-31" > /dev/null
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter packages pub get
-      - $$flutter$$/bin/flutter build apk
-
  - versionName: 1.5.0
    versionCode: 27
+    disable: https://github.com/wger-project/flutter/issues/152
    commit: 280143362552fa3af2a612edf326ebac1697285b
    output: build/app/outputs/flutter-apk/app-release.apk
    srclibs:
-      - flutter@2.10.4
+      - flutter@3.3.4
    prebuild: sdkmanager "build-tools;30.0.3" "build-tools;31.0.0" "platforms;android-31"
    build:
      - $$flutter$$/bin/flutter config --no-analytics
      - $$flutter$$/bin/flutter packages pub get
      - $$flutter$$/bin/flutter build apk

-AutoUpdateMode: Version
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
 CurrentVersion: 1.5.0
--- a/metadata/fr.ubordeaux.math.paridroid.yml
+++ b/metadata/fr.ubordeaux.math.paridroid.yml
@ -261,7 +261,7 @@ Builds:
    subdir: PariDroid/app
    sudo:
      - apt-get update
-      - apt-get install -y make
+      - apt-get install -y make autoconf automake libtool bison
    gradle:
      - yes
    srclibs:
--- a/metadata/im.vector.app.yml
+++ b/metadata/im.vector.app.yml
@ -1052,7 +1052,7 @@ Builds:
    subdir: vector-app
    sudo:
      - apt-get update
-      - apt-get install -y jq libopus0 make g++ cmake
+      - apt-get install -y jq libopus0 make g++ cmake maven
      - curl -Lo node.tar.gz https://nodejs.org/dist/v16.17.1/node-v16.17.1-linux-x64.tar.gz
      - echo "da5658693243b3ecf6a4cba6751a71df1eb9e9703ca93b42a9404aed85f58ad0 node.tar.gz"
        | sha256sum -c -
--- a/metadata/org.blokada.fem.fdroid.yml
+++ b/metadata/org.blokada.fem.fdroid.yml
@ -510,7 +510,7 @@ Builds:
    submodules: true
    sudo:
      - apt-get update
-      - apt-get install -y gcc
+      - apt-get install -y gcc-multilib
    gradle:
      - five
    srclibs:
--- a/metadata/se.manyver.yml
+++ b/metadata/se.manyver.yml
@ -2817,7 +2817,7 @@ Builds:
    subdir: android/app
    sudo:
      - apt-get update
-      - apt-get install -y g++ g++-multilib make npm python2 python-is-python2
+      - apt-get install -y g++ g++-multilib make libtool npm python2 python-is-python2
      - sysctl fs.inotify.max_user_watches=524288
      - npm install -g react-native-cli
    init: npm install --no-optional