From 5469cc7c3d2a7f146ec96155db205372b1a5c667 Mon Sep 17 00:00:00 2001
From: Vasyl Gello <vasek.gello@gmail.com>
Date: Tue, 9 Jul 2024 13:26:00 +0000
Subject: [PATCH] Update Rustdesk to 1.2.6 and upstream F-Droid build script

---
 metadata/com.carriez.flutter_hbb.yml | 67 +++++++++++++++++++++++++---
 1 file changed, 61 insertions(+), 6 deletions(-)

diff --git a/metadata/com.carriez.flutter_hbb.yml b/metadata/com.carriez.flutter_hbb.yml
index 3ff5bc23b9..74289444c9 100644
--- a/metadata/com.carriez.flutter_hbb.yml
+++ b/metadata/com.carriez.flutter_hbb.yml
@@ -806,6 +806,62 @@ Builds:
       - flutter build apk $FLUTTER_APK_CMD --target-platform "$FLUTTER_PLATFORM"
     ndk: r26b
 
+  - versionName: 1.2.6
+    versionCode: 102060001
+    commit: d007408061867f46a0a38b81def843bd8986b788
+    timeout: 14400
+    sudo:
+      - export DEBIAN_FRONTEND=noninteractive
+      - apt-get update
+      - apt-get -y full-upgrade
+      - apt-get -y install clang cmake fakeroot libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
+        libgtk-3-dev make nasm ninja-build pkg-config wget xz-utils yasm yq zip
+    output: flutter/build/app/outputs/flutter-apk/app-debug.apk
+    prebuild: flutter/build_fdroid.sh "$$VERSION$$" "$$VERCODE$$" x86 prebuild
+    build: flutter/build_fdroid.sh "$$VERSION$$" "$$VERCODE$$" x86 build
+
+  - versionName: 1.2.6
+    versionCode: 102060002
+    commit: d007408061867f46a0a38b81def843bd8986b788
+    timeout: 14400
+    sudo:
+      - export DEBIAN_FRONTEND=noninteractive
+      - apt-get -y full-upgrade
+      - apt-get -y install clang cmake libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
+        libgtk-3-dev make nasm ninja-build pkg-config wget xz-utils yasm yq zip
+    output: flutter/build/app/outputs/flutter-apk/app-release.apk
+    prebuild: flutter/build_fdroid.sh "$$VERSION$$" "$$VERCODE$$" armeabi-v7a prebuild
+    build: flutter/build_fdroid.sh "$$VERSION$$" "$$VERCODE$$" armeabi-v7a build
+
+  - versionName: 1.2.6
+    versionCode: 102060003
+    commit: d007408061867f46a0a38b81def843bd8986b788
+    timeout: 14400
+    sudo:
+      - export DEBIAN_FRONTEND=noninteractive
+      - apt-get update
+      - apt-get -y full-upgrade
+      - apt-get -y install clang cmake libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
+        libgtk-3-dev make nasm ninja-build pkg-config wget xz-utils yasm yq zip
+    output: flutter/build/app/outputs/flutter-apk/app-release.apk
+    prebuild: flutter/build_fdroid.sh "$$VERSION$$" "$$VERCODE$$" arm64-v8a prebuild
+    build: flutter/build_fdroid.sh "$$VERSION$$" "$$VERCODE$$" arm64-v8a build
+    ndk: r26b
+
+  - versionName: 1.2.6
+    versionCode: 102060004
+    commit: d007408061867f46a0a38b81def843bd8986b788
+    timeout: 14400
+    sudo:
+      - export DEBIAN_FRONTEND=noninteractive
+      - apt-get update
+      - apt-get -y full-upgrade
+      - apt-get -y install clang cmake libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
+        libgtk-3-dev make nasm ninja-build pkg-config wget xz-utils yasm yq zip
+    output: flutter/build/app/outputs/flutter-apk/app-release.apk
+    prebuild: flutter/build_fdroid.sh "$$VERSION$$" "$$VERCODE$$" x86_64 prebuild
+    build: flutter/build_fdroid.sh "$$VERSION$$" "$$VERCODE$$" x86_64 build
+
 MaintainerNotes: |-
   Licaon_Kter: Tracking AF applied because Rustdesk connects to rustdesk.com on start and sends a
   lot of data per https://rustdesk.com/privacy.html point 3 letter d
@@ -831,9 +887,8 @@ MaintainerNotes: |-
     (0003-x86-no-debuggable.patch)
   - build jit_release APK using 'flutter build apk --debug --local-engine= --local-engine-src-path='
   .
-  basilgello: rustdesk version codes do not sequentially grow so I set up the simple versioner
-  CI job under https://gitlab.com/basilgello/rustdesk-fdroid-versioner until upstream accepts
-  my proposed change.
+  basilgello: The build script for F-Droid was refactored by me to be included into upstream
+  RustDesk tree in order to minimize the changes needed on F-Droid side and facilitate auto-updates.
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: HTTP
@@ -842,6 +897,6 @@ VercodeOperation:
   - 100 * %c + 2
   - 100 * %c + 3
   - 100 * %c + 4
-UpdateCheckData: https://gitlab.com/basilgello/rustdesk-fdroid-versioner/-/releases/rolling/downloads/rustdesk-version.txt|versionCode=(\d+)|.|versionName=(.*)
-CurrentVersion: 1.2.3-2
-CurrentVersionCode: 12308
+UpdateCheckData: https://github.com/rustdesk/rustdesk/releases/download/fdroid-version/rustdesk-version.txt|versionCode=(\d+)|.|versionName=(.*)
+CurrentVersion: 1.2.6
+CurrentVersionCode: 102060004