From 3991c799c05079162d45086e8719c0419a67cbfd Mon Sep 17 00:00:00 2001
From: IratePorcupine <3669023-IratePorcupine@users.noreply.gitlab.com>
Date: Tue, 21 May 2024 13:23:14 +0000
Subject: [PATCH] Update Fennec F-Droid to 126.0.0

---
 metadata/org.mozilla.fennec_fdroid.yml | 62 +++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 7 deletions(-)

diff --git a/metadata/org.mozilla.fennec_fdroid.yml b/metadata/org.mozilla.fennec_fdroid.yml
index e1a28ddf48..df17bcced4 100644
--- a/metadata/org.mozilla.fennec_fdroid.yml
+++ b/metadata/org.mozilla.fennec_fdroid.yml
@@ -29,7 +29,7 @@ Description: |-
   It has proprietary bits and telemetry removed, but still connects to various Mozilla and Google services that can track users.
 
 RepoType: git
-Repo: https://github.com/mozilla-mobile/firefox-android.git
+Repo: https://gitlab.com/relan/fennecbuild.git
 
 Builds:
   - versionName: '35.0'
@@ -15269,16 +15269,64 @@ Builds:
     build: $$MozBuild$$/build.sh
     ndk: r26c
 
+  - versionName: 126.0.0
+    versionCode: 1260000
+    commit: a238461e8ce69d5c067087ade283c0f700f490b6
+    timeout: 18000
+    sudo:
+      - apt-get update
+      - apt-get install -y cmake make m4 g++ pkg-config libssl-dev python-is-python3
+        python3-distutils python3-venv tcl gyp ninja-build bzip2 libz-dev libffi-dev
+        libsqlite3-dev
+    output: ../srclib/MozFennec/mobile/android/fenix/app/build/outputs/apk/fenix/release/app-*-release-unsigned.apk
+    srclibs:
+      - MozFennec@FIREFOX-ANDROID_126_0_RELEASE
+      - FirefoxAndroidAS@components-v124.1.0
+      - MozAppServices@v126.0
+      - MozGlean@v59.0.0
+      - MozGleanAS@v57.0.0
+      - gmscore@v0.3.2.240913
+      - rustup@1.27.0
+      - wasi-sdk@wasi-sdk-20
+    prebuild: ./prebuild.sh $$VERSION$$ $$VERCODE$$
+    build: ./build.sh
+    ndk: r26c
+
+  - versionName: 126.0.0
+    versionCode: 1260020
+    commit: a238461e8ce69d5c067087ade283c0f700f490b6
+    timeout: 18000
+    sudo:
+      - apt-get update
+      - apt-get install -y cmake make m4 g++ pkg-config libssl-dev python-is-python3
+        python3-distutils python3-venv tcl gyp ninja-build bzip2 libz-dev libffi-dev
+        libsqlite3-dev
+    output: ../srclib/MozFennec/mobile/android/fenix/app/build/outputs/apk/fenix/release/app-*-release-unsigned.apk
+    srclibs:
+      - MozFennec@FIREFOX-ANDROID_126_0_RELEASE
+      - FirefoxAndroidAS@components-v124.1.0
+      - MozAppServices@v126.0
+      - MozGlean@v59.0.0
+      - MozGleanAS@v57.0.0
+      - gmscore@v0.3.2.240913
+      - rustup@1.27.0
+      - wasi-sdk@wasi-sdk-20
+    prebuild: ./prebuild.sh $$VERSION$$ $$VERCODE$$
+    build: ./build.sh
+    ndk: r26c
+
 MaintainerNotes: |-
   Version code scheme:
   XYZAR, where X.Y.Z is upstream version, A is architecture (0 = ARMv7, 1 = x86, 2 = ARMv8), R is revision (if we need to re-release).
   * Example: 530210 = Firefox 53.0.2 for x86, initial revision
   * Example: 550021 = Firefox 55.0 for ARMv8, second revision
 
-  MozAppServices, Glean and MozFennec versions:
-  grep 'VERSION =' build/org.mozilla.fennec_fdroid/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
-  grep 'mozilla_glean =' build/org.mozilla.fennec_fdroid/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
-  grep 'version =' build/org.mozilla.fennec_fdroid/android-components/plugins/dependencies/src/main/java/Gecko.kt
+  MozFennec:
+  https://hg.mozilla.org/releases/mozilla-release/tags
+
+  MozAppServices, Glean versions:
+  grep 'mozilla_appservices' srclib/MozFennec/mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.k
+  grep 'mozilla_glean' srclib/MozFennec/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
 
   FirefoxAndroidAS version:
   grep 'android-components =' build/srclib/MozAppServices/gradle/libs.versions.toml
@@ -15298,5 +15346,5 @@ MaintainerNotes: |-
 ArchivePolicy: 6
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 125.3.0
-CurrentVersionCode: 1253020
+CurrentVersion: 126.0.0
+CurrentVersionCode: 1260020