firefox-esr: 78.4.0esr

extra/firefox-esr/build

@@ -1,6 +1,54 @@
 #!/bin/sh -e
 
-patch -p1 < no-dbus.patch
+for patch in *.patch; do
+    patch -p1 < "$patch"
+done
+
+# Update some crates which cause build failure with the latest
+# Rust version (1.47.0). Fixes not backported to this ESR.
+# This avoids patching 100 or so files which is just unreasonable.
+# See: https://github.com/rust-lang/rust/issues/76482
+#      https://github.com/rust-lang/rust/issues/76480
+#      https://phabricator.services.mozilla.com/D89473
+#      https://hg.mozilla.org/mozilla-central/rev/281a323cde5f
+#      https://hg.mozilla.org/mozilla-central/rev/da77d5528a08
+#      https://bugzilla.mozilla.org/show_bug.cgi?id=1663715
+#      https://bugzilla.mozilla.org/show_bug.cgi?id=1670579
+(
+    cd third_party/rust
+
+    for crate in *.crate; do
+        crate_name=${crate%-*}
+        crate_ver=${crate##*-}
+        crate_ver=${crate_ver%%.crate}
+
+        # Remove the pre-existing crate's files.
+        rm -rf "$crate_name"
+
+        # Add the updated crate's files.
+        tar xf "$crate"
+
+        # Rename <crate_name>-<crate_ver> to <crate_name>
+        mv -f "${crate%%.crate}" "$crate_name"
+
+        # Generate checksums.
+        sha256=$(sha256sum "$crate")
+        sha256=${sha256%% *}
+
+        # Create .cargo-checksum.json to appease tooling.
+        printf '{"package":"%s","files":{}}\n' "$sha256" \
+            > "$crate_name/.cargo-checksum.json"
+
+        # Update root Cargo.lock to reflect changes.
+        sed -i "/name = \"$crate_name\"/ { 
+            N
+            s/version = \".*\"/version = \"$crate_ver\"/
+            N
+            N
+            s/checksum = \".*\"/checksum = \"$sha256\"/ 
+        }" ../../Cargo.lock
+    done
+)
 
 # Build autoconf 2.13 for Firefox's sole use.
 # See: https://bugzilla.mozilla.org/show_bug.cgi?id=104642

extra/firefox-esr/checksums

@@ -1,4 +1,7 @@
-85273e22d6c31ccd000d72af47530cea3dc52f63f06e53701d9c6c82f68f7bf7
+8e3cf0bbf1062768134db2eb10ab774731ca5ec6694b65def82234bb0a9170fc
 f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e
 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f
 9b4c5c6bd57198abc4c846a1000603007f17e85577d861fd67ee11762a7c1c1b
+5506dc04d46b55e0ce91ae663c9ed13b89e20bfcb53c84989dccf9ff551e8de3
+963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350
+175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29

extra/firefox-esr/depends

@@ -11,7 +11,6 @@ freetype-harfbuzz
 fribidi
 gdk-pixbuf
 glib
-gtk+2         make
 gtk+3
 libICE
 libSM

extra/firefox-esr/sources

@@ -1,4 +1,10 @@
-https://ftp.mozilla.org/pub/firefox/releases/78.3.0esr/source/firefox-78.3.0esr.source.tar.xz
+https://ftp.mozilla.org/pub/firefox/releases/78.4.0esr/source/firefox-78.4.0esr.source.tar.xz
 https://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz autoconf2.13/
 https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz yasm/
 patches/no-dbus.patch
+patches/no-gtk2.patch
+
+# Temporary crate updates to fix issues with Rust 1.47.0.
+# See the build file for more information.
+https://static.crates.io/crates/syn/syn-1.0.40.crate third_party/rust
+https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.20.crate third_party/rust

extra/firefox-esr/version

@@ -1 +1 @@
-78.3.0esr 1
+78.4.0esr 1