Merge branch 'miscfixes30' into 'master'

Misc fixes after cycle

See merge request fdroid/fdroiddata!6968

metadata/awais.instagrabber.yml

@@ -8,6 +8,19 @@ SourceCode: https://gitlab.com/AwaisKing/Instagrabber/tree/HEAD
 IssueTracker: https://gitlab.com/AwaisKing/Instagrabber/issues
 
 AutoName: InstaGrabber
+Summary: A simple yet advanced Instagram post downloader
+Description: |-
+    [NOTE: this app is discontinued]
+
+    Hey moron, this is what you can do:
+    * you can search for hashtags and use usernames.
+    * you can keep the app running and it'll automatically show up a box with post or username you copied.
+    * you can download mafakin profiles pictures and their feed posts (public only). 1
+    * you can simply log in to your account (Settings > Login) and you can download private posts too!! 2
+    * you can hold down any item and you'll be able to download batch items, if you're greedy and/or want to steal posts.
+    * you can copy bio of anyone and captions of any post, if you want to. idrc.
+    * you can watch stories and highlights. again, i'm telling you to make sure you're logged in
+    * view or copy commens, only if the post has at least one.
 
 RepoType: git
 Repo: https://gitlab.com/AwaisKing/Instagrabber.git
@@ -111,15 +124,9 @@ Builds:
     gradle:
       - fdroid
 
-  - versionName: '16.3'
-    versionCode: 26
-    commit: v16.3
-    subdir: app
-    gradle:
-      - fdroid
-
   - versionName: '16.5'
     versionCode: 27
+    disable: fails to build
     commit: v16.5
     subdir: app
     gradle:

metadata/com.dar.nclientv2.yml

@@ -20,87 +20,13 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 2.2.7
-    versionCode: 227
-    disable: requires Gradle 6.4-rc-4
-    commit: 2.2.7
-    subdir: app
-    gradle:
-      - yes
-
-  - versionName: 2.2.8
-    versionCode: 228
-    disable: requires Gradle 6.4-rc-4
-    commit: 2.2.8
-    subdir: app
-    gradle:
-      - yes
-
-  - versionName: 2.2.9
-    versionCode: 229
-    disable: requires Gradle 6.4-rc-4
-    commit: 2.2.9
-    subdir: app
-    gradle:
-      - yes
-
-  - versionName: 2.3.0
-    versionCode: 230
-    disable: requires Gradle 6.4-rc-4
-    commit: 2.3.0
-    subdir: app
-    gradle:
-      - yes
-
-  - versionName: 2.3.6
-    versionCode: 236
-    disable: requires Gradle 6.4-rc-4
-    commit: 2.3.6
-    subdir: app
-    gradle:
-      - yes
-
-  - versionName: 2.3.7
-    versionCode: 237
-    commit: 2.3.7
-    subdir: app
-    gradle:
-      - yes
-
-  - versionName: 2.3.9
-    versionCode: 239
-    commit: 2.3.9
-    subdir: app
-    gradle:
-      - yes
-
-  - versionName: 2.4.0
-    versionCode: 240
-    commit: 2.4.0
-    subdir: app
-    gradle:
-      - yes
-
-  - versionName: 2.4.1
-    versionCode: 241
-    commit: 2.4.1
-    subdir: app
-    gradle:
-      - yes
-
-  - versionName: 2.4.2
-    versionCode: 242
-    commit: 2.4.2
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: 2.4.3
     versionCode: 243
     commit: 2.4.3
     subdir: app
     gradle:
       - yes
+    prebuild: sed -i -e 's/6.4-rc-4-all/6.4-all/' -e '/Sha256Sum/d' ../gradle/wrapper/gradle-wrapper.properties
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags

metadata/com.foobnix.pro.pdf.reader.yml

@@ -408,7 +408,7 @@ Builds:
     build:
       - pushd ../Builder/
       - ./link_to_mupdf_1.16.1.sh
-    ndk: r21b
+    ndk: r21c
 
 MaintainerNotes: Upstream builds separate APKs for each architecture but we build
     an universal APK.

metadata/com.sapuseven.untis.yml

@@ -55,13 +55,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 3.3.2
-    versionCode: 21
-    commit: v3.3.2
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: 3.3.2
     versionCode: 22
     commit: v3.3.2

metadata/com.termux.yml

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

metadata/design.codeux.authpass.fdroid.yml

@@ -177,10 +177,10 @@ Builds:
       - authpass/macos
       - deps/kdbx.dart/libargon2*
     build:
-      - echo 'systemProp.design.codeux.ndkVersion=21.2.6472646' >> authpass/android/gradle.properties
+      - echo 'systemProp.design.codeux.ndkVersion=21.2.6472646' >> android/gradle.properties
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter build apk -t lib/env/fdroid.dart --flavor fdroid --release
-    ndk: r21b
+    ndk: r21c
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: HTTP

metadata/eu.faircode.email.yml

@@ -2528,16 +2528,6 @@ Builds:
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
     ndk: r21b
 
-  - versionName: '1.1200'
-    versionCode: 1200
-    commit: '1.1200'
-    subdir: app
-    submodules: true
-    gradle:
-      - full
-    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
-    ndk: r21b
-
   - versionName: '1.1201'
     versionCode: 1201
     commit: '1.1201'

metadata/eu.faircode.netguard.yml

@@ -1231,15 +1231,6 @@ Builds:
     prebuild: sed -i -e '/keystore/d' -e '/signingConfigs/d' build.gradle
     ndk: r21
 
-  - versionName: '2.282'
-    versionCode: 2020061201
-    commit: '2.282'
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e '/keystore/d' -e '/signingConfigs/d' build.gradle
-    ndk: r21
-
   - versionName: '2.283'
     versionCode: 2020061401
     commit: '2.283'
@@ -1247,7 +1238,7 @@ Builds:
     gradle:
       - yes
     prebuild: sed -i -e '/keystore/d' -e '/signingConfigs/d' build.gradle
-    ndk: r21
+    ndk: r21b
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags ^[0-9.]+$

metadata/net.kollnig.missioncontrol.fdroid.yml

@@ -52,7 +52,7 @@ Builds:
     subdir: app
     gradle:
       - fdroid
-    prebuild: sed -i -e 's/21.0.6113669/21.1.6352462/' app/build.gradle
+    prebuild: sed -i -e 's/21.0.6113669/21.1.6352462/' build.gradle
     ndk: r21b
 
 AutoUpdateMode: Version %c

metadata/org.secuso.privacyfriendlypin.yml

@@ -59,6 +59,7 @@ Builds:
 
   - versionName: 2.0.2
     versionCode: 7
+    disable: no tag, checkupdate bot blunder
     commit: v2.0.2
     subdir: app
     gradle:

metadata/org.surrel.facebooknotifications.yml

@@ -102,6 +102,7 @@ Builds:
 
   - versionName: 1.10.1
     versionCode: 14
+    disable: no tag, checkupdate bot blunder
     commit: v1.10.1
     subdir: app
     gradle:

metadata/org.xcsoar.yml

@@ -261,6 +261,7 @@ Builds:
 
   - versionName: 6.8.15
     versionCode: 117
+    disable: fails to build
     commit: v6.8.15
     submodules: true
     sudo:

metadata/se.lublin.mumla.yml

@@ -116,7 +116,7 @@ Builds:
       - gradle jar
     buildjni:
       - ../libraries/humla/src/main/jni
-    ndk: r21
+    ndk: r21b
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags ^[^-]*$