misc fixes

metadata/com.greenaddress.greenbits_android_wallet.yml

@@ -2002,9 +2002,17 @@ Builds:
     sudo:
       - apt-get update || apt-get update
       - apt-get install -y build-essential clang virtualenv
+      - pushd build/srclib/cpython
+      - ./configure
+      - make -j`nproc`
+      - make altinstall
+      - popd
     gradle:
       - production
     output: green/build/outputs/apk/production/release/*.apk
+    srclibs:
+      - cpython@v3.9.6
+    prebuild: sed -i -e 's/-p python3/-p python3.9/' crypto/prepare_gdk_clang.sh
     scanignore:
       - bitcoinj/core/src/main/resources/org/bitcoinj/crypto/cacerts
       - bitcoinj/core/src/test
@@ -2013,7 +2021,8 @@ Builds:
       - app/src/main/assets/btctestnet/checkpoints
     build:
       - cd crypto
-      - JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") ./prepare_gdk_clang.sh
+      - JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") PATH=$HOME/.local/bin:$PATH
+        ./prepare_gdk_clang.sh
     ndk: r19c
 
 MaintainerNotes: |-

metadata/com.nextcloud.talk2.yml

@@ -521,16 +521,6 @@ Builds:
       - app/gplay.gradle
     prebuild: sed -i -e '/work-firebase/d' build.gradle
 
-  - versionName: 12.1.0
-    versionCode: 120010090
-    commit: ba63f0b94b8131883d68b6bff88a4832fff96e30
-    subdir: app
-    gradle:
-      - generic
-    rm:
-      - app/gplay.gradle
-    prebuild: sed -i -e '/work-firebase/d' build.gradle
-
   - versionName: 12.1.1
     versionCode: 120010190
     commit: c7e48cb01c4626d3f3939d3d04e4edaa5fc27643

metadata/com.zell_mbc.medilog.yml

@@ -208,16 +208,9 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 2.3.0
-    versionCode: 5344
-    disable: https://gitlab.com/toz12/medilog/-/issues/177
-    commit: 595d48fca9c269a53528b23213e66c7c6a0e4178
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: 2.3.1
     versionCode: 5345
+    disable: https://gitlab.com/toz12/medilog/-/issues/177
     commit: 4f7e7e72d60b403d8880cfd97a24c372cc747919
     subdir: app
     gradle:

metadata/de.blinkt.openvpn.yml

@@ -459,7 +459,7 @@ Builds:
 
   - versionName: 0.7.23
     versionCode: 177
-    commit: abc243c7b8b181c8975ee9ccd6606063493bde41
+    commit: 9048473a350170d120287a76dadd3c8ee04d8483
     subdir: main
     submodules: true
     gradle:

metadata/de.tutao.tutanota.yml

@@ -1185,55 +1185,9 @@ Builds:
     scandelete:
       - node_modules/**
 
-  - versionName: 3.84.1
-    versionCode: 384010
-    disable: https://github.com/tutao/tutanota/issues/3154
-    commit: tutanota-android-release-3.84.1
-    subdir: app-android/app
-    sudo:
-      - curl -Lo node.tar.xz https://nodejs.org/dist/v14.16.0/node-v14.16.0-linux-x64.tar.xz
-      - echo "2e079cf638766fedd720d30ec8ffef5d6ceada4e8b441fc2a093cb9a865f4087 node.tar.xz"
-        | sha256sum -c -
-      - tar xJf node.tar.xz
-      - cp -a node-v14.16.0-linux-x64/. /usr/local/
-    gradle:
-      - yes
-    rm:
-      - app-ios
-    prebuild:
-      - cd ../..
-      - node fdroid-fix-deps
-      - npm install
-      - node dist prod
-    scandelete:
-      - node_modules/**
-
-  - versionName: 3.84.8
-    versionCode: 384080
-    disable: https://github.com/tutao/tutanota/issues/3154
-    commit: 89ac84231b2d472a569102038121e01621a8d0fa
-    subdir: app-android/app
-    sudo:
-      - curl -Lo node.tar.xz https://nodejs.org/download/release/v14.17.2/node-v14.17.2-linux-x64.tar.xz
-      - echo "6cf9db7349407c177b36205feec949729d0ee9db485e19b10b0b1ffca65a3a46 node.tar.xz"
-        | sha256sum -c -
-      - tar xJf node.tar.xz
-      - cp -a node-v14.17.2-linux-x64/. /usr/local/
-      - npm install -g npm@latest
-    gradle:
-      - yes
-    rm:
-      - app-ios
-    prebuild:
-      - cd ../..
-      - node fdroid-fix-deps
-      - npm install
-      - node dist prod
-    scandelete:
-      - node_modules/**
-
   - versionName: 3.84.11
     versionCode: 384110
+    disable: https://github.com/tutao/tutanota/issues/3154
     commit: 997a3c16886dd94b0db33a982238225539af2f96
     subdir: app-android/app
     sudo:

metadata/org.atalk.android.yml

@@ -1445,26 +1445,18 @@ Builds:
     prebuild:
       - $$SDK$$/tools/bin/sdkmanager 'ndk;18.1.5063045' > /dev/null
       - sed -i -e 's|dl.bintray.com/google/exoplayer/|jitpack.io|' build.gradle
-      - sed -i -e '/export ANDROID_NDK_HOME/d' jni/static_library_built/openssl/_settings.sh
+      - cd jni/static_library_built
+      - sed -i -e '/export ANDROID_NDK_HOME/d' openssl/_settings.sh
+      - sed -i -e 's|android/android-ndk-r18b|android-sdk/ndk/18.1.5063045|' ffmpeg-x264/_settings.sh
+        libvpx/_settings.sh
     scanignore:
       - aTalk/build.gradle
     scandelete:
       - aTalk/jni/static_library_built
       - aTalk/third_party/m2
     build:
-      - pushd jni/static_library_built/openssl/
-      - ./init_libopenssl.sh
-      - ./build-openssl4android.sh
-      - popd
-      - export ANDROID_NDK=/opt/android-sdk/ndk/18.1.5063045
-      - pushd jni/static_library_built/ffmpeg-x264/
-      - ./init_update_libs.sh
-      - ./build-ffmpeg4android.sh
-      - popd
-      - pushd jni/static_library_built/libvpx/
-      - ./init_libvpx.sh
-      - ./build-libvpx4android.sh
-      - popd
+      - cd jni/static_library_built
+      - ./build-jnilibs4atalk.sh
     ndk: r20
 
 MaintainerNotes: scanignore is used to allow the local "third_party/m2" Gradle repository