libre/iceweasel: upgrade to v85.0

Update according to upstream changes, including from i686. Libre
patching of onboarding cards not needed anymore as removed upstream [1].

Fix minor typo in Remote Settings patch.

Fix path in _check_build_config() in PKGBUILD.

[1] https://bugzilla.mozilla.org/show_bug.cgi?id=1675127

4 files changed, 13 insertions, 33 deletions

diff --git a/libre/iceweasel/9001-always-sync-remote-settings-with-local-dump.patch b/libre/iceweasel/9001-always-sync-remote-settings-with-local-dump.patch
index d22b7e35d..d72d29d89 100644
--- a/libre/iceweasel/9001-always-sync-remote-settings-with-local-dump.patch
+++ b/libre/iceweasel/9001-always-sync-remote-settings-with-local-dump.patch
@@ -368,7 +368,7 @@ Date: Wed, 30 Dec 2020 17:52:10 +0200
 Subject: [PATCH 05/13] Utils: disable offline checking
 
 Since only local data is read now, it should always return false for the
-current any any future code that relies on it.
+current and any future code that relies on it.
 ---
  services/settings/Utils.jsm | 9 ---------
  1 file changed, 9 deletions(-)
diff --git a/libre/iceweasel/9002-misc-libre.patch b/libre/iceweasel/9002-misc-libre.patch
index 124ff00f2..27c3f3219 100644
--- a/libre/iceweasel/9002-misc-libre.patch
+++ b/libre/iceweasel/9002-misc-libre.patch
@@ -247,28 +247,6 @@ index edd871b..77870fe 100644
 
  addon-page-options-button =
      .title = Tools for all add-ons
-diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
-index 02eb150..abb3af9 100644
---- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
-+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
-@@ -270,7 +270,7 @@ const ONBOARDING_MESSAGES = () => [
-         action: { type: "OPEN_PRIVATE_BROWSER_WINDOW" },
-       },
-     },
--    targeting: "'dynamic' in trailheadTriplet",
-+    targeting: "trailheadTriplet in ['supercharge', 'static'] || 'dynamic' in trailheadTriplet",
-     trigger: { id: "showOnboarding" },
-   },
-   {
-@@ -314,7 +314,7 @@ const ONBOARDING_MESSAGES = () => [
-       },
-     },
-     targeting:
--      "trailheadTriplet in ['supercharge', 'static'] || ('dynamic' in trailheadTriplet && sync.mobileDevices < 1)",
-+      "false",
-     trigger: { id: "showOnboarding" },
-   },
-   {
 diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
 index 4c4ea76..e0f2880 100644
 --- a/browser/locales/en-US/chrome/browser-region/region.properties
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 08f9952e9..6e16afe7c 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -47,10 +47,10 @@
 
 pkgname=iceweasel
 epoch=1
-pkgver=84.0.2
+pkgver=85.0
 pkgrel=1
 pkgrel+=.parabola1
-_brandingver=84.0
+_brandingver=85.0
 _brandingrel=1
 pkgdesc="Standalone web browser derived from Mozilla Firefox"
 arch=(x86_64)
@@ -63,6 +63,8 @@ makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
              python-setuptools python-psutil python-zstandard lld)
 # FIXME: 'mozilla-serarchplugins' package needs re-working (see note in prepare())
 makedepends+=(quilt libxslt imagemagick git jq python-jsonschema)
+# i686: hotfix broken rust linking
+makedepends_i686+=(llvm10-libs)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
@@ -82,18 +84,18 @@ source_armv7h=(arm.patch
                build-arm-libopus.patch)
 source_i686=('avoid-libxul-OOM-python-check.patch'
              'rust-static-disable-network-test-on-static-libraries.patch')
-sha256sums=('92bfd518d4f9760c897388a8e06130b171c1c43524d8af181add9daac2be7b37'
+sha256sums=('5f03712642f5e77de4581d2ba3ee3e87cfa44c3d2fdd8fe0fb56ea05a57f7b50'
             'SKIP'
             '8b236bbf3ae5cb28d1dd742f543c0079fac06af5aa80bc2051defeba95f0ae21'
             '44be8e819b8334ed36e9410d62dbc6c16dd8f8329a191403bfdce3cf2e9181fc'
-            '12c2c1a9e71a83fb0afa0c7baa2b4567796cff9b678a2f8c3ce7cdbe2c721357'
+            '8551c30ee25a90455e65bbd7dc0ffe85eb6a51f1205413914110f879019dc038'
             'SKIP'
-            '2a76ef07190ed545510c638a2491409c27af9bb0c90146924074859cb107cedd'
-            'e4fc091da84f75f701e1f3e336a8d42b746075caf7cb5f23dbb4d8fdd0ac4708'
+            'cf304339edb8ec46bcf6aa410f646ee3df0813387ce0b3ef2c7b27d3a25e8935'
+            '4512ad17a6f9d07b1c146abf5c44dcdf5442cfbe6e8af662db431d5a01a34883'
             'e9d1b74971d58c5b860601bd8c0c11df332dab8be2f61f5d238ba50a5c4efdde'
             '714998c5fc379f54a66ff80a845b7880169cd5b4094b77b719a99d33b65c0940')
 sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353'
-                 'a9c49222de0423b52a0c60965ace4a0793807c9aba18c21a79bd290690e91892')
+                 '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041')
 sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'
                    '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
@@ -109,7 +111,7 @@ eval "_should_skip_pgo=\$_should_skip_pgo_${CARCH}"
 
 
 _check_build_config() {
-  pushd "$srcdir/$pkgname-${pkgver%_*}" > /dev/null
+  pushd "$srcdir/firefox-${pkgver%_*}" > /dev/null
 
   echo "Checking build configuration..."
 
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 81d536cd9..c9ae89cb4 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 a/config/makefiles/rust.mk b/config/makefiles/rust.mk
 --- a/config/makefiles/rust.mk	2020-10-13 20:23:09.920635480 +0200
 +++ b/config/makefiles/rust.mk	2020-10-13 20:24:02.273994137 +0200
-@@ -310,17 +310,17 @@
+@@ -324,17 +324,17 @@
  # the chance of proxy bypasses originating from rust code.
  # The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS.
  # Sanitizers and sancov also fail because compiler-rt hooks network functions.
@@ -19,7 +19,7 @@ diff -rauN a/config/makefiles/rust.mk b/config/makefiles/rust.mk
 +#ifndef MOZ_PROFILE_GENERATE
 +#ifeq ($(OS_ARCH), Linux)
 +#ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
-+#ifndef MOZ_LTO_RUST_CROSS
++#ifndef MOZ_LTO_RUST
 +#ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
 +#	$(call py_action,check_binary,--target --networking $@)
 +#endif