From 16e62ca230f9617cf82974c4caa44a7c27fcc99b Mon Sep 17 00:00:00 2001
From: relan <relan@airpost.net>
Date: Tue, 24 Jun 2025 17:36:23 +0000
Subject: [PATCH] Update Fennec F-Droid to 140.0.0

---
 metadata/org.mozilla.fennec_fdroid.yml | 79 +++++++++++++++++++++++++-
 srclibs/MozFennec.yml                  |  2 +-
 srclibs/bundletool.yml                 |  2 +
 3 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 srclibs/bundletool.yml

diff --git a/metadata/org.mozilla.fennec_fdroid.yml b/metadata/org.mozilla.fennec_fdroid.yml
index d814248688..382745e0a3 100644
--- a/metadata/org.mozilla.fennec_fdroid.yml
+++ b/metadata/org.mozilla.fennec_fdroid.yml
@@ -16195,6 +16195,81 @@ Builds:
     build: ./build.sh
     ndk: 28.1.13356709
 
+  - versionName: 140.0.0
+    versionCode: 1400000
+    commit: 1e78b0311c1577240c556c18fd58c68c48a49864
+    timeout: 36000
+    sudo:
+      - apt-get update
+      - apt-get install -y cmake make m4 pkg-config python-is-python3 python3-venv
+        tcl gyp ninja-build bzip2 libffi-dev libsqlite3-dev binutils-dev clang-16
+        lld-16 libssl-dev
+    output: ../srclib/MozFennec/obj/gradle/build/mobile/android/fenix/app/outputs/apk/fenix/release/app-fenix-*-release-unsigned.apk
+    srclibs:
+      - MozFennec@FIREFOX-ANDROID_140_0_RELEASE
+      - MozAppServices@v140.0
+      - MozGlean@v64.3.1
+      - bundletool@1.18.1
+      - gmscore@v0.3.7.250932
+      - rustup@1.28.2
+      - wasi-sdk@wasi-sdk-20
+      - llvm@3c92011b600bdf70424e2547594dd461fe411a41
+      - llvm_android@2a4ee244d6dd0dcb8365590b898f7a40ec3cb87a
+      - toolchain-utils@dd1ee45a84cb07337f9d5d0a6769d9b865c6e620
+    prebuild: ./prebuild.sh $$VERSION$$ $$VERCODE$$
+    build: ./build.sh
+    ndk: 28.1.13356709
+
+  - versionName: 140.0.0
+    versionCode: 1400010
+    commit: 1e78b0311c1577240c556c18fd58c68c48a49864
+    timeout: 36000
+    sudo:
+      - apt-get update
+      - apt-get install -y cmake make m4 pkg-config python-is-python3 python3-venv
+        tcl gyp ninja-build bzip2 libffi-dev libsqlite3-dev binutils-dev clang-16
+        lld-16 libssl-dev nasm
+    output: ../srclib/MozFennec/obj/gradle/build/mobile/android/fenix/app/outputs/apk/fenix/release/app-fenix-*-release-unsigned.apk
+    srclibs:
+      - MozFennec@FIREFOX-ANDROID_140_0_RELEASE
+      - MozAppServices@v140.0
+      - MozGlean@v64.3.1
+      - bundletool@1.18.1
+      - gmscore@v0.3.7.250932
+      - rustup@1.28.2
+      - wasi-sdk@wasi-sdk-20
+      - llvm@3c92011b600bdf70424e2547594dd461fe411a41
+      - llvm_android@2a4ee244d6dd0dcb8365590b898f7a40ec3cb87a
+      - toolchain-utils@dd1ee45a84cb07337f9d5d0a6769d9b865c6e620
+    prebuild: ./prebuild.sh $$VERSION$$ $$VERCODE$$
+    build: ./build.sh
+    ndk: 28.1.13356709
+
+  - versionName: 140.0.0
+    versionCode: 1400020
+    commit: 1e78b0311c1577240c556c18fd58c68c48a49864
+    timeout: 36000
+    sudo:
+      - apt-get update
+      - apt-get install -y cmake make m4 pkg-config python-is-python3 python3-venv
+        tcl gyp ninja-build bzip2 libffi-dev libsqlite3-dev binutils-dev clang-16
+        lld-16 libssl-dev
+    output: ../srclib/MozFennec/obj/gradle/build/mobile/android/fenix/app/outputs/apk/fenix/release/app-fenix-*-release-unsigned.apk
+    srclibs:
+      - MozFennec@FIREFOX-ANDROID_140_0_RELEASE
+      - MozAppServices@v140.0
+      - MozGlean@v64.3.1
+      - bundletool@1.18.1
+      - gmscore@v0.3.7.250932
+      - rustup@1.28.2
+      - wasi-sdk@wasi-sdk-20
+      - llvm@3c92011b600bdf70424e2547594dd461fe411a41
+      - llvm_android@2a4ee244d6dd0dcb8365590b898f7a40ec3cb87a
+      - toolchain-utils@dd1ee45a84cb07337f9d5d0a6769d9b865c6e620
+    prebuild: ./prebuild.sh $$VERSION$$ $$VERCODE$$
+    build: ./build.sh
+    ndk: 28.1.13356709
+
 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).
@@ -16225,5 +16300,5 @@ MaintainerNotes: |-
 ArchivePolicy: 6
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 139.0.4
-CurrentVersionCode: 1390420
+CurrentVersion: 140.0.0
+CurrentVersionCode: 1400020
diff --git a/srclibs/MozFennec.yml b/srclibs/MozFennec.yml
index 8dc1e70645..a0fc72e939 100644
--- a/srclibs/MozFennec.yml
+++ b/srclibs/MozFennec.yml
@@ -1,2 +1,2 @@
 RepoType: git
-Repo: https://github.com/mozilla/firefox.git
+Repo: https://github.com/mozilla-firefox/firefox.git
diff --git a/srclibs/bundletool.yml b/srclibs/bundletool.yml
new file mode 100644
index 0000000000..5eb1e42fe3
--- /dev/null
+++ b/srclibs/bundletool.yml
@@ -0,0 +1,2 @@
+RepoType: git
+Repo: https://github.com/google/bundletool.git