[PATCH] firefox: drop redundant hunk in rust.mk patch

[Michael Forney <mforney%mforney.org@localhost>]

This patch was released in firefox 80, but during patch conflict
resolution in the update, it got applied twice.

Also, restore the context for the remaining hunk of the patch.
---
 www/firefox/distinfo                              |  2 +-
 .../patches/patch-config_makefiles_rust.mk        | 15 +++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 23f4c22c412..0300755248f 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -8,7 +8,7 @@ SHA1 (patch-aa) = 11060461fdaca5661e89651b8ded4a59d2abc4d7
 SHA1 (patch-browser_app_profile_firefox.js) = 89cea0a66457c96ad0b94aaa524aa5942ad781d0
 SHA1 (patch-build_moz.configure_rust.configure) = ee9e207e67709f3c9455b4d22f5f254890e99ca8
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = 781a063fa6ab345face53fd88404ead11ab335b2
-SHA1 (patch-config_makefiles_rust.mk) = 68fc83afe7997f26cf87d46836f952cf9bdbb95c
+SHA1 (patch-config_makefiles_rust.mk) = 9c597f70143b4ef4b466ece8254dc678d51db240
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
 SHA1 (patch-dom_media_CubebUtils.cpp) = 226821d961039ae5c9c50d8615757b73c6bcd80a
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
diff --git a/www/firefox/patches/patch-config_makefiles_rust.mk b/www/firefox/patches/patch-config_makefiles_rust.mk
index d4fbf77c350..f4375ebb87f 100644
--- a/www/firefox/patches/patch-config_makefiles_rust.mk
+++ b/www/firefox/patches/patch-config_makefiles_rust.mk
@@ -1,5 +1,8 @@
 $NetBSD: patch-config_makefiles_rust.mk,v 1.3 2020/08/25 14:35:24 ryoon Exp $
 
+NetBSD doesn't get along with parallel rust builds (it causes issues
+with ld.so) which are the default. Force -j1.
+
 --- config/makefiles/rust.mk.orig	2020-08-19 02:08:50.000000000 +0000
 +++ config/makefiles/rust.mk
 @@ -52,6 +52,9 @@ endif
@@ -12,15 +15,3 @@ $NetBSD: patch-config_makefiles_rust.mk,v 1.3 2020/08/25 14:35:24 ryoon Exp $
  
  # These flags are passed via `cargo rustc` and only apply to the final rustc
  # invocation (i.e., only the top-level crate, not its dependencies).
-@@ -68,6 +71,11 @@ endif
- ifeq (,$(filter 1.38.% 1.39.% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION)))
- RUSTFLAGS += -Cembed-bitcode=yes
- endif
-+# Versions of rust >= 1.45 need -Cembed-bitcode=yes for all crates when
-+# using -Clto.
-+ifeq (,$(filter 1.38.% 1.39.% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION)))
-+RUSTFLAGS += -Cembed-bitcode=yes
-+endif
- endif
- endif
- 
-- 
2.28.0