From 7ca318736c48aef9fd13a40f7f1cd1de99ff1206 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Thu, 5 Dec 2019 01:11:18 +0100 Subject: [PATCH] up to 68.3.0 - rust 1.39 patch borrowed from arch - removed rust 1.33 patch (unnecessary since 68.0) --- rust-1.33.patch | 103 ---------------------- thunderbird-rust-1.39.patch | 170 ++++++++++++++++++++++++++++++++++++ thunderbird.spec | 124 +++++++++++++------------- 3 files changed, 233 insertions(+), 164 deletions(-) delete mode 100644 rust-1.33.patch create mode 100644 thunderbird-rust-1.39.patch diff --git a/rust-1.33.patch b/rust-1.33.patch deleted file mode 100644 index c37193b..0000000 --- a/rust-1.33.patch +++ /dev/null @@ -1,103 +0,0 @@ -# HG changeset patch -# User Simon Sapin -# Date 1547211824 -3600 -# Node ID f63ebd7e9e281f22e71c268151337178de2c246a -# Parent 4f2e84dc490dbbac2a35799b6b9230c105f2cd35 -Bug 1519729 - Document public macros. r=emilio - -Undocumented public macros emit warnings in nightly-2019-01-11, -and we #![deny] that warning. - -Cherry-picks a commit from https://github.com/servo/servo/pull/22674 - - -diff --git a/servo/components/style/properties/properties.mako.rs b/servo/components/style/properties/properties.mako.rs ---- a/servo/components/style/properties/properties.mako.rs -+++ b/servo/components/style/properties/properties.mako.rs -@@ -3816,17 +3816,24 @@ impl AliasId { - % for property in data.all_aliases(): - AliasId::${property.camel_case} => "${property.camel_case}", - % endfor - }; - formatter.write_str(name) - } - } - --// NOTE(emilio): Callers are responsible to deal with prefs. -+/// Call the given macro with tokens like this for each longhand and shorthand properties -+/// that is enabled in content: -+/// -+/// ``` -+/// [CamelCaseName, SetCamelCaseName, PropertyId::Longhand(LonghandId::CamelCaseName)], -+/// ``` -+/// -+/// NOTE(emilio): Callers are responsible to deal with prefs. - #[macro_export] - macro_rules! css_properties_accessors { - ($macro_name: ident) => { - $macro_name! { - % for kind, props in [("Longhand", data.longhands), ("Shorthand", data.shorthands)]: - % for property in props: - % if property.enabled_in_content(): - % for name in [property.name] + property.alias: -@@ -3839,16 +3846,24 @@ macro_rules! css_properties_accessors { - % endfor - % endif - % endfor - % endfor - } - } - } - -+/// Call the given macro with tokens like this for each longhand properties: -+/// -+/// ``` -+/// { snake_case_ident, true } -+/// ``` -+/// -+/// … where the boolean indicates whether the property value type -+/// is wrapped in a `Box<_>` in the corresponding `PropertyDeclaration` variant. - #[macro_export] - macro_rules! longhand_properties_idents { - ($macro_name: ident) => { - $macro_name! { - % for property in data.longhands: - { ${property.ident}, ${"true" if property.boxed else "false"} } - % endfor - } -# HG changeset patch -# User Emilio Cobos Álvarez -# Date 1547412158 -3600 -# Node ID 1a1d8b9f1a3ab704ab277407823f6f42dd63a3d4 -# Parent a2f691714d70fa6a9119503270809fa0eb8df6c6 -Bug 1519629 - Document a few more macros. - - ---- firefox-60.6.1/servo/components/style/properties/properties.mako.rs.orig 2019-03-22 06:01:07.000000000 +0100 -+++ firefox-60.6.1/servo/components/style/properties/properties.mako.rs 2019-04-14 12:19:55.687706977 +0200 -@@ -55,6 +55,7 @@ - - pub use self::declaration_block::*; - -+/// doc stub - #[cfg(feature = "gecko")] - #[macro_export] - macro_rules! property_name { ---- firefox-60.8.0/servo/components/style_traits/values.rs.orig 2019-07-09 22:38:09.837119875 +0200 -+++ firefox-60.8.0/servo/components/style_traits/values.rs 2019-07-09 22:40:59.863527104 +0200 -@@ -135,6 +135,7 @@ - } - } - -+/// dummy - #[macro_export] - macro_rules! serialize_function { - ($dest: expr, $name: ident($( $arg: expr, )+)) => { -@@ -404,6 +405,7 @@ - impl_to_css_for_predefined_type!(::cssparser::Color); - impl_to_css_for_predefined_type!(::cssparser::UnicodeRange); - -+/// dummy - #[macro_export] - macro_rules! define_css_keyword_enum { - (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => { diff --git a/thunderbird-rust-1.39.patch b/thunderbird-rust-1.39.patch new file mode 100644 index 0000000..bfb71cb --- /dev/null +++ b/thunderbird-rust-1.39.patch @@ -0,0 +1,170 @@ +Based on https://github.com/rust-lang/rust/issues/64710 + +--- a/third_party/rust/bindgen/.cargo-checksum.json ++++ b/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":{"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":"8c92a52c0f859c7bec7bfbc36b9d18f904baab0c8c9dc1b3e7af34de1a0b0da4","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"71f1a37f75b971ea5b0d8457473cc410947dbf706cb6d2c0338916910b78a675","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":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","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 +--- a/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs ++++ b/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs +@@ -9,17 +9,17 @@ 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 { +@@ -28,21 +28,6 @@ impl Default for HasVtableResult { + } + } + +-impl cmp::PartialOrd for HasVtableResult { +- fn partial_cmp(&self, rhs: &Self) -> Option { +- 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!(), +- } +- } +-} +- + impl HasVtableResult { + /// Take the least upper bound of `self` and `rhs`. + pub fn join(self, rhs: Self) -> Self { +--- a/third_party/rust/bindgen/src/ir/analysis/sizedness.rs ++++ b/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,12 +53,11 @@ pub enum SizednessResult { + /// https://github.com/rust-lang-nursery/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 { +@@ -66,21 +66,6 @@ impl Default for SizednessResult { + } + } + +-impl cmp::PartialOrd for SizednessResult { +- fn partial_cmp(&self, rhs: &Self) -> Option { +- 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!(), +- } +- } +-} +- + impl SizednessResult { + /// Take the least upper bound of `self` and `rhs`. + pub fn join(self, rhs: Self) -> Self { +--- a/third_party/rust/bindgen/src/ir/derive.rs ++++ b/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,8 +103,8 @@ 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 { +@@ -113,22 +113,6 @@ impl Default for CanDerive { + } + } + +-impl cmp::PartialOrd for CanDerive { +- fn partial_cmp(&self, rhs: &Self) -> Option { +- 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) +- } +-} +- + impl CanDerive { + /// Take the least upper bound of `self` and `rhs`. + pub fn join(self, rhs: Self) -> Self { diff --git a/thunderbird.spec b/thunderbird.spec index 367a0e8..87801f9 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -32,7 +32,7 @@ curl -s $U | sed -ne 's,.*href="\([^"]\+\)/".*,'"$U"'xpi/\1.xpi,p' %endif %define nspr_ver 4.21 -%define nss_ver 3.44.2 +%define nss_ver 3.44.3 # The actual sqlite version (see RHBZ#480989): %define sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR) @@ -40,134 +40,135 @@ curl -s $U | sed -ne 's,.*href="\([^"]\+\)/".*,'"$U"'xpi/\1.xpi,p' Summary: Thunderbird - email client Summary(pl.UTF-8): Thunderbird - klient poczty Name: thunderbird -Version: 68.2.2 +Version: 68.3.0 Release: 1 License: MPL v2.0 Group: X11/Applications/Mail Source0: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/%{name}-%{version}.source.tar.xz -# Source0-md5: 756560656233ab19187d9fc8bfb37be9 +# Source0-md5: ae99c0e5a7b4068557f8bcca6adf1fde Source1: %{name}.desktop Source2: %{name}.sh Source100: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ar.xpi -# Source100-md5: e0e23bc0949faac5506de35fc73e320b +# Source100-md5: e7dfb16675d0460bde1599c54aefa5e0 Source101: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ast.xpi -# Source101-md5: efaef59db80d341b5294237e796ace6b +# Source101-md5: 6563261aeb843773c9cc53246e76227b Source102: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/be.xpi -# Source102-md5: 7bb106cb9629ef5f3f7c23dafa9c5a3d +# Source102-md5: 8655fabddd80a7709d4ceabad9e0bac4 Source103: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/bg.xpi -# Source103-md5: 7a6c5134a0e948448e2a964105661a89 +# Source103-md5: 112c9855b1834fab1c95811e9a3164de Source104: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/br.xpi -# Source104-md5: 08c27a5e21310bc53b3ebbcf35c3690e +# Source104-md5: 712a8cbad28de0d05c9f305880e85b17 Source105: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ca.xpi -# Source105-md5: 29458700cfc1dbccba2c18e98ca59034 +# Source105-md5: c4a316024469db0ad38974ad234cd61e Source106: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/cs.xpi -# Source106-md5: af877ecd01a1d6c296852d91dcd20679 +# Source106-md5: 9ac70ead76891ad2a9e8aa3b3f10aec8 Source107: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/cy.xpi -# Source107-md5: 3f7e84d7cf789e4c22023a282b5dc8dd +# Source107-md5: 070ffdc07054f5c97ee60440b36df1dd Source108: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/da.xpi -# Source108-md5: 56f8e637df6311191821c14ed48176f2 +# Source108-md5: d85bb213e8a354917b9be15c4efc6f46 Source109: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/de.xpi -# Source109-md5: 9f678c7db3804506654f7430393ce7a9 +# Source109-md5: b4a11f64d5755c5feb9ecc2aabd6cb9a Source110: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/dsb.xpi -# Source110-md5: 506a1e32a20a31bcfd6342ed5f798cf8 +# Source110-md5: 7bc238134417c32f07361b7d2ba58027 Source111: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/el.xpi -# Source111-md5: e9609c20b2baa0a367ba95a1bdaac454 +# Source111-md5: 0c0694b17fb0080030b9afc8915ff320 Source112: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/en-GB.xpi -# Source112-md5: 0b18e6bf8f78e36b9a4a94b0a4a1a853 +# Source112-md5: 428ff03d8fb090ea666eba9cfce72a56 Source113: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/en-US.xpi -# Source113-md5: ac70a3e6b3e75f5e9e93b8dc28d258f9 +# Source113-md5: c0e2d58d578dbb3f3bd264af96fd185c Source114: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/es-AR.xpi -# Source114-md5: d7fa46f270cef81bdcbaea160decadf3 +# Source114-md5: eee3236ba535f92d30f72e51087254e2 Source115: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/es-ES.xpi -# Source115-md5: de7e21256ca167569e41c4fd06276ea5 +# Source115-md5: 68057bfdd9d972b8dae721ebdae7b2db Source116: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/et.xpi -# Source116-md5: c76aeff05961370280a0bd3d400dda06 +# Source116-md5: 4b965259e40147a999c4597f84f8b902 Source117: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/eu.xpi -# Source117-md5: 7847f0390b49e0a7a9fa7ec54094de1c +# Source117-md5: bffe9cd2f24a5d1aac7057d588047ef7 Source118: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fi.xpi -# Source118-md5: 4d83d1f5f7946cc7f0256da248712b05 +# Source118-md5: 86bef7b2647879ac0f20a139bd1b1808 Source119: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fr.xpi -# Source119-md5: 4eea0ab0ba72ebddb838ebfa57fae03f +# Source119-md5: ef01311e3772dc16aa3b05d82a236442 Source120: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/fy-NL.xpi -# Source120-md5: 71ac4030a7719757ec0ef121e77ef780 +# Source120-md5: 06b3e751f783bcc1248de050cc48da4b Source121: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ga-IE.xpi -# Source121-md5: cbcd6bdeef21e49d08e6d68636b89490 +# Source121-md5: 2adaa4a387e81061c108458b5e5f9d3e Source122: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/gd.xpi -# Source122-md5: bb4ac82f190205dcbcb09aaea9da4d43 +# Source122-md5: ce985cb1f9218e34bc230f7b6e92b948 Source123: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/gl.xpi -# Source123-md5: 4ef42408c430726cd34dddb5ea253c15 +# Source123-md5: 854451cbad403539e70da4279d55c474 Source124: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/he.xpi -# Source124-md5: d5d6ec5b3c9115108bd991fe561bb137 +# Source124-md5: 5beed924896b16de4639db306cc30faf Source125: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hr.xpi -# Source125-md5: 3fb0d5243d429b0d9be2150a4b1555b0 +# Source125-md5: fb647ca1e07ebdced3d34f11be2b241f Source126: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hsb.xpi -# Source126-md5: ecf29aba4b9d79c7d9ad422126e8aaf3 +# Source126-md5: 2246012b6c36bdfcad94ccf9cd6157a8 Source127: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hu.xpi -# Source127-md5: 318d838941cfbff9830d66242a57307e +# Source127-md5: 4b794c5b262c584420ec5185905b840e Source128: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/hy-AM.xpi -# Source128-md5: 07688c1d8ed43e8cedfb7260bc60bcc0 +# Source128-md5: e3ed187831efb8e6365a68b31400848b Source129: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/id.xpi -# Source129-md5: 359f4d5eee49425d5467712b27b72c36 +# Source129-md5: 295eae9fb4d360663752e197ec4299a5 Source130: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/is.xpi -# Source130-md5: c74e909137e4fe646aec12e7cc158fdf +# Source130-md5: e237c656e61348bc27b9d13a0af5e43e Source131: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/it.xpi -# Source131-md5: ebd1ae26c744db07a12a1112a21cb583 +# Source131-md5: abefe469ebaaf5888ed75895372ea8be Source132: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ja.xpi -# Source132-md5: 2d0310b087790aa149db4d1e20116887 +# Source132-md5: 6d82a3dea46795dd4dd954a5e73112df Source133: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/kab.xpi -# Source133-md5: 0a35f45e5335168f844c3ce855d29d73 +# Source133-md5: 64e8a6603d5ac0c5f7304503f24efd89 Source134: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/kk.xpi -# Source134-md5: e3d2d8aaad76c46737dfd60eb1ca992b +# Source134-md5: 710a93f265c857990ebd55f8e240659c Source135: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ko.xpi -# Source135-md5: b501d8a73261ccfda656d1db67e5b49d +# Source135-md5: f0dbf62f323258e221d7e5f9f54acc18 Source136: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/lt.xpi -# Source136-md5: f3aa4beb8b60a23e9cce8a85be0328ad +# Source136-md5: fd899a07f43d4c6210c06afa8bfa7cfa Source137: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ms.xpi -# Source137-md5: ea6dc22b1e31fb1ee069704845456b34 +# Source137-md5: 58530c7b5859be299d65295fbacfbfa2 Source138: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nb-NO.xpi -# Source138-md5: b792854e14926960ab1f5d75a6912166 +# Source138-md5: a3052782b9139aadd9a449bff23a3d1b Source139: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nl.xpi -# Source139-md5: a17435e2bbf1e810f0448ef3af96ef07 +# Source139-md5: dc09b61d410ffdcdfc774d7c84b0e0be Source140: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/nn-NO.xpi -# Source140-md5: bfae46487a64facfe392158cb608b2c3 +# Source140-md5: c376364371f42b7d97ab6d11d3f887d7 Source141: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pl.xpi -# Source141-md5: bb03bcf6ea26559c42c9a2c023608f92 +# Source141-md5: 92beaa6a455e616b99357070cab91e0b Source142: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pt-BR.xpi -# Source142-md5: 5ae1f529b38dd13bc92d734ec690303b +# Source142-md5: 4d216755a2fc7ebaff15d9b8d93cd9cc Source143: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/pt-PT.xpi -# Source143-md5: 0bd2db6b0ec201a717ef664538fc10ce +# Source143-md5: 08580aabe0549c1d800d659939bd1d31 Source144: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/rm.xpi -# Source144-md5: 2b0bfa6b84a84a3486b0389c6d3222d9 +# Source144-md5: 059613f288fa80bad6a222787c535e56 Source145: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ro.xpi -# Source145-md5: e9f53def49c36c5169de9760d5033e67 +# Source145-md5: 6532df45d2c282ad0d818ac9ef065ae3 Source146: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/ru.xpi -# Source146-md5: 38ae38e0edcc9f9593d72d8d47e3af0a +# Source146-md5: b797249791b9ba58ac5d779f446307fd Source147: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/si.xpi -# Source147-md5: 302965e2c77be8272a1052868c674494 +# Source147-md5: 8ece6c6595e1c3441e02f7ec12e7a8c8 Source148: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sk.xpi -# Source148-md5: 0b5c7472ee4a077e7c3099e52c95d294 +# Source148-md5: 124233dcb4f48bc883f513adfd27546b Source149: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sl.xpi -# Source149-md5: 326869f3b3eecb7fc3f090aa9fb181f6 +# Source149-md5: 73883cc86b941dd782715bf6ed418045 Source150: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sq.xpi -# Source150-md5: dc74a9d422c72509fd8af8de56ab405d +# Source150-md5: 3c1c3d00ffe8fbf0b02a3505821471a1 Source151: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sr.xpi -# Source151-md5: 862346defb95c7b47ca463de5d037094 +# Source151-md5: f86260911d3e41ea55907878212ad48b Source152: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/sv-SE.xpi -# Source152-md5: 23c13c554647497945883a4bfb42e8f8 +# Source152-md5: 40acf1627e705ff143b36f378611345a Source153: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/tr.xpi -# Source153-md5: e89296ff998e9de86962d7752e9d39ab +# Source153-md5: 479d2bdb23840395966b1ed56fc75709 Source154: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/uk.xpi -# Source154-md5: f3b36825508ed6c97e4f34240fa08ec7 +# Source154-md5: 2fcbeddc1262bf3a4d89a2e099f70194 Source155: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/vi.xpi -# Source155-md5: 099227933b85093cf497c045b519fb88 +# Source155-md5: 4b963a34acd28720eb8e2b0a6c2c9e3d Source156: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/zh-CN.xpi -# Source156-md5: 19da6b1882c9ef31aa6e42a3c70d0330 +# Source156-md5: 7c5c2a9c20fd0ec0831b50a40966887a Source157: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/linux-i686/xpi/zh-TW.xpi -# Source157-md5: 9a269e5684315afe4055194a038f059d +# Source157-md5: e320af3527a161449cc807d6c0c5db05 Patch0: prefs.patch Patch1: no-subshell.patch Patch2: enable-addons.patch Patch3: format.patch +Patch4: %{name}-rust-1.39.patch URL: http://www.mozilla.org/projects/thunderbird/ BuildRequires: alsa-lib-devel BuildRequires: autoconf2_13 >= 2.13 @@ -1255,6 +1256,7 @@ unpack() { %patch1 -p1 %patch2 -p0 %patch3 -p1 +%patch4 -p1 %build cp -p %{_datadir}/automake/config.* build/autoconf -- 2.43.0