From 1b17c6dfc04faf545e4142a1d5efab6a93d31fcf Mon Sep 17 00:00:00 2001
From: Tomas Volf <~@wolfsden.cz>
Date: Thu, 26 Jun 2025 23:01:22 +0200
Subject: nongnu: firefox-esr: Update to 140.0esr.

* nongnu/packages/mozilla.scm (firefox-esr): Update to 140.0esr.
[source]<patches>: Add firefox-restore-desktop-files.patch.  Use >=138 version
of path comparison patch.
[inputs]: Use icu4c-76.
[native-inputs]: Use rust-cbindgen-0.28.
(firefox)[inputs]: Drop.
[native-inputs]: Do not replace rust-cbindgen.
* nongnu/packages/patches/firefox-esr-add-store-to-rdd-allowlist.patch: Update
to new version.  No functional changes.
* nongnu/packages/patches/firefox-esr-use-system-wide-dir.patch: Same.
* nongnu/packages/patches/firefox-esr-compare-paths.patch: Delete file.

Signed-off-by: Hilton Chain <hako@ultrarare.space>
---
 nongnu/packages/mozilla.scm | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'nongnu/packages/mozilla.scm')

diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm
index d8deb82..9193d5d 100644
--- a/nongnu/packages/mozilla.scm
+++ b/nongnu/packages/mozilla.scm
@@ -87,26 +87,27 @@
 
 ;; Update this id with every firefox update to its release date.
 ;; It's used for cache validation and therefore can lead to strange bugs.
-(define %firefox-esr-build-id "20250623124138")
+(define %firefox-esr-build-id "20250623125548")
 
 (define-public firefox-esr
   (package
     (name "firefox-esr")
-    (version "128.12.0esr")
+    (version "140.0esr")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://archive.mozilla.org/pub/firefox/releases/"
                            version "/source/firefox-" version ".source.tar.xz"))
        (sha256
-        (base32 "0gwpkpl053jv8j7bl8cjdqngxfj5wbj2mm48rqzws5nbqs3fpv9b"))
+        (base32 "0gz9z6lh2iz0mpfa0cqlz86dpxhn235lhvh4kg5ka9g7i8x2i9x1"))
        (patches
         (map (lambda (patch)
                (search-path
                 (map (cut string-append <> "/nongnu/packages/patches")
                      %load-path)
                 patch))
-             '("firefox-esr-compare-paths.patch"
+             '("firefox-restore-desktop-files.patch"
+               "firefox-ge-138-compare-paths.patch"
                "firefox-esr-use-system-wide-dir.patch"
                "firefox-esr-add-store-to-rdd-allowlist.patch")))
        ;; XXX: 75 Mo (800+ Mo uncompressed) of unused tests.
@@ -462,7 +463,7 @@
         gtk+
         gtk+-2
         hunspell
-        icu4c
+        icu4c-76
         jemalloc
         libcanberra
         libevent
@@ -510,7 +511,7 @@
         pkg-config
         python
         rust-firefox-esr
-        rust-cbindgen-0.26
+        rust-cbindgen-0.28
         which
         yasm))
     (native-search-paths
@@ -574,13 +575,9 @@ Release (ESR) version.")
                   (if (string=? old-content
                                 (pk (call-with-input-file file get-string-all)))
                       (error "substitute did nothing, phase requires an update")))))))))
-    (inputs
-     (modify-inputs (package-inputs firefox-esr)
-       (replace "icu4c" icu4c-76)))
     (native-inputs
      (modify-inputs (package-native-inputs firefox-esr)
        (replace "rust" rust-firefox)
-       (replace "rust-cbindgen" rust-cbindgen-0.28)
        (replace "rust:cargo" `(,rust-firefox "cargo"))))
     (description
      "Full-featured browser client built from Firefox source tree, without
-- 
cgit v1.2.3