Updated to 68.4.1

2 files changed, 14 insertions, 189 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e210912..a37776a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@ _modclang=0
 
 _pkgname=firefox
 pkgname=${_pkgname}-esr
-pkgver=68.3.0
+pkgver=68.4.1
 _pkgver=${pkgver}esr
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
@@ -44,7 +44,6 @@ conflicts=(firefox)
 provides=(firefox)
 source=("https://archive.mozilla.org/pub/$_pkgname/releases/$_pkgver/source/$_pkgname-$_pkgver.source.tar.xz"{,.asc}
         no-relinking.patch
-        patch-bindgen-rust1390.patch
         0001-Use-remoting-name-for-GDK-application-names.patch
         $_pkgname.desktop
         distribution.ini
@@ -55,20 +54,19 @@ source=("https://archive.mozilla.org/pub/$_pkgname/releases/$_pkgver/source/$_pk
         arc4_enable-pgo-for-gcc.patch
         arc4_remove-health-reporting.patch
         arc4_remove-system-addons.patch)
-sha256sums=('e131149a70e7ae867d9b0ea081e8c081d056500ee51bb9270df247e977badc69'
-            'SKIP'
-            '2dc9d1aa5eb7798c89f46478f254ae61e4122b4d1956d6044426288627d8a014'
-            'd0c7cc63ce49128e6a53dde7f4116293a51e2144fc329df93dda44b228a8effb'
-            'ab07ab26617ff76fce68e07c66b8aa9b96c2d3e5b5517e51a3c3eac2edd88894'
-            'a9e5264257041c0b968425b5c97436ba48e8d294e1a0f02c59c35461ea245c33'
-            '0ba4d1a619a3a5750a5a48c6bff8c6a69d3aa4be4c303032c5979ab5f68db208'
-            '1cc0730e0f0285f45f30feeeee6d7757931b25263b35b041abd71c2e0486210d'
-            '6bf4638134915758466a912dc909fbad165e76cc3807e9eedc659f8f346575fa'
-            'b9833cf28af757e17a34e5c7f9db89b97d5c56b8f55cb6bccb70fc48275318af'
-            'dcf70d24eedab79d811974a75663f0e84c5efca420da61fc444ebe311d0cada9'
-            'a8c15c9d54ef8b360c0932f4ccf5e74954f14e9a9c2a1ae924b6c392075b2b8c'
-            '2e3bf18c73ec3e932f8f2a75495b695f854a0fd883fe2065bff5a7b197cd7e54'
-            '927e400d6920b98d2fe7db2b6498f195135909a76e0da49441223956364d8227')
+b2sums=('918814864e4041b2f04549506ee27b118ab6f5cfb23562b6d1bd3275d1a8836b073f6b42376d6507e5aa7879eb0028d69bdcd4c67615afd07d03279434e38518'
+        'SKIP'
+        '30e0eb38e6e5b25c47475ff45c908acbaa14ba6e0a29891767b4ea07bf707ac19f63a3f31e399b155749bd3102d1cfa0a5b8146032a476ede388f05b2eaffbda'
+        '08c821bece2e71483668eedc0ab3211b1fa5057b7b99fdc9104a1dbab4707d74463f3cbcdce353a1ec4777e479b3ac27a585dd35115339fccb81c83bc0ef763b'
+        '51d7eb22cb568f0437ece2433091d8b54012324edd2fe52ec52cc00f1ad0d4bd84a4d549d78b4d77bbd6ae1c1e7d029d9d4dbff61c60f714362ef791f09fba8b'
+        '877eda442eb4730600dccf209a6e961ad3122ab456bbfda4ff041e8493ebaaf96224ac218360931259ff4214482f6bf65b3a3052f977ade1a274f38ffd859535'
+        'e7c85eb608f7e72513927afca268d6acc9443aebc654942d6e98bb72d6b7411cc004ff3cf851c2df7bc4d34b1cfccacfdb6a83463d976c6b655bb5837bffff9d'
+        'a66abc624721f9d81b2a69624e6aa6bedf01b781d0e0841a22ad467b2e188aae2f4466d7dde8337205f351ce7e44cc74ff42b1548725a955a57c28faf43471dd'
+        'cd3014c83dc1789d6ee5d6090a2c0835148fc317a40960dfde0c2272ef5bee0bc7c30e8a0fd93905433737bfba6362b663625ee4c206637638408cbebf35a870'
+        '2579551298fc7670f4c8a3e3c496e2c92c39614d0960e87c30fa7cf581cd4ebc9d30d86ef69dd000294bafe618fa2087fbd9fd772d9ce2b1613ed8e540469206'
+        '087ea758132905cab848e3a13a13537b42f70ba3a8bfd1ef4e2933d3e874e94038b50ee583b9e7e0c7b7cc7c2cf570f7f613b661f47121b7bf207f433b939f3d'
+        '4c0f100c52721f9d9a840d7de1f1d5310578ef7fbc350c62341d96b2af23d8bcb774a289429693153635964860cbb05074149bf043941dec87a1d86655b4d4b6'
+        '635a84c64ea9dccf41fbde33b58a72a8123ecd841995ad045bd329e23855f56ffce05670fe2d69a12c4cef7a7399bc6becfc5f40bfd8cea9a4006074672a634d')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353')  # Mozilla Software Releases
 
 prepare() {
@@ -78,9 +76,6 @@ prepare() {
   # Avoid relinking during buildsymbols
   patch -Np1 -i ../no-relinking.patch
 
-  # https://svnweb.freebsd.org/ports/head/www/firefox-esr/files/patch-bindgen-rust1390?revision=516995&view=markup&pathrev=516995
-  patch -Np0 -i ../patch-bindgen-rust1390.patch
-
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
 
diff --git a/patch-bindgen-rust1390.patch b/patch-bindgen-rust1390.patch
deleted file mode 100644
index dad6182..0000000
--- a/patch-bindgen-rust1390.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 9696bc1795c75b1b527e2b70d9baf3ced9e3c154 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
-Date: Mon, 23 Sep 2019 17:54:37 +0200
-Subject: [PATCH] ir: Make Ord and PartialOrd implementations agree.
-
-See https://github.com/rust-lang/rust/issues/64710.
-
-Bogus implementations were introduced in 230545e7c, d3e39dc62, and 379bb1663.
-
---- third_party/rust/bindgen/.cargo-checksum.json.orig	2019-11-05 18:32:47 UTC
-+++ third_party/rust/bindgen/.cargo-checksum.json
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"8dc10043d872e68e660ef96edca4d9733f95be45cdad4893462fa929b335014f","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b57cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"}
-\ No newline at end of file
-+{"files":{},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"}
---- third_party/rust/bindgen/src/ir/analysis/has_vtable.rs.orig	2019-10-30 17:36:44 UTC
-+++ third_party/rust/bindgen/src/ir/analysis/has_vtable.rs
-@@ -9,37 +9,22 @@ use std::ops;
- use {HashMap, Entry};
- 
- /// The result of the `HasVtableAnalysis` for an individual item.
--#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)]
-+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
- pub enum HasVtableResult {
--    /// The item has a vtable, but the actual vtable pointer is in a base
--    /// member.
--    BaseHasVtable,
-+    /// The item does not have a vtable pointer.
-+    No,
- 
-     /// The item has a vtable and the actual vtable pointer is within this item.
-     SelfHasVtable,
- 
--    /// The item does not have a vtable pointer.
--    No
-+    /// The item has a vtable, but the actual vtable pointer is in a base
-+    /// member.
-+    BaseHasVtable,
- }
- 
- impl Default for HasVtableResult {
-     fn default() -> Self {
-         HasVtableResult::No
--    }
--}
--
--impl cmp::PartialOrd for HasVtableResult {
--    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
--        use self::HasVtableResult::*;
--
--        match (*self, *rhs) {
--            (x, y) if x == y => Some(cmp::Ordering::Equal),
--            (BaseHasVtable, _) => Some(cmp::Ordering::Greater),
--            (_, BaseHasVtable) => Some(cmp::Ordering::Less),
--            (SelfHasVtable, _) => Some(cmp::Ordering::Greater),
--            (_, SelfHasVtable) => Some(cmp::Ordering::Less),
--            _ => unreachable!(),
--        }
-     }
- }
- 
---- third_party/rust/bindgen/src/ir/analysis/sizedness.rs.orig	2019-10-30 17:36:21 UTC
-+++ third_party/rust/bindgen/src/ir/analysis/sizedness.rs
-@@ -22,13 +22,14 @@ use {HashMap, Entry};
- ///
- /// We initially assume that all types are `ZeroSized` and then update our
- /// understanding as we learn more about each type.
--#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)]
-+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
- pub enum SizednessResult {
--    /// Has some size that is known to be greater than zero. That doesn't mean
--    /// it has a static size, but it is not zero sized for sure. In other words,
--    /// it might contain an incomplete array or some other dynamically sized
--    /// type.
--    NonZeroSized,
-+    /// The type is zero-sized.
-+    ///
-+    /// This means that if it is a C++ type, and is not being used as a base
-+    /// member, then we must add an `_address` byte to enforce the
-+    /// unique-address-per-distinct-object-instance rule.
-+    ZeroSized,
- 
-     /// Whether this type is zero-sized or not depends on whether a type
-     /// parameter is zero-sized or not.
-@@ -52,32 +53,16 @@ pub enum SizednessResult {
-     /// https://github.com/rust-lang/rust-bindgen/issues/586
-     DependsOnTypeParam,
- 
--    /// The type is zero-sized.
--    ///
--    /// This means that if it is a C++ type, and is not being used as a base
--    /// member, then we must add an `_address` byte to enforce the
--    /// unique-address-per-distinct-object-instance rule.
--    ZeroSized,
-+    /// Has some size that is known to be greater than zero. That doesn't mean
-+    /// it has a static size, but it is not zero sized for sure. In other words,
-+    /// it might contain an incomplete array or some other dynamically sized
-+    /// type.
-+    NonZeroSized,
- }
- 
- impl Default for SizednessResult {
-     fn default() -> Self {
-         SizednessResult::ZeroSized
--    }
--}
--
--impl cmp::PartialOrd for SizednessResult {
--    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
--        use self::SizednessResult::*;
--
--        match (*self, *rhs) {
--            (x, y) if x == y => Some(cmp::Ordering::Equal),
--            (NonZeroSized, _) => Some(cmp::Ordering::Greater),
--            (_, NonZeroSized) => Some(cmp::Ordering::Less),
--            (DependsOnTypeParam, _) => Some(cmp::Ordering::Greater),
--            (_, DependsOnTypeParam) => Some(cmp::Ordering::Less),
--            _ => unreachable!(),
--        }
-     }
- }
- 
---- third_party/rust/bindgen/src/ir/derive.rs.orig	2019-10-30 17:36:44 UTC
-+++ third_party/rust/bindgen/src/ir/derive.rs
-@@ -92,10 +92,10 @@ pub trait CanDeriveOrd {
- ///
- /// Initially we assume that we can derive trait for all types and then
- /// update our understanding as we learn more about each type.
--#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord)]
-+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
- pub enum CanDerive {
--    /// No, we cannot.
--    No,
-+    /// Yes, we can derive automatically.
-+    Yes,
- 
-     /// The only thing that stops us from automatically deriving is that
-     /// array with more than maximum number of elements is used.
-@@ -103,29 +103,13 @@ pub enum CanDerive {
-     /// This means we probably can "manually" implement such trait.
-     Manually,
- 
--    /// Yes, we can derive automatically.
--    Yes,
-+    /// No, we cannot.
-+    No,
- }
- 
- impl Default for CanDerive {
-     fn default() -> CanDerive {
-         CanDerive::Yes
--    }
--}
--
--impl cmp::PartialOrd for CanDerive {
--    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
--        use self::CanDerive::*;
--
--        let ordering = match (*self, *rhs) {
--            (x, y) if x == y => cmp::Ordering::Equal,
--            (No, _) => cmp::Ordering::Greater,
--            (_, No) => cmp::Ordering::Less,
--            (Manually, _) => cmp::Ordering::Greater,
--            (_, Manually) => cmp::Ordering::Less,
--            _ => unreachable!()
--        };
--        Some(ordering)
-     }
- }
-