diff --git a/.gitignore b/.gitignore index b12ccb0..6955502 100644 --- a/.gitignore +++ b/.gitignore @@ -252,3 +252,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2 /thunderbird-langpacks-78.6.1-20210112.tar.xz /thunderbird-78.8.0.source.tar.xz /thunderbird-langpacks-78.8.0-20210222.tar.xz +/thunderbird-78.11.0.source.tar.xz +/thunderbird-langpacks-78.11.0-20210531.tar.xz diff --git a/D87019-thin-vec-big-endian.diff b/D87019-thin-vec-big-endian.diff index bc8589b..d4c2a7e 100644 --- a/D87019-thin-vec-big-endian.diff +++ b/D87019-thin-vec-big-endian.diff @@ -1,24 +1,19 @@ -diff -up firefox-78.1.0/Cargo.lock.D87019-thin-vec-big-endian.diff firefox-78.1.0/Cargo.lock ---- firefox-78.1.0/Cargo.lock.D87019-thin-vec-big-endian.diff 2020-07-22 19:56:54.000000000 +0200 -+++ firefox-78.1.0/Cargo.lock 2020-08-17 17:04:24.133598583 +0200 -@@ -4792,12 +4792,9 @@ checksum = "8eaa81235c7058867fa8c0e7314f +--- thunderbird-78.9.0/Cargo.lock.D87019-thin-vec-big-endian.diff 2021-03-22 11:34:35.584716638 +0100 ++++ thunderbird-78.9.0/Cargo.lock 2021-03-22 12:29:14.140624979 +0100 +@@ -4792,9 +4792,9 @@ checksum = "8eaa81235c7058867fa8c0e7314f [[package]] name = "thin-vec" --version = "0.1.0" +-version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "73fdf4b84c65a85168477b7fb6c498e0716bc9487fba24623389ea7f51708044" --dependencies = [ -- "libc", --] +-checksum = "3a93c9ade36a827a69257925808463db46ffcf193442fad01eb9bdc1d31aed81" +checksum = "dcc760ada4a9f56fc6d0e81bd143984ebc7bb1b875a6891aa2fa613ca7394fc0" [[package]] name = "thiserror" -diff -up firefox-78.1.0/gfx/webrender_bindings/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/gfx/webrender_bindings/Cargo.toml ---- firefox-78.1.0/gfx/webrender_bindings/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-08-17 17:04:24.133598583 +0200 -+++ firefox-78.1.0/gfx/webrender_bindings/Cargo.toml 2020-08-17 17:05:26.984805590 +0200 +--- thunderbird-78.9.0/gfx/webrender_bindings/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-19 22:35:16.000000000 +0100 ++++ thunderbird-78.9.0/gfx/webrender_bindings/Cargo.toml 2021-03-22 11:34:35.587716631 +0100 @@ -20,7 +20,7 @@ nsstring = { path = "../../xpcom/rust/ns bincode = "1.0" uuid = { version = "0.8", features = ["v4"] } @@ -28,18 +23,16 @@ diff -up firefox-78.1.0/gfx/webrender_bindings/Cargo.toml.D87019-thin-vec-big-en swgl = { path = "../wr/swgl" } [dependencies.webrender] -diff -up firefox-78.1.0/intl/l10n/rust/fluent-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/intl/l10n/rust/fluent-ffi/Cargo.toml ---- firefox-78.1.0/intl/l10n/rust/fluent-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:20.000000000 +0200 -+++ firefox-78.1.0/intl/l10n/rust/fluent-ffi/Cargo.toml 2020-08-17 17:04:24.134598587 +0200 +--- thunderbird-78.9.0/intl/l10n/rust/fluent-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-19 22:35:16.000000000 +0100 ++++ thunderbird-78.9.0/intl/l10n/rust/fluent-ffi/Cargo.toml 2021-03-22 11:34:35.589716625 +0100 @@ -10,4 +10,4 @@ fluent-pseudo = "0.2" intl-memoizer = "0.4" unic-langid = "0.8" nsstring = { path = "../../../../xpcom/rust/nsstring" } -thin-vec = { version = "0.1.0", features = ["gecko-ffi"] } +thin-vec = { version = "0.2.1", features = ["gecko-ffi"] } -diff -up firefox-78.1.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml ---- firefox-78.1.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:20.000000000 +0200 -+++ firefox-78.1.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml 2020-08-17 17:04:24.134598587 +0200 +--- thunderbird-78.9.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-19 22:35:16.000000000 +0100 ++++ thunderbird-78.9.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml 2021-03-22 11:34:35.590716623 +0100 @@ -9,7 +9,7 @@ edition = "2018" nserror = { path = "../../../../xpcom/rust/nserror" } nsstring = { path = "../../../../xpcom/rust/nsstring" } @@ -49,9 +42,8 @@ diff -up firefox-78.1.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml.D87019-th fluent-langneg = { version = "0.12.1", features = ["cldr"] } unic-langid = "0.8" unic-langid-ffi = { path = "../unic-langid-ffi" } -diff -up firefox-78.1.0/intl/locale/rust/unic-langid-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/intl/locale/rust/unic-langid-ffi/Cargo.toml ---- firefox-78.1.0/intl/locale/rust/unic-langid-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:20.000000000 +0200 -+++ firefox-78.1.0/intl/locale/rust/unic-langid-ffi/Cargo.toml 2020-08-17 17:04:24.134598587 +0200 +--- thunderbird-78.9.0/intl/locale/rust/unic-langid-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-19 22:35:16.000000000 +0100 ++++ thunderbird-78.9.0/intl/locale/rust/unic-langid-ffi/Cargo.toml 2021-03-22 11:34:35.591716620 +0100 @@ -9,5 +9,5 @@ edition = "2018" nserror = { path = "../../../../xpcom/rust/nserror" } nsstring = { path = "../../../../xpcom/rust/nsstring" } @@ -59,9 +51,8 @@ diff -up firefox-78.1.0/intl/locale/rust/unic-langid-ffi/Cargo.toml.D87019-thin- -thin-vec = { version = "0.1.0", features = ["gecko-ffi"] } +thin-vec = { version = "0.2.1", features = ["gecko-ffi"] } unic-langid = { version = "0.8", features = ["likelysubtags"] } -diff -up firefox-78.1.0/netwerk/socket/neqo_glue/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/netwerk/socket/neqo_glue/Cargo.toml ---- firefox-78.1.0/netwerk/socket/neqo_glue/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-08-17 17:04:24.134598587 +0200 -+++ firefox-78.1.0/netwerk/socket/neqo_glue/Cargo.toml 2020-08-17 17:05:10.352750807 +0200 +--- thunderbird-78.9.0/netwerk/socket/neqo_glue/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-19 22:35:40.000000000 +0100 ++++ thunderbird-78.9.0/netwerk/socket/neqo_glue/Cargo.toml 2021-03-22 11:34:35.600716597 +0100 @@ -14,7 +14,7 @@ neqo-common = { tag = "v0.2.4", git = "h nserror = { path = "../../../xpcom/rust/nserror" } nsstring = { path = "../../../xpcom/rust/nsstring" } @@ -71,9 +62,8 @@ diff -up firefox-78.1.0/netwerk/socket/neqo_glue/Cargo.toml.D87019-thin-vec-big- [dependencies.neqo-crypto] tag = "v0.2.4" -diff -up firefox-78.1.0/security/manager/ssl/cert_storage/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/security/manager/ssl/cert_storage/Cargo.toml ---- firefox-78.1.0/security/manager/ssl/cert_storage/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 19:56:55.000000000 +0200 -+++ firefox-78.1.0/security/manager/ssl/cert_storage/Cargo.toml 2020-08-17 17:04:24.134598587 +0200 +--- thunderbird-78.9.0/security/manager/ssl/cert_storage/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-19 22:35:52.000000000 +0100 ++++ thunderbird-78.9.0/security/manager/ssl/cert_storage/Cargo.toml 2021-03-22 11:34:35.601716594 +0100 @@ -18,6 +18,6 @@ rust_cascade = "0.6.0" sha2 = "^0.8" storage_variant = { path = "../../../../storage/variant" } @@ -82,9 +72,8 @@ diff -up firefox-78.1.0/security/manager/ssl/cert_storage/Cargo.toml.D87019-thin +thin-vec = { version = "0.2.1", features = ["gecko-ffi"] } time = "0.1" xpcom = { path = "../../../../xpcom/rust/xpcom" } -diff -up firefox-78.1.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml ---- firefox-78.1.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-08-17 17:04:24.134598587 +0200 -+++ firefox-78.1.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml 2020-08-17 17:04:52.432691786 +0200 +--- thunderbird-78.9.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-19 22:35:49.000000000 +0100 ++++ thunderbird-78.9.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml 2021-03-22 11:34:35.603716589 +0100 @@ -20,5 +20,5 @@ nserror = { path = "../../../../xpcom/ru nsstring = { path = "../../../../xpcom/rust/nsstring" } xpcom = { path = "../../../../xpcom/rust/xpcom" } @@ -92,9 +81,8 @@ diff -up firefox-78.1.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/ -thin-vec = { version = "0.1", features = ["gecko-ffi"] } +thin-vec = { version = "0.2.1", features = ["gecko-ffi"] } fxa-client = { git = "https://github.com/mozilla/application-services", rev = "61dcc364ac0d6d0816ab88a494bbf20d824b009b", features = ["gecko"] } -diff -up firefox-78.1.0/services/sync/golden_gate/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/services/sync/golden_gate/Cargo.toml ---- firefox-78.1.0/services/sync/golden_gate/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:24.000000000 +0200 -+++ firefox-78.1.0/services/sync/golden_gate/Cargo.toml 2020-08-17 17:04:24.134598587 +0200 +--- thunderbird-78.9.0/services/sync/golden_gate/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-19 22:35:53.000000000 +0100 ++++ thunderbird-78.9.0/services/sync/golden_gate/Cargo.toml 2021-03-22 11:34:35.605716584 +0100 @@ -19,5 +19,5 @@ sync15-traits = { git = "https://github. xpcom = { path = "../../../xpcom/rust/xpcom" } @@ -102,52 +90,28 @@ diff -up firefox-78.1.0/services/sync/golden_gate/Cargo.toml.D87019-thin-vec-big -version = "0.1.0" +version = "0.2.1" features = ["gecko-ffi"] -diff -up firefox-78.1.0/third_party/rust/thin-vec/.cargo-checksum.json.D87019-thin-vec-big-endian.diff firefox-78.1.0/third_party/rust/thin-vec/.cargo-checksum.json ---- firefox-78.1.0/third_party/rust/thin-vec/.cargo-checksum.json.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:29.000000000 +0200 -+++ firefox-78.1.0/third_party/rust/thin-vec/.cargo-checksum.json 2020-08-17 17:04:24.134598587 +0200 +--- thunderbird-78.9.0/third_party/rust/thin-vec/.cargo-checksum.json.D87019-thin-vec-big-endian.diff 2021-03-22 11:34:35.606716581 +0100 ++++ thunderbird-78.9.0/third_party/rust/thin-vec/.cargo-checksum.json 2021-03-22 12:30:38.588587238 +0100 @@ -1 +1 @@ --{"files":{"Cargo.toml":"fb96cad605ae48215811808c1cc1b9a50248f2b14542058094b23983e2f8d8a0","README.md":"c26d7101e3031e7dd8890ce938e50cad7a1e6adf7fc2f2b0d3c36b03afe68c0b","src/heap.rs":"fe84a4ff433568d5713685456d87597ac5dcdb9d5190061a3da8074240ba1bc3","src/lib.rs":"ce36db8e3464dddade7c1ddbe3ee1f5e525af5be492ea51a0d8a0776c1adfc28","src/range.rs":"bac59bcb6230367a39c7e28ac15263e4526f966cd8c72015873017f17c115aaa"},"package":"73fdf4b84c65a85168477b7fb6c498e0716bc9487fba24623389ea7f51708044"} +-{"files":{"Cargo.toml":"7b164cc8a702a204a4732cb4da2940711b8e3be915c258e2a972d4874d767b4c","README.md":"c26d7101e3031e7dd8890ce938e50cad7a1e6adf7fc2f2b0d3c36b03afe68c0b","src/lib.rs":"9f2a087cabfe0b6f83818323bb9004b45fe7548c51376816fd8d4572256bd0e8","src/range.rs":"bac59bcb6230367a39c7e28ac15263e4526f966cd8c72015873017f17c115aaa"},"package":"3a93c9ade36a827a69257925808463db46ffcf193442fad01eb9bdc1d31aed81"} \ No newline at end of file +{"files":{"Cargo.toml":"754c05523d17eb7591c3ea2c9294e47c05fbb257fed04b78546fb2ec7cafa8b4","README.md":"c26d7101e3031e7dd8890ce938e50cad7a1e6adf7fc2f2b0d3c36b03afe68c0b","src/lib.rs":"627c6094c3f0286dba25bc73f5672c06c5061c25b01c513d213cbdda100673a2"},"package":"dcc760ada4a9f56fc6d0e81bd143984ebc7bb1b875a6891aa2fa613ca7394fc0"} -\ No newline at end of file -diff -up firefox-78.1.0/third_party/rust/thin-vec/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/third_party/rust/thin-vec/Cargo.toml ---- firefox-78.1.0/third_party/rust/thin-vec/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:29.000000000 +0200 -+++ firefox-78.1.0/third_party/rust/thin-vec/Cargo.toml 2020-08-17 17:04:24.135598590 +0200 -@@ -3,7 +3,7 @@ - # When uploading crates to the registry Cargo will automatically - # "normalize" Cargo.toml files for maximal compatibility - # with all versions of Cargo and also rewrite `path` dependencies --# to registry (e.g. crates.io) dependencies -+# to registry (e.g., crates.io) dependencies - # - # If you believe there's an error in this file please file an - # issue against the rust-lang/cargo repository. If you're -@@ -11,16 +11,17 @@ +--- thunderbird-78.9.0/third_party/rust/thin-vec/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-19 22:36:33.000000000 +0100 ++++ thunderbird-78.9.0/third_party/rust/thin-vec/Cargo.toml 2021-03-22 12:32:38.577621737 +0100 +@@ -11,8 +11,9 @@ # will likely look very different (and much more reasonable) [package] +edition = "2018" name = "thin-vec" --version = "0.1.0" +-version = "0.1.2" +version = "0.2.1" authors = ["Alexis Beingessner "] description = "a vec that takes up less space on the stack" homepage = "https://github.com/gankro/thin-vec" - readme = "README.md" - license = "MIT/Apache-2.0" - repository = "https://github.com/gankro/thin-vec" --[dependencies.libc] --version = "0.2" -+ -+[dependencies] - - [features] - default = [] -diff -up firefox-78.1.0/third_party/rust/thin-vec/src/heap.rs.D87019-thin-vec-big-endian.diff firefox-78.1.0/third_party/rust/thin-vec/src/heap.rs -diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big-endian.diff firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs ---- firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:28.000000000 +0200 -+++ firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs 2020-08-17 17:04:24.135598590 +0200 -@@ -1,50 +1,252 @@ +--- thunderbird-78.9.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big-endian.diff 2021-03-19 22:36:28.000000000 +0100 ++++ thunderbird-78.9.0/third_party/rust/thin-vec/src/lib.rs 2021-03-22 12:34:10.271595434 +0100 +@@ -1,47 +1,252 @@ -mod range; +//! ThinVec is exactly the same as Vec, except that it stores its `len` and `capacity` in the buffer +//! it allocates. @@ -297,23 +261,19 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big -use std::ops::{Deref, DerefMut}; +use std::ops::{Deref, DerefMut, RangeBounds}; use std::marker::PhantomData; -+use std::alloc::*; + use std::alloc::*; use std::cmp::*; use std::hash::*; use std::borrow::*; -use range::RangeArgument; use std::ptr::NonNull; --// Heap shimming because reasons. This doesn't unfortunately match the heap api --// right now because reasons. --mod heap; -+use impl_details::*; - -#[cfg(not(feature = "gecko-ffi"))] -type SizeType = usize; -#[cfg(feature = "gecko-ffi")] -type SizeType = u32; -- ++use impl_details::*; + -#[cfg(feature = "gecko-ffi")] -const AUTO_MASK: u32 = 1 << 31; -#[cfg(feature = "gecko-ffi")] @@ -407,7 +367,8 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big + #[cfg(target_endian = "big")] + pub fn is_auto(cap: SizeType) -> bool { + (cap & 1) != 0 -+ } + } +- x as SizeType + + #[inline] + pub fn assert_size(x: usize) -> SizeType { @@ -415,8 +376,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big + panic!("nsTArray size may not exceed the capacity of a 32-bit sized int"); + } + x as SizeType - } -- x as SizeType ++ } + } @@ -427,7 +387,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big #[repr(C)] struct Header { _len: SizeType, -@@ -56,38 +258,10 @@ impl Header { +@@ -53,38 +258,10 @@ impl Header { self._len as usize } @@ -466,7 +426,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big fn data(&self) -> *mut T { let header_size = mem::size_of::
(); let padding = padding::(); -@@ -105,6 +279,41 @@ impl Header { +@@ -102,6 +279,41 @@ impl Header { } } @@ -508,7 +468,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big /// Singleton that all empty collections share. /// Note: can't store non-zero ZSTs, we allocate in that case. We could /// optimize everything to not do that (basically, make ptr == len and branch -@@ -121,9 +330,7 @@ extern { +@@ -118,9 +330,7 @@ extern { // TODO: overflow checks everywhere @@ -519,35 +479,20 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big fn alloc_size(cap: usize) -> usize { // Compute "real" header size with pointer math -@@ -156,15 +363,22 @@ fn alloc_align() -> usize { - max(mem::align_of::(), mem::align_of::
()) - } - --fn header_with_capacity(cap: usize) -> NonNull
{ -- debug_assert!(cap > 0); -+fn layout(cap: usize) -> Layout { +@@ -165,9 +375,10 @@ fn layout(cap: usize) -> Layout { + fn header_with_capacity(cap: usize) -> NonNull
{ + debug_assert!(cap > 0); unsafe { -- let header = heap::allocate( -+ Layout::from_size_align_unchecked( - alloc_size::(cap), - alloc_align::(), -- ) as *mut Header; -+ ) -+ } -+} - -- if header.is_null() { oom() } -+fn header_with_capacity(cap: usize) -> NonNull
{ -+ debug_assert!(cap > 0); -+ unsafe { +- let header = alloc(layout::(cap)) as *mut Header; + let layout = layout::(cap); + let header = alloc(layout) as *mut Header; -+ + +- if header.is_null() { oom() } + if header.is_null() { handle_alloc_error(layout) } // "Infinite" capacity for zero-sized types: (*header).set_cap(if mem::size_of::() == 0 { MAX_CAP } else { cap }); -@@ -176,28 +390,8 @@ fn header_with_capacity(cap: usize) - +@@ -179,28 +390,8 @@ fn header_with_capacity(cap: usize) - @@ -578,7 +523,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big pub struct ThinVec { ptr: NonNull
, boo: PhantomData, -@@ -627,15 +821,15 @@ impl ThinVec { +@@ -630,15 +821,15 @@ impl ThinVec { } pub fn drain(&mut self, range: R) -> Drain @@ -597,35 +542,11 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big Bound::Included(&n) => n + 1, Bound::Excluded(&n) => n, Bound::Unbounded => len, -@@ -666,9 +860,10 @@ impl ThinVec { +@@ -688,11 +879,30 @@ impl ThinVec { + alloc_size::(new_cap), + ) as *mut Header; - unsafe fn deallocate(&mut self) { - if self.has_allocation() { -- heap::deallocate(self.ptr() as *mut u8, -- alloc_size::(self.capacity()), -- alloc_align::()); -+ dealloc( -+ self.ptr() as *mut u8, -+ layout::(self.capacity()), -+ ) - } - } - -@@ -678,15 +873,36 @@ impl ThinVec { - debug_assert!(new_cap > 0); - if self.has_allocation() { - let old_cap = self.capacity(); -- let ptr = heap::reallocate(self.ptr() as *mut u8, -- alloc_size::(old_cap), -- alloc_size::(new_cap), -- alloc_align::()) as *mut Header; - if ptr.is_null() { oom() } -+ let ptr = realloc( -+ self.ptr() as *mut u8, -+ layout::(old_cap), -+ alloc_size::(new_cap), -+ ) as *mut Header; -+ + if ptr.is_null() { handle_alloc_error(layout::(new_cap)) } (*ptr).set_cap(new_cap); self.ptr = NonNull::new_unchecked(ptr); @@ -654,7 +575,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big } } -@@ -1087,10 +1303,7 @@ mod tests { +@@ -1093,10 +1303,7 @@ mod tests { use std::mem::size_of; assert_eq!(size_of::>(), size_of::<&u8>()); @@ -666,7 +587,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big } #[test] -@@ -1725,7 +1938,6 @@ mod std_tests { +@@ -1731,7 +1938,6 @@ mod std_tests { assert_eq!(v, &[(), ()]); } @@ -674,7 +595,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big #[test] fn test_drain_inclusive_range() { let mut v = thin_vec!['a', 'b', 'c', 'd', 'e']; -@@ -1755,6 +1967,7 @@ mod std_tests { +@@ -1761,6 +1967,7 @@ mod std_tests { } #[test] @@ -682,7 +603,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big fn test_drain_max_vec_size() { let mut v = ThinVec::<()>::with_capacity(usize::max_value()); unsafe { v.set_len(usize::max_value()); } -@@ -1775,7 +1988,6 @@ mod std_tests { +@@ -1781,7 +1988,6 @@ mod std_tests { let mut v = thin_vec![1, 2, 3, 4, 5]; v.drain(5..=5); } @@ -690,7 +611,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big /* TODO: implement splice? #[test] -@@ -2181,7 +2393,7 @@ mod std_tests { +@@ -2187,7 +2393,7 @@ mod std_tests { assert!(v.capacity() >= 33) } @@ -699,10 +620,8 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big #[test] fn test_try_reserve() { -diff -up firefox-78.1.0/third_party/rust/thin-vec/src/range.rs.D87019-thin-vec-big-endian.diff firefox-78.1.0/third_party/rust/thin-vec/src/range.rs -diff -up firefox-78.1.0/toolkit/components/cascade_bloom_filter/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/toolkit/components/cascade_bloom_filter/Cargo.toml ---- firefox-78.1.0/toolkit/components/cascade_bloom_filter/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:29.000000000 +0200 -+++ firefox-78.1.0/toolkit/components/cascade_bloom_filter/Cargo.toml 2020-08-17 17:04:24.135598590 +0200 +--- thunderbird-78.9.0/toolkit/components/cascade_bloom_filter/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-19 22:36:12.000000000 +0100 ++++ thunderbird-78.9.0/toolkit/components/cascade_bloom_filter/Cargo.toml 2021-03-22 11:37:44.287130273 +0100 @@ -8,5 +8,5 @@ nserror = { path = "../../../xpcom/rust/ nsstring = { path = "../../../xpcom/rust/nsstring" } rental = "0.5.5" @@ -710,9 +629,8 @@ diff -up firefox-78.1.0/toolkit/components/cascade_bloom_filter/Cargo.toml.D8701 -thin-vec = { version = "0.1.0", features = ["gecko-ffi"] } +thin-vec = { version = "0.2.1", features = ["gecko-ffi"] } xpcom = { path = "../../../xpcom/rust/xpcom" } -diff -up firefox-78.1.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml ---- firefox-78.1.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:30.000000000 +0200 -+++ firefox-78.1.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml 2020-08-17 17:04:24.135598590 +0200 +--- thunderbird-78.9.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-19 22:36:28.000000000 +0100 ++++ thunderbird-78.9.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml 2021-03-22 11:37:44.288130270 +0100 @@ -13,7 +13,7 @@ moz_task = { path = "../../../../../xpco nserror = { path = "../../../../../xpcom/rust/nserror" } nsstring = { path = "../../../../../xpcom/rust/nsstring" } @@ -722,9 +640,8 @@ diff -up firefox-78.1.0/toolkit/components/extensions/storage/webext_storage_bri xpcom = { path = "../../../../../xpcom/rust/xpcom" } serde = "1" serde_json = "1" -diff -up firefox-78.1.0/toolkit/components/kvstore/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/toolkit/components/kvstore/Cargo.toml ---- firefox-78.1.0/toolkit/components/kvstore/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:30.000000000 +0200 -+++ firefox-78.1.0/toolkit/components/kvstore/Cargo.toml 2020-08-17 17:04:24.135598590 +0200 +--- thunderbird-78.9.0/toolkit/components/kvstore/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-19 22:36:33.000000000 +0100 ++++ thunderbird-78.9.0/toolkit/components/kvstore/Cargo.toml 2021-03-22 11:37:44.289130267 +0100 @@ -18,7 +18,7 @@ rkv = "0.10.2" storage_variant = { path = "../../../storage/variant" } xpcom = { path = "../../../xpcom/rust/xpcom" } @@ -734,9 +651,8 @@ diff -up firefox-78.1.0/toolkit/components/kvstore/Cargo.toml.D87019-thin-vec-bi # Get rid of failure's dependency on backtrace. Eventually # backtrace will move into Rust core, but we don't need it here. -diff -up firefox-78.1.0/toolkit/components/places/bookmark_sync/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/toolkit/components/places/bookmark_sync/Cargo.toml ---- firefox-78.1.0/toolkit/components/places/bookmark_sync/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:30.000000000 +0200 -+++ firefox-78.1.0/toolkit/components/places/bookmark_sync/Cargo.toml 2020-08-17 17:04:24.135598590 +0200 +--- thunderbird-78.9.0/toolkit/components/places/bookmark_sync/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-19 22:36:25.000000000 +0100 ++++ thunderbird-78.9.0/toolkit/components/places/bookmark_sync/Cargo.toml 2021-03-22 11:37:44.289130267 +0100 @@ -19,5 +19,5 @@ url = "2.0" xpcom = { path = "../../../../xpcom/rust/xpcom" } @@ -744,9 +660,8 @@ diff -up firefox-78.1.0/toolkit/components/places/bookmark_sync/Cargo.toml.D8701 -version = "0.1.0" +version = "0.2.1" features = ["gecko-ffi"] -diff -up firefox-78.1.0/tools/profiler/rust-helper/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/tools/profiler/rust-helper/Cargo.toml ---- firefox-78.1.0/tools/profiler/rust-helper/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:30.000000000 +0200 -+++ firefox-78.1.0/tools/profiler/rust-helper/Cargo.toml 2020-08-17 17:04:24.135598590 +0200 +--- thunderbird-78.9.0/tools/profiler/rust-helper/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-19 22:36:33.000000000 +0100 ++++ thunderbird-78.9.0/tools/profiler/rust-helper/Cargo.toml 2021-03-22 11:37:44.290130265 +0100 @@ -23,7 +23,7 @@ features = ["endian_fd", "elf32", "elf64 default-features = false @@ -756,9 +671,8 @@ diff -up firefox-78.1.0/tools/profiler/rust-helper/Cargo.toml.D87019-thin-vec-bi features = ["gecko-ffi"] [features] -diff -up firefox-78.1.0/xpcom/rust/xpcom/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/xpcom/rust/xpcom/Cargo.toml ---- firefox-78.1.0/xpcom/rust/xpcom/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:30.000000000 +0200 -+++ firefox-78.1.0/xpcom/rust/xpcom/Cargo.toml 2020-08-17 17:04:24.136598593 +0200 +--- thunderbird-78.9.0/xpcom/rust/xpcom/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-19 22:36:33.000000000 +0100 ++++ thunderbird-78.9.0/xpcom/rust/xpcom/Cargo.toml 2021-03-22 11:37:44.291130262 +0100 @@ -9,4 +9,4 @@ nsstring = { path = "../nsstring" } nserror = { path = "../nserror" } threadbound = "0.1" diff --git a/mozilla-1692893-glib-object.patch b/mozilla-1692893-glib-object.patch deleted file mode 100644 index bfd3056..0000000 --- a/mozilla-1692893-glib-object.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/other-licenses/atk-1.0/atk/atkobject.h b/other-licenses/atk-1.0/atk/atkobject.h ---- a/other-licenses/atk-1.0/atk/atkobject.h -+++ b/other-licenses/atk-1.0/atk/atkobject.h -@@ -20,14 +20,14 @@ - #ifndef __ATK_OBJECT_H__ - #define __ATK_OBJECT_H__ - -+#include -+#include -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ - --#include --#include --#include -- - /* - * AtkObject represents the minimum information all accessible objects - * return. This information includes accessible name, accessible - diff --git a/sources b/sources index 4deb939..b8de2ff 100644 --- a/sources +++ b/sources @@ -8,5 +8,5 @@ SHA512 (nspr-4.25.0-1.el8_0.src.rpm) = 7e39e4484b0d504e1b7f1253d7dc1f9f0d45705fb SHA512 (cbindgen-vendor-0.14.3.tar.xz) = 33c8d28547674121f690eea0d3ebac33926a39caacac787bf8ed8b346478822e74da5a4a1f57ab4df4105fa8376739a2ece888845a85bc5712aaed20e4a508bc SHA512 (nss-3.53.1-3.fc32.src.rpm) = 368849487aa8f9d602c9e5d9d7c88ebd03318aece12470283ff31744ef9eed27ef1e32031378a5a673bb06a9ebbcf5542afa13f3ad465409449c218922189acb SHA512 (nodejs-10.21.0-5.fc32.src.rpm) = 4d0c212a2609dc10e242a96f63baa8babb91e8aa6696f66f627c562c1ba30cb3632ed01991c98f48b5942fc7fd89ee34b350f41de901339b49a2c19e979593a7 -SHA512 (thunderbird-78.8.0.source.tar.xz) = c7d31ab6b2863c14fe7e11df4e805ca0ecd1f6e6b5e7d5ec73939500c5125faeec213b4df25f23a5f152345027926356b7df47efcfa60ff0f9e5b825119f0e51 -SHA512 (thunderbird-langpacks-78.8.0-20210222.tar.xz) = 6a1a26e42ab8e3f2c18896f947bdf0c99fa551f6ad8ac20d4128f3bf3c0f4c4b536954d1665dfafbfd6bc6c77cd68464416f2cc52f9320be67ad0a97cfcc24c1 +SHA512 (thunderbird-78.11.0.source.tar.xz) = c669439ae671a0a589f69902cced5685b8bab346c0ca3eeabd58d0449af338fb7a7a9189d6c2ef784f660c32278fee70766169d91293447eedef2e18a84f116a +SHA512 (thunderbird-langpacks-78.11.0-20210531.tar.xz) = c5f08bbed351890e00bdce694560edad442c938a2782d8fadc15ce596f77ca11bbb33776fa77b3fd59a2040fbe904ac5227a2681a198a50f9e838dad9e87b464 diff --git a/thunderbird.spec b/thunderbird.spec index 5d49141..cf4a051 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -11,6 +11,9 @@ %global rhel_minor_version 4 %endif %if "%{?dist}" == ".el8" +%global rhel_minor_version 5 +%endif +%if "%{?dist}" == ".el8_4" %global rhel_minor_version 4 %endif %if "%{?dist}" == ".el8_3" @@ -177,8 +180,8 @@ %global build_langpacks 1 Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 78.8.0 -Release: 5%{?dist} +Version: 78.11.0 +Release: 2%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -190,7 +193,7 @@ ExcludeArch: s390 ppc # From ftp://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?ext_version}/source Source0: https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}%{?ext_version}-20210222.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20210531.tar.xz # Locales for lightning %endif Source2: cbindgen-vendor-0.14.3.tar.xz @@ -228,7 +231,6 @@ Patch1001: build-ppc64le-inline.patch Patch1002: python-2.7-gcc8-fix.patch Patch1003: python-missing-utimensat.patch Patch1004: build-icu-make.patch -Patch1005: mozilla-1692893-glib-object.patch Patch1006: D89554-autoconf1.diff Patch1007: D94538-autoconf2.diff # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374 @@ -429,6 +431,63 @@ BuildRequires: icu Obsoletes: thunderbird-lightning # ================================================================================== +# Bundled libraries +Provides: bundled(angle) +Provides: bundled(cairo) +Provides: bundled(graphite2) +Provides: bundled(harfbuzz) +Provides: bundled(ots) +Provides: bundled(sfntly) +Provides: bundled(skia) +Provides: bundled(thebes) +Provides: bundled(WebRender) +Provides: bundled(audioipc-2) +Provides: bundled(ffvpx) +Provides: bundled(kissfft) +Provides: bundled(libaom) +Provides: bundled(libcubeb) +Provides: bundled(libdav1d) +Provides: bundled(libjpeg) +Provides: bundled(libmkv) +Provides: bundled(libnestegg) +Provides: bundled(libogg) +Provides: bundled(libopus) +Provides: bundled(libpng) +Provides: bundled(libsoundtouch) +Provides: bundled(libspeex_resampler) +Provides: bundled(libtheora) +Provides: bundled(libtremor) +Provides: bundled(libvorbis) +Provides: bundled(libvpx) +Provides: bundled(libwebp) +Provides: bundled(libyuv) +Provides: bundled(mp4parse-rust) +Provides: bundled(mtransport) +Provides: bundled(openmax_dl) +Provides: bundled(double-conversion) +Provides: bundled(brotli) +Provides: bundled(fdlibm) +Provides: bundled(freetype2) +Provides: bundled(libmar) +Provides: bundled(woff2) +Provides: bundled(xz-embedded) +Provides: bundled(zlib) +Provides: bundled(expat) +Provides: bundled(msgpack-c) +Provides: bundled(libprio) +Provides: bundled(rlbox_sandboxing_api) +Provides: bundled(sqlite3) + +#TB third party libs +Provides: bundled(libgcrypt) +Provides: bundled(libgpg-error) +Provides: bundled(libotr) + +# In case we enable MOZ_OPENPGP add following: +#Provides: bundled(botan) +#Provides: bundled(bzip2) +#Provides: bundled(json-c) +#Provides: bundled(rnp) %description Mozilla Thunderbird is a standalone mail and newsgroup client. @@ -510,7 +569,6 @@ echo "use_bundled_yasm %{?use_bundled_yasm}" %patch1001 -p1 -b .ppc64le-inline %patch1004 -p1 -b .icu-make -%patch1005 -p1 -b .mozilla-1692893-glib-object %patch1006 -p1 -b .D89554-autoconf1.diff %patch1007 -p1 -b .D94538-autoconf2.diff @@ -1255,6 +1313,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Wed Jun 30 2021 Jan Horak - 78.11.0-2 +- Added bundled libraries, update to 78.11 + * Tue Jun 22 2021 Mohan Boddu - 78.8.0-5 - Rebuilt for RHEL 9 BETA for openssl 3.0 Related: rhbz#1971065