libre/iceweasel: update patches

Signed-off-by: Andreas Grapentin <andreas@grapentin.org>

3 files changed, 17 insertions, 22 deletions

diff --git a/libre/iceweasel/avoid-libxul-OOM-python-check.patch b/libre/iceweasel/avoid-libxul-OOM-python-check.patch
index 1e41e7b17..85f32ffba 100644
--- a/libre/iceweasel/avoid-libxul-OOM-python-check.patch
+++ b/libre/iceweasel/avoid-libxul-OOM-python-check.patch
@@ -1,12 +1,12 @@
 diff -rauN a/config/rules.mk b/config/rules.mk
---- a/config/rules.mk	2019-10-25 11:08:20.757231756 +0200
-+++ b/config/rules.mk	2019-10-25 11:11:04.972821611 +0200
-@@ -663,7 +663,7 @@
+--- a/config/rules.mk	2020-04-04 12:24:34.837582901 +0200
++++ b/config/rules.mk	2020-04-04 12:26:14.227584517 +0200
+@@ -608,7 +608,7 @@
  	$(RM) $@
  endif
  	$(MKSHLIB) $($@_OBJS) $(RESFILE) $(LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS)
--	$(call py_action,check_binary,--target $@)
-+#	$(call py_action,check_binary,--target $@)
+-	$(call py3_action,check_binary,--target $@)
++#	$(call py3_action,check_binary,--target $@)
  
  ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
  ifdef MSMANIFEST_TOOL
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index aa74ba3a0..e4adb501a 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -166,19 +166,19 @@ index 2d3c7b4..00221d3 100644
 -#endif
  </dl>
 diff --git a/devtools/client/whats-new/src/main.js b/devtools/client/whats-new/src/main.js
-index 26061a604f..a9016f6bda 100644
+index 0b62b2e74f..1afd87d0e1 100644
 --- a/devtools/client/whats-new/src/main.js
 +++ b/devtools/client/whats-new/src/main.js
 @@ -29,7 +29,7 @@ const aside = {
  };
  
  const release = {
--  title: "What’s New in DevTools (Firefox 75)",
-+  title: "What’s New in DevTools (Iceweasel 75)",
+-  title: "What’s New in DevTools (Firefox 76)",
++  title: "What’s New in DevTools (Iceweasel 76)",
    linkText: "Read more",
-   linkUrl: `https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/75?${utmParams}`,
+   linkUrl: `https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/76?${utmParams}`,
    features: [
-@@ -66,24 +66,6 @@ const release = {
+@@ -66,19 +66,6 @@ const release = {
    ],
  };
  
@@ -192,18 +192,13 @@ index 26061a604f..a9016f6bda 100644
 -      description: `Step through event, timeout and promise-based function calls over time with the full-featured async stacks in Debugger.`,
 -      href: `https://developer.mozilla.org/en-US/docs/Tools/Debugger/UI_Tour?${utmParams}`,
 -    },
--    {
--      header: `Inspect & Debug Service Workers`,
--      description: `Start, pause and debug your Service Workers and inspect your Web App Manifests within the long-awaited Application panel.`,
--      href: `https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API/Using_Service_Workers?${utmParams}`,
--    },
 -  ],
 -};
 -
  function openLink(href, e) {
    return openDocLink(href, {
      relatedToCurrent: true,
-@@ -177,11 +159,6 @@ class App extends Component {
+@@ -172,11 +159,6 @@ class App extends Component {
            ...release.features
              .filter(feature => !feature.hidden)
              .map(feature => createFactory(Feature)(feature))
diff --git a/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch b/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
index f5e0f6a0a..bece16a04 100644
--- a/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
+++ b/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
@@ -1,7 +1,7 @@
-diff -rauN firefox-72.0.1/config/makefiles/rust.mk firefox-72.0.1-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk
---- firefox-72.0.1/config/makefiles/rust.mk	2020-01-08 02:23:30.000000000 +0100
-+++ firefox-72.0.1-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk	2020-01-10 12:17:40.172666172 +0100
-@@ -292,17 +292,17 @@
+diff -rauN firefox-74.0.1/config/makefiles/rust.mk firefox-74.0.1-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk
+--- firefox-74.0.1/config/makefiles/rust.mk	2020-04-03 13:10:23.000000000 +0200
++++ firefox-74.0.1-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk	2020-04-04 12:31:27.804227950 +0200
+@@ -283,17 +283,17 @@
  # the chance of proxy bypasses originating from rust code.
  # The check only works when rust code is built with -Clto.
  # Enabling sancov or TSan also causes this to fail.
@@ -10,7 +10,7 @@ diff -rauN firefox-72.0.1/config/makefiles/rust.mk firefox-72.0.1-rust-static-di
 -ifeq ($(OS_ARCH), Linux)
 -ifeq (,$(rustflags_sancov))
 -ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
--	$(call py_action,check_binary,--target --networking $@)
+-	$(call py3_action,check_binary,--target --networking $@)
 -endif
 -endif
 -endif
@@ -21,7 +21,7 @@ diff -rauN firefox-72.0.1/config/makefiles/rust.mk firefox-72.0.1-rust-static-di
 +#ifeq ($(OS_ARCH), Linux)
 +#ifeq (,$(rustflags_sancov))
 +#ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
-+#	$(call py_action,check_binary,--target --networking $@)
++#	$(call py3_action,check_binary,--target --networking $@)
 +#endif
 +#endif
 +#endif