Merge branch 'miscfixes20' into 'master'

Misc fixes after cycle

See merge request fdroid/fdroiddata!6588

metadata/com.nextcloudpasswords.yml

@@ -68,6 +68,7 @@ Builds:
 
   - versionName: '1.14'
     versionCode: 15
+    disable: fails to build
     commit: v1.14
     subdir: android/app/
     sudo:
@@ -80,7 +81,7 @@ Builds:
       - node_modules/sqlite3/lib/binding/node-v*-linux-x64/node_sqlite3.node
     prebuild:
       - sed -i -e 's#https://maven.fabric.io/public#https://maven.google.com/#' ../../node_modules/react-native-webview/android/build.gradle
-      - truncate -s 0 ../../node_modules/@react-native-community/cli/build/commands/server/external/xsel
+      - truncate -s 0 ../../node_modules/react-native/node_modules/@react-native-community/cli/build/commands/server/external/xsel
       - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties
     scanignore:
       - android/build.gradle

metadata/com.oF2pks.adbungfu.yml

@@ -64,13 +64,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 3.0-12
-    versionCode: 12
-    commit: v3.0-12
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: 3.0-13
     versionCode: 13
     commit: v3.0-13

metadata/com.termux.yml

@@ -577,6 +577,7 @@ Builds:
     subdir: app
     gradle:
       - yes
+    ndk: r21
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags

metadata/com.unciv.app.yml

@@ -307,9 +307,9 @@ Builds:
       - desktop
     prebuild: sed -i -e '/maven.aliyun.com/d' ../build.gradle
 
-  - versionName: 3.7.0
+  - versionName: 3.6.15
-    versionCode: 405
+    versionCode: 404
-    commit: 3.7.0
+    commit: 3.6.15
     subdir: android
     gradle:
       - yes

metadata/com.vwp.owmap.yml

@@ -178,6 +178,7 @@ Builds:
 
   - versionName: '1.33'
     versionCode: 133
+    disable: fails to build
     commit: v1.33
     subdir: master/android/OWMapAtAndroid
     prebuild: echo 'source.dir=src;../LocDemo/src/com/vwp/libwlocate' > ant.properties

metadata/hr.kravarscan.enchantedfortress.yml

@@ -109,13 +109,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: '1.13'
-    versionCode: 14
-    commit: v1.13
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: '1.14'
     versionCode: 15
     commit: v1.14

metadata/pc.javier.seguime.yml

@@ -188,14 +188,14 @@ Builds:
     gradle:
       - yes
 
-  - versionName: '46'
+  - versionName: '4.6'
     versionCode: 46
-    commit: '46'
+    commit: '4.6'
     subdir: app
     gradle:
       - yes
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
-CurrentVersion: '46'
+CurrentVersion: '4.6'
 CurrentVersionCode: 46