From 685f81614f8dcb332a50dfa77786c89f2042d728 Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Wed, 4 Nov 2020 17:11:41 +0100
Subject: [PATCH 1/3] element: add 1.0.10

---
 metadata/im.vector.app.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/metadata/im.vector.app.yml b/metadata/im.vector.app.yml
index bde5133479..848a56ef1e 100644
--- a/metadata/im.vector.app.yml
+++ b/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.
 

From c908e38be00b392c25f11ebe25369a477c44677a Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Wed, 4 Nov 2020 16:17:04 +0000
Subject: [PATCH 2/3] Update com.tutpro.baresip.yml

---
 metadata/com.tutpro.baresip.yml | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/metadata/com.tutpro.baresip.yml b/metadata/com.tutpro.baresip.yml
index 7d843cbccd..e5fc8010ec 100644
--- a/metadata/com.tutpro.baresip.yml
+++ b/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

From 3fbd29ff5da6d402f425f09e4f2680b428593f6b Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Wed, 4 Nov 2020 18:28:22 +0100
Subject: [PATCH 3/3] fix wikipedia build

ref: https://phabricator.wikimedia.org/T267238
---
 metadata/org.wikipedia.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata/org.wikipedia.yml b/metadata/org.wikipedia.yml
index 0263c97706..67e38da35e 100644
--- a/metadata/org.wikipedia.yml
+++ b/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