misc fixes

2026-05-05 05:36:52 +00:00 · 2022-03-02 01:32:29 +08:00 · 2022-03-02 01:32:29 +08:00 · adc047d930
commit adc047d930
parent 45a4eb77bd
9 changed files with 89 additions and 10 deletions
--- a/metadata/app.zeusln.zeus.yml
+++ b/metadata/app.zeusln.zeus.yml
@ -304,7 +304,78 @@ Builds:
      - rm -rf sifir-rs-sdk
    ndk: r21e

-AutoUpdateMode: None
+  - versionName: 0.6.0
+    versionCode: 35
+    disable: https://github.com/ZeusLN/zeus/issues/872
+    commit: v0.6.0
+    subdir: android/app
+    sudo:
+      - sysctl fs.inotify.max_user_watches=524288
+      - apt-get update || apt-get update
+      - apt-get install -y g++
+      - apt-get install -y -t stretch-backports npm
+    gradle:
+      - yes
+    output: build/outputs/apk/release/app-universal-release-unsigned.apk
+    srclibs:
+      - rustup@1.24.3
+      - sifir-rs-sdk@ef6de5f0d37528ce74addbd3dc2178998d7dec00
+    prebuild:
+      - sed -i -e "/swiperefreshlayout/a implementation(project(':react-native-camera'))
+        { exclude group\x3a 'com.google.firebase'\\ exclude group\x3a 'com.google.android.gms'\\
+        }" build.gradle
+      - echo -e '\n' 'org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError
+        -Dfile.encoding=UTF-8' >> ../gradle.properties
+      - cd ../..
+      - npm install
+      - npm run postinstall
+      - cp -r $$sifir-rs-sdk$$ .
+    scanignore:
+      - android/build.gradle
+      - android/app/build.gradle
+      - node_modules/jsc-android
+      - node_modules/v8-android
+      - node_modules/react-native/android
+      - node_modules/react-native-v8/dist/com/facebook/react/react-native
+      - node_modules/react-native/template/android/build.gradle
+      - node_modules/react-native-camera/android/build.gradle
+      - node_modules/react-native-hce/android/build.gradle
+      - node_modules/react-native-gesture-handler/android/lib/build.gradle
+      - node_modules/react-native-nfc-manager/android/build.gradle
+      - node_modules/react-native-reanimated/android/build.gradle
+      - node_modules/react-native-safe-area-context/android/build.gradle
+      - node_modules/react-native-screens/android/build.gradle
+      - node_modules/react-native-secure-key-store/example/android/build.gradle
+      - node_modules/react-native-svg/android/build.gradle
+      - node_modules/react-native-tor/android/build.gradle
+      - node_modules/react-native-vector-icons/android/build.gradle
+      - node_modules/@react-native-community/async-storage/android/build.gradle
+      - node_modules/@react-native-community/masked-view/android/build.gradle
+    scandelete:
+      - node_modules
+      - sifir-rs-sdk
+    build:
+      - $$rustup$$/rustup-init.sh -y
+      - source $HOME/.cargo/env
+      - rustup default stable
+      - rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android
+        i686-linux-android
+      - cargo install cargo-ndk
+      - export ANDROID_NDK=$$NDK$$
+      - cd ../../sifir-rs-sdk/sifir-android
+      - cargo ndk --platform 30 -t arm64-v8a -t armeabi-v7a -t x86 -t x86_64 -o app/tor/src/main/jniLibs
+        build -p sifir-android --release
+      - cd app
+      - gradle assembleRelease
+      - cd ../../..
+      - mv sifir-rs-sdk/sifir-android/app/tor/build/outputs/aar/tor-release.aar node_modules/react-native-tor/android/libs/sifir_android.aar
+      - rm -rf sifir-rs-sdk
+    ndk: r21e
+
+MaintainerNotes: We build react-native-tor, i.e. sifir-rs-sdk from source. 0.1.8 is
+    used currently.
+
+AutoUpdateMode: Version
 UpdateCheckMode: Tags .*[0-9]$
 CurrentVersion: 0.6.0
 CurrentVersionCode: 35
--- a/metadata/at.techbee.jtx.yml
+++ b/metadata/at.techbee.jtx.yml
@ -55,6 +55,7 @@ Builds:

  - versionName: 1.00.05-rc01.ose
    versionCode: 100050007
+    disable: No matching configuration of project :ical4android was found.
    commit: f5369c5c31ee2df485b96cc389ca38143fa5a0d5
    subdir: app
    sudo:
--- a/metadata/com.github.axet.audiorecorder.yml
+++ b/metadata/com.github.axet.audiorecorder.yml
@ -934,6 +934,7 @@ Builds:
    gradle:
      - yes
    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b

 AutoUpdateMode: Version audiorecorder-%v
 UpdateCheckMode: Tags
--- a/metadata/com.planes.android.yml
+++ b/metadata/com.planes.android.yml
@ -87,6 +87,7 @@ Builds:

  - versionName: 0.3.16
    versionCode: 22
+    disable: https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1083
    commit: 4ceeead1e2e9b0a0b7b5504cd68413f8d3e6c815
    subdir: kotlin/PlanesAndroid/app
    sudo:
--- a/metadata/com.smartpack.busyboxinstaller.yml
+++ b/metadata/com.smartpack.busyboxinstaller.yml
@ -150,19 +150,17 @@ Builds:
    gradle:
      - fdroid
    srclibs:
-      - ndk-box-kitchen@87ca6f75aad8a1f4d12857d994ea15b33b31a8b4
-      - Busybox@1_33_1
-      - SELinux@3.2
-      - pcre@android-mainline-11.0.0_r44
-    scandelete:
-      - app/src/main/assets
+      - ndk-box-kitchen@49136e11272f7a8e61b74d516c1516f779ada60c
+      - Busybox@1_35_0
+      - SELinux@3.3
+      - pcre@android-mainline-12.0.0_r20
    build:
      - pushd $$ndk-box-kitchen$$
      - cp -r $$Busybox$$ busybox
      - cp -r $$SELinux$$ jni/selinux
      - cp -r $$pcre$$ jni/pcre
-      - ./busybox.sh patch
-      - ./busybox.sh generate
+      - ./run.sh patch
+      - ./run.sh generate
      - cd jni
      - sed -i -e 's/x86_64//' Application.mk
      - $$NDK$$/ndk-build NDK_PROJECT_PATH=. NDK_APPLICATION_MK=Application.mk APP_BUILD_SCRIPT=Android.mk
@ -170,7 +168,7 @@ Builds:
      - mv $$ndk-box-kitchen$$/jni/libs/armeabi-v7a/busybox src/main/assets/armv7l
      - mv $$ndk-box-kitchen$$/jni/libs/arm64-v8a/busybox src/main/assets/aarch64
      - mv $$ndk-box-kitchen$$/jni/libs/x86/busybox src/main/assets/i686
-    ndk: r21e
+    ndk: r23

 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
--- a/metadata/de.rmrf.partygames.yml
+++ b/metadata/de.rmrf.partygames.yml
@ -36,6 +36,10 @@ Builds:
    versionCode: 10400
    commit: a182f56c9447024a08deda51c9d89d8f53914389
    subdir: PartyGames
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
    gradle:
      - yes

--- a/metadata/org.openhab.habdroid.beta.yml
+++ b/metadata/org.openhab.habdroid.beta.yml
@ -2484,6 +2484,7 @@ Builds:

  - versionName: 2.20.2-beta
    versionCode: 420
+    disable: https://github.com/openhab/openhab-android/issues/2842
    commit: 9d93b634e7bd87b22f79a6f10893bc98ae2d38fb
    subdir: mobile
    sudo:
--- a/metadata/org.tether.tether.yml
+++ b/metadata/org.tether.tether.yml
@ -328,6 +328,7 @@ Builds:

  - versionName: 0.2.9
    versionCode: 2090
+    disable: https://github.com/syphon-org/syphon/issues/609
    commit: 0572100acc8828653916c56c79be82d48a283e2f
    submodules: true
    output: build/app/outputs/apk/release/app-release.apk
--- a/metadata/wseemann.media.romote.yml
+++ b/metadata/wseemann.media.romote.yml
@ -198,6 +198,7 @@ Builds:

  - versionName: 1.0.24
    versionCode: 24
+    disable: https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1082
    commit: a648a0acff1eddb7594925472a4199ab848a7b65
    subdir: app
    submodules: true