Merge branch 'miscfixes402' into 'master'

Misc fixes

See merge request fdroid/fdroiddata!7839

metadata/org.bandev.buddhaquotes.yml

@@ -54,6 +54,7 @@ Builds:
     subdir: app
     gradle:
       - yes
+    prebuild: sed -i -e 's/6.8-rc-1/6.7/' ../gradle/wrapper/gradle-wrapper.properties
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags

metadata/org.blokada.fem.fdroid.yml

@@ -30,6 +30,7 @@ Builds:
       - unzip -P default_blocklist src/main/assets/default_blocklist.zip default_blocklist
         -d src/main/assets
       - rm src/main/assets/default_blocklist.zip
+      - sed -i -e 's/6.6-rc-6/6.6/' ../gradle/wrapper/gradle-wrapper.properties
     build:
       - $$rustup$$/rustup-init.sh -y
       - source $HOME/.cargo/env

metadata/org.courville.nova.yml

@@ -337,6 +337,7 @@ Builds:
 
   - versionName: 4.49.12
     versionCode: 404912
+    disable: fails to build
     commit: v4.49.12_c404912
     subdir: Video
     submodules: true

metadata/se.manyver.yml

@@ -1499,57 +1499,9 @@ Builds:
       - npm run build-android-assets
     ndk: r21d
 
-  - versionName: 0.2011.5-beta-fdroid-fdroid
-    versionCode: 93
-    disable: fails to build
-    commit: v0.2011.5-beta-fdroid
-    timeout: 30000
-    subdir: android/app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y --no-install-recommends g++ lib32stdc++-6-dev libc6-dev-i386
-        ninja-build linux-libc-dev linux-libc-dev:i386
-      - curl -Lo node.tar.xz https://nodejs.org/dist/v12.16.3/node-v12.16.3-linux-x64.tar.xz
-      - echo "1956e196e3c3c8ef5f0c45db76d7c1245af4ccdda2b7ab30a57ce91d6e165caa node.tar.xz"
-        | sha256sum -c -
-      - tar xJf node.tar.xz
-      - cp -a node-v12.16.3-linux-x64/. /usr/local/
-      - npm install -g react-native-cli
-    init:
-      - npm install --no-optional
-      - truncate -s 0 ../../node_modules/react-native/node_modules/@react-native-community/cli/build/commands/server/external/xsel
-    patch:
-      - build.patch
-    gradle:
-      - fdroid
-    srclibs:
-      - NodejsMobile@nodejs-mobile-v0.3.1
-    rm:
-      - node_modules/react-native/ReactAndroid/src/main/third-party/java/buck-android-support/buck-android-support.jar
-      - node_modules/react-native/template/
-      - e2e/apple-app-store-demo
-    prebuild: sed -i -e '/lifecycle/d' ../build.gradle
-    scanignore:
-      - android/build.gradle
-      - node_modules/@react-native-community/async-storage/android/build.gradle
-      - node_modules/react-native-localize/android/build.gradle
-      - node_modules/react-native/android
-      - node_modules/jsc-android
-    scandelete:
-      - node_modules
-    build:
-      - pushd $$NodejsMobile$$
-      - ./tools/android_build.sh $$NDK$$ arm
-      - ./tools/android_build.sh $$NDK$$ arm64
-      - popd
-      - mv $$NodejsMobile$$/out_android/armeabi-v7a/libnode.so ../../node_modules/nodejs-mobile-react-native/android/libnode/bin/armeabi-v7a/libnode.so
-      - mv $$NodejsMobile$$/out_android/arm64-v8a/libnode.so ../../node_modules/nodejs-mobile-react-native/android/libnode/bin/arm64-v8a/libnode.so
-      - npm run build-android-assets
-    ndk: r21d
-
-  - versionName: 0.2012.4-beta-fdroid-fdroid
+  - versionName: 0.2012.4-beta-fdroid
     versionCode: 94
-    commit: v0.2012.4-beta-fdroid
+    commit: v0.2012.4-beta
     timeout: 30000
     subdir: android/app
     sudo: