From c7fb9abed7b540075b7c4936545bc9bbbca9af64 Mon Sep 17 00:00:00 2001
From: Alexey Rochev <equeim@gmail.com>
Date: Thu, 3 Nov 2022 22:13:46 +0300
Subject: [PATCH] Update Tremotesf to 2.7.1 (4050)

---
 metadata/org.equeim.tremotesf.yml | 39 +++++++++++++++++++++++++++----
 srclibs/FirefoxAndroid.yml        |  4 ++++
 2 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 srclibs/FirefoxAndroid.yml

diff --git a/metadata/org.equeim.tremotesf.yml b/metadata/org.equeim.tremotesf.yml
index ab3d20c10e..ccae603a50 100644
--- a/metadata/org.equeim.tremotesf.yml
+++ b/metadata/org.equeim.tremotesf.yml
@@ -684,13 +684,42 @@ Builds:
         -DCMAKE_CXX_FLAGS=-stdlib=libc++
       - org.equeim.tremotesf.print-3rdparty-build-log-on-error=true
 
+  - versionName: 2.7.1
+    versionCode: 4050
+    commit: 2.7.1
+    subdir: app
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y gcc g++ ninja-build make patch perl
+    gradle:
+      - fdroid
+    srclibs:
+      - FirefoxAndroid@v107.0.6
+    prebuild:
+      - sdkmanager 'cmake;3.22.1'
+      - sed -i -e 's|maven.*mozilla.*|mavenLocal\(\)|' ../settings.gradle.kts
+      - cd '$$FirefoxAndroid$$/android-components'
+      - tasks=":lib-publicsuffixlist:publishToMavenLocal $(gradlew-fdroid :lib-publicsuffixlist:dependencies
+        --configuration releaseRuntimeClasspath | perl -lne 'print "$1:publishToMavenLocal"
+        if /^.*--- project ([^\s]+)$/')"
+      - gradlew-fdroid $tasks
+    scanignore:
+      - gradle-plugin/build
+    scandelete:
+      - 3rdparty
+    ndk: r25b
+    gradleprops:
+      - org.equeim.tremotesf.print-3rdparty-build-log-on-error=true
+
 MaintainerNotes: |
-    We need host C++ compiler with proper C++17 support, and the only ones available in Debian Stretch are clang-7 and clang-11.
-    clang-7 has a bug that causes compilation errors, so use clang-11.
-    Tremotesf also uses Gradle plugin in its build process, which is compiled from source on first Gradle invocation.
+    Tremotesf uses Gradle plugin in its build process, which is compiled from source on first Gradle invocation.
     Since it happens before scanning for binaries, we need to scanignore plugin's build directory.
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
-CurrentVersion: 2.6.1
-CurrentVersionCode: 4048
+UpdateCheckName: Ignore
+UpdateCheckData: app/build.gradle.kts|versionCode = (\d+)|app/build.gradle.kts|versionName
+    = "([\d.]+)"
+CurrentVersion: 2.7.1
+CurrentVersionCode: 4050
diff --git a/srclibs/FirefoxAndroid.yml b/srclibs/FirefoxAndroid.yml
new file mode 100644
index 0000000000..a7b53efbb4
--- /dev/null
+++ b/srclibs/FirefoxAndroid.yml
@@ -0,0 +1,4 @@
+RepoType: git
+Repo: https://github.com/mozilla-mobile/firefox-android.git
+Prepare: |
+  sed -i -e '/com.google.firebase/d' android-components/buildSrc/src/main/java/Dependencies.kt && rm -fR android-components/components/lib/push-firebase