Merge branch 'juha-h-master-patch-52991' into 'master'

Update com.tutpro.baresip.plus.yml

See merge request fdroid/fdroiddata!7675

metadata/com.tutpro.baresip.yml

@@ -1346,10 +1346,27 @@ Builds:
       - popd
     ndk: r21d
 
+  - versionName: 22.1.0
+    versionCode: 139
+    commit: 22.1.0
+    subdir: app
+    gradle:
+      - yes
+    srclibs:
+      - libbaresip-android@17.0
+    build:
+      - pushd $$libbaresip-android$$
+      - sed -i -e 's!$(shell ls -d -1 /opt/Android/ndk/\* | tail -1)!$$NDK$$!' -e
+        's|/usr/src/baresip-studio|../../com.tutpro.baresip|' Makefile
+      - make download-sources
+      - make install-all
+      - popd
+    ndk: r21d
+
 MaintainerNotes: make download-sources checks out master branches of several libraries;
     this can cause build failures.
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags ^[0-9.]+$
-CurrentVersion: 22.0.0
-CurrentVersionCode: 138
+CurrentVersion: 22.1.0
+CurrentVersionCode: 139

metadata/im.vector.app.yml

@@ -215,6 +215,26 @@ Builds:
       - build.gradle
     ndk: r21d
 
+  - versionName: 1.0.10
+    versionCode: 40100100
+    commit: v1.0.10
+    subdir: vector
+    gradle:
+      - fdroid
+    srclibs:
+      - piasy@v1.6.2
+    prebuild:
+      - sed -i -e 's/gradle-6.7/gradle-6.6.1/' ../gradle/wrapper/gradle-wrapper.properties
+      - tac ../build.gradle | awk '/dl.bintray.com\/piasy\/maven/{getline;$0="mavenLocal
+        {"}{print $0}' | tac > ../build.gradle.new
+      - mv ../build.gradle.new ../build.gradle
+      - sed -i -e '/com.google.firebase/,+5d' build.gradle
+      - sed -i -e '/com.google.gms.google-services/d' build.gradle
+      - sed -i -e 's/enable true/enable false/g' build.gradle
+    scanignore:
+      - build.gradle
+    ndk: r21d
+
 MaintainerNotes: |-
     Uses piasy/BigImageViewer which gets build and installed to a local maven repo in srclib prepare step.
 

metadata/org.wikipedia.yml

@@ -679,12 +679,12 @@ Builds:
 
   - versionName: r/2.7.50334-r-2020-11-02
     versionCode: 50334
-    disable: fails to build
     commit: r/2.7.50334-r-2020-11-02
     subdir: app
     gradle:
       - fdroid
     forceversion: true
+    prebuild: echo 'android { lintOptions { abortOnError false } }' >> build.gradle
 
 MaintainerNotes: |-
     * whitelist app/build.gradle for microsoft appcenter SDK. It's actually open source but might