From a69cbe1d639c8e4c0f63952d054b1f9ede06af90 Mon Sep 17 00:00:00 2001
From: relan <relan@airpost.net>
Date: Sat, 16 Dec 2023 10:46:58 +0000
Subject: [PATCH] Update Fennec F-Droid to 120.1.1

---
 metadata/org.mozilla.fennec_fdroid.yml | 66 ++++++++++++++++++++++++--
 srclibs/gmscore.yml                    |  2 +
 2 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 srclibs/gmscore.yml

diff --git a/metadata/org.mozilla.fennec_fdroid.yml b/metadata/org.mozilla.fennec_fdroid.yml
index 5e2453f57e..4c0c45e81d 100644
--- a/metadata/org.mozilla.fennec_fdroid.yml
+++ b/metadata/org.mozilla.fennec_fdroid.yml
@@ -14665,6 +14665,62 @@ Builds:
     build: $$MozBuild$$/build.sh
     ndk: r21d
 
+  - versionName: 120.1.1
+    versionCode: 1201100
+    commit: fenix-v120.1.1
+    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
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
+    output: fenix/app/build/outputs/apk/fenix/release/app-*-release-unsigned.apk
+    srclibs:
+      - FirefoxAndroidAS@components-v117.0.1
+      - MozAppServices@v120.0.2
+      - MozBuild@cff4cc4e900b686ae66dadd07c674fd5507693cf
+      - MozFennec@FIREFOX_120_0_1_RELEASE
+      - MozGlean@v54.0.0
+      - MozGleanAS@v53.1.0
+      - gmscore@v0.3.0.233515
+      - rustup@1.26.0
+      - wasi-sdk@wasi-sdk-16
+    prebuild: $$MozBuild$$/prebuild.sh $$VERSION$$ $$VERCODE$$
+    scanignore:
+      - android-components/components/lib/publicsuffixlist/src/main/assets/publicsuffixes
+    build: $$MozBuild$$/build.sh
+    ndk: r21d
+
+  - versionName: 120.1.1
+    versionCode: 1201120
+    commit: fenix-v120.1.1
+    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
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
+    output: fenix/app/build/outputs/apk/fenix/release/app-*-release-unsigned.apk
+    srclibs:
+      - FirefoxAndroidAS@components-v117.0.1
+      - MozAppServices@v120.0.2
+      - MozBuild@cff4cc4e900b686ae66dadd07c674fd5507693cf
+      - MozFennec@FIREFOX_120_0_1_RELEASE
+      - MozGlean@v54.0.0
+      - MozGleanAS@v53.1.0
+      - gmscore@v0.3.0.233515
+      - rustup@1.26.0
+      - wasi-sdk@wasi-sdk-16
+    prebuild: $$MozBuild$$/prebuild.sh $$VERSION$$ $$VERCODE$$
+    scanignore:
+      - android-components/components/lib/publicsuffixlist/src/main/assets/publicsuffixes
+    build: $$MozBuild$$/build.sh
+    ndk: r21d
+
 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).
@@ -14672,15 +14728,15 @@ MaintainerNotes: |-
   * Example: 550021 = Firefox 55.0 for ARMv8, second revision
 
   MozAppServices, Glean and MozFennec versions:
-  grep 'mozilla_appservices =' 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/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
 
-  MozAndroidComponentsAS version:
+  FirefoxAndroidAS version:
   grep 'android_components_version =' build/srclib/MozAppServices/build.gradle
 
   MozGleanAS version:
-  grep 'mozilla_glean =' build/srclib/FirefoxAndroidAS/android-components/buildSrc/src/main/java/Dependencies.kt
+  grep 'mozilla_glean =' build/srclib/FirefoxAndroidAS/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
 
   wasi-sdk version:
   grep -A5 '^wasi-sdk:' build/srclib/MozFennec/taskcluster/ci/fetch/toolchains.yml
@@ -14692,5 +14748,5 @@ MaintainerNotes: |-
 ArchivePolicy: 6
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 120.1.0
-CurrentVersionCode: 1201020
+CurrentVersion: 120.1.1
+CurrentVersionCode: 1201120
diff --git a/srclibs/gmscore.yml b/srclibs/gmscore.yml
new file mode 100644
index 0000000000..839e2f1ea8
--- /dev/null
+++ b/srclibs/gmscore.yml
@@ -0,0 +1,2 @@
+RepoType: git
+Repo: https://github.com/microg/GmsCore.git