Upstream release: thunderbird-102.12.0-1.el9_2
This commit is contained in:
parent
8a335bfbee
commit
8b3ebc9085
80
.gitignore
vendored
80
.gitignore
vendored
@ -1,74 +1,6 @@
|
||||
/cbindgen-vendor.tar.xz
|
||||
/nspr-4.32.0-1.el8_1.src.rpm
|
||||
/nss-3.67.0-6.el8_1.src.rpm
|
||||
/thunderbird-91.1.2.processed-source.tar.xz
|
||||
/thunderbird-langpacks-91.1.2-20210929.tar.xz
|
||||
/thunderbird-langpacks-91.2.0-20211004.tar.xz
|
||||
/thunderbird-91.2.0.processed-source.tar.xz
|
||||
/thunderbird-91.3.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-91.3.0-20211101.tar.xz
|
||||
/thunderbird-langpacks-91.3.0-20211102.tar.xz
|
||||
/thunderbird-91.4.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-91.4.0-20211201.tar.xz
|
||||
/nss-3.67.0-7.el8_1.src.rpm
|
||||
/thunderbird-langpacks-91.4.0-20211206.tar.xz
|
||||
/thunderbird-91.5.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-91.5.0-20220107.tar.xz
|
||||
/thunderbird-langpacks-91.6.0-20220207.tar.xz
|
||||
/thunderbird-91.6.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-91.7.0-20220303.tar.xz
|
||||
/thunderbird-91.7.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-91.7.0-20220308.tar.xz
|
||||
/thunderbird-langpacks-91.8.0-20220405.tar.xz
|
||||
/thunderbird-91.8.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-91.9.0-20220428.tar.xz
|
||||
/thunderbird-91.9.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-91.9.0-20220502.tar.xz
|
||||
/thunderbird-langpacks-91.9.0-20220503.tar.xz
|
||||
/thunderbird-91.9.1.processed-source.tar.xz
|
||||
/thunderbird-langpacks-91.9.1-20220523.tar.xz
|
||||
/thunderbird-91.10.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-91.10.0-20220530.tar.xz
|
||||
/thunderbird-91.11.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-91.11.0-20220623.tar.xz
|
||||
/thunderbird-91.11.0.b2.processed-source.tar.xz
|
||||
/thunderbird-langpacks-91.11.0-20220628.tar.xz
|
||||
/thunderbird-91.12.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-91.12.0-20220725.tar.xz
|
||||
/thunderbird-91.13.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-91.13.0-20220819.tar.xz
|
||||
/nss-3.79.0-6.el8_1.src.rpm
|
||||
/nspr-4.34.0-3.el8_1.src.rpm
|
||||
/thunderbird-102.2.1.source.tar.xz
|
||||
/thunderbird-langpacks-102.2.1-20220901.tar.xz
|
||||
/thunderbird-102.2.1.processed-source.tar.xz
|
||||
/thunderbird-102.3.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-102.3.0-20220916.tar.xz
|
||||
/thunderbird-langpacks-102.4.0-20221017.tar.xz
|
||||
/thunderbird-102.4.0.processed-source.tar.xz
|
||||
/thunderbird-102.5.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-102.5.0-20221111.tar.xz
|
||||
/thunderbird-langpacks-102.5.0-20221115.tar.xz
|
||||
/thunderbird-102.6.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-102.6.0-20221209.tar.xz
|
||||
/thunderbird-langpacks-102.6.0-20221213.tar.xz
|
||||
/thunderbird-102.7.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-102.7.0-20230116.tar.xz
|
||||
/thunderbird-102.7.1.processed-source.tar.xz
|
||||
/thunderbird-langpacks-102.7.1-20230124.tar.xz
|
||||
/thunderbird-langpacks-102.7.1-20230131.tar.xz
|
||||
/thunderbird-102.8.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-102.8.0-20230210.tar.xz
|
||||
/thunderbird-102.8.0.b2.processed-source.tar.xz
|
||||
/thunderbird-langpacks-102.8.0-20230215.tar.xz
|
||||
/thunderbird-102.9.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-102.9.0-20230313.tar.xz
|
||||
/nss-3.79.0-11.el8_1.src.rpm
|
||||
/thunderbird-102.10.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-102.10.0-20230406.tar.xz
|
||||
/thunderbird-102.10.0.b2.processed-source.tar.xz
|
||||
/thunderbird-langpacks-102.10.0-20230411.tar.xz
|
||||
/thunderbird-102.11.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-102.11.0-20230504.tar.xz
|
||||
/thunderbird-102.12.0.processed-source.tar.xz
|
||||
/thunderbird-langpacks-102.12.0-20230605.tar.xz
|
||||
SOURCES/cbindgen-vendor.tar.xz
|
||||
SOURCES/nspr-4.34.0-3.el8_1.src.rpm
|
||||
SOURCES/nss-3.79.0-11.el8_1.src.rpm
|
||||
SOURCES/thunderbird-102.12.0.processed-source.tar.xz
|
||||
SOURCES/thunderbird-langpacks-102.12.0-20230605.tar.xz
|
||||
SOURCES/thunderbird-symbolic.svg
|
||||
|
||||
6
.thunderbird.metadata
Normal file
6
.thunderbird.metadata
Normal file
@ -0,0 +1,6 @@
|
||||
2a430d6252dbea45482ba316a6e9fa605c15e747 SOURCES/cbindgen-vendor.tar.xz
|
||||
af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm
|
||||
a9dd43799ab2ccbc248cfbba1cc5639c1ab18769 SOURCES/nss-3.79.0-11.el8_1.src.rpm
|
||||
8ce700338c81646043db590faf9840c4bcd22461 SOURCES/thunderbird-102.12.0.processed-source.tar.xz
|
||||
c08e237c0ee084ed42fb79c68994ad07257a1155 SOURCES/thunderbird-langpacks-102.12.0-20230605.tar.xz
|
||||
42e80b86948cdba0f69af5b15a69bc6a1274d938 SOURCES/thunderbird-symbolic.svg
|
||||
@ -1,681 +0,0 @@
|
||||
--- 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.2"
|
||||
+version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "3a93c9ade36a827a69257925808463db46ffcf193442fad01eb9bdc1d31aed81"
|
||||
+checksum = "dcc760ada4a9f56fc6d0e81bd143984ebc7bb1b875a6891aa2fa613ca7394fc0"
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
--- 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"] }
|
||||
fxhash = "0.2.1"
|
||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
||||
swgl = { path = "../wr/swgl" }
|
||||
|
||||
[dependencies.webrender]
|
||||
--- 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"] }
|
||||
--- 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" }
|
||||
xpcom = { path = "../../../../xpcom/rust/xpcom" }
|
||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
||||
fluent-langneg = { version = "0.12.1", features = ["cldr"] }
|
||||
unic-langid = "0.8"
|
||||
unic-langid-ffi = { path = "../unic-langid-ffi" }
|
||||
--- 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" }
|
||||
xpcom = { path = "../../../../xpcom/rust/xpcom" }
|
||||
-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"] }
|
||||
--- 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" }
|
||||
xpcom = { path = "../../../xpcom/rust/xpcom" }
|
||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
||||
|
||||
[dependencies.neqo-crypto]
|
||||
tag = "v0.2.4"
|
||||
--- 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" }
|
||||
tempfile = "3"
|
||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
||||
time = "0.1"
|
||||
xpcom = { path = "../../../../xpcom/rust/xpcom" }
|
||||
--- 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" }
|
||||
storage_variant = { path = "../../../../storage/variant" }
|
||||
-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"] }
|
||||
--- 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" }
|
||||
|
||||
[dependencies.thin-vec]
|
||||
-version = "0.1.0"
|
||||
+version = "0.2.1"
|
||||
features = ["gecko-ffi"]
|
||||
--- 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":"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"}
|
||||
--- 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.2"
|
||||
+version = "0.2.1"
|
||||
authors = ["Alexis Beingessner <a.beingessner@gmail.com>"]
|
||||
description = "a vec that takes up less space on the stack"
|
||||
homepage = "https://github.com/gankro/thin-vec"
|
||||
--- 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.
|
||||
+//!
|
||||
+//! This makes the memory footprint of ThinVecs lower; notably in cases where space is reserved for
|
||||
+//! a non-existence ThinVec<T>. So `Vec<ThinVec<T>>` and `Option<ThinVec<T>>::None` will waste less
|
||||
+//! space. Being pointer-sized also means it can be passed/stored in registers.
|
||||
+//!
|
||||
+//! Of course, any actually constructed ThinVec will theoretically have a bigger allocation, but
|
||||
+//! the fuzzy nature of allocators means that might not actually be the case.
|
||||
+//!
|
||||
+//! Properties of Vec that are preserved:
|
||||
+//! * `ThinVec::new()` doesn't allocate (it points to a statically allocated singleton)
|
||||
+//! * reallocation can be done in place
|
||||
+//! * `size_of::<ThinVec<T>>()` == `size_of::<Option<ThinVec<T>>>()`
|
||||
+//!
|
||||
+//! Properties of Vec that aren't preserved:
|
||||
+//! * `ThinVec<T>` can't ever be zero-cost roundtripped to a `Box<[T]>`, `String`, or `*mut T`
|
||||
+//! * `from_raw_parts` doesn't exist
|
||||
+//! * ThinVec currently doesn't bother to not-allocate for Zero Sized Types (e.g. `ThinVec<()>`),
|
||||
+//! but it could be done if someone cared enough to implement it.
|
||||
+//!
|
||||
+//!
|
||||
+//!
|
||||
+//! # Gecko FFI
|
||||
+//!
|
||||
+//! If you enable the gecko-ffi feature, ThinVec will verbatim bridge with the nsTArray type in
|
||||
+//! Gecko (Firefox). That is, ThinVec and nsTArray have identical layouts *but not ABIs*,
|
||||
+//! so nsTArrays/ThinVecs an be natively manipulated by C++ and Rust, and ownership can be
|
||||
+//! transferred across the FFI boundary (**IF YOU ARE CAREFUL, SEE BELOW!!**).
|
||||
+//!
|
||||
+//! While this feature is handy, it is also inherently dangerous to use because Rust and C++ do not
|
||||
+//! know about eachother. Specifically, this can be an issue with non-POD types (types which
|
||||
+//! have destructors, move constructors, or are `!Copy`).
|
||||
+//!
|
||||
+//! ## Do Not Pass By Value
|
||||
+//!
|
||||
+//! The biggest thing to keep in mind is that **FFI functions cannot pass ThinVec/nsTArray
|
||||
+//! by-value**. That is, these are busted APIs:
|
||||
+//!
|
||||
+//! ```rust,ignore
|
||||
+//! // BAD WRONG
|
||||
+//! extern fn process_data(data: ThinVec<u32>) { ... }
|
||||
+//! // BAD WRONG
|
||||
+//! extern fn get_data() -> ThinVec<u32> { ... }
|
||||
+//! ```
|
||||
+//!
|
||||
+//! You must instead pass by-reference:
|
||||
+//!
|
||||
+//! ```rust
|
||||
+//! # use thin_vec::*;
|
||||
+//! # use std::mem;
|
||||
+//!
|
||||
+//! // Read-only access, ok!
|
||||
+//! extern fn process_data(data: &ThinVec<u32>) {
|
||||
+//! for val in data {
|
||||
+//! println!("{}", val);
|
||||
+//! }
|
||||
+//! }
|
||||
+//!
|
||||
+//! // Replace with empty instance to take ownership, ok!
|
||||
+//! extern fn consume_data(data: &mut ThinVec<u32>) {
|
||||
+//! let owned = mem::replace(data, ThinVec::new());
|
||||
+//! mem::drop(owned);
|
||||
+//! }
|
||||
+//!
|
||||
+//! // Mutate input, ok!
|
||||
+//! extern fn add_data(dataset: &mut ThinVec<u32>) {
|
||||
+//! dataset.push(37);
|
||||
+//! dataset.push(12);
|
||||
+//! }
|
||||
+//!
|
||||
+//! // Return via out-param, usually ok!
|
||||
+//! //
|
||||
+//! // WARNING: output must be initialized! (Empty nsTArrays are free, so just do it!)
|
||||
+//! extern fn get_data(output: &mut ThinVec<u32>) {
|
||||
+//! *output = thin_vec![1, 2, 3, 4, 5];
|
||||
+//! }
|
||||
+//! ```
|
||||
+//!
|
||||
+//! Ignorable Explanation For Those Who Really Want To Know Why:
|
||||
+//!
|
||||
+//! > The fundamental issue is that Rust and C++ can't currently communicate about destructors, and
|
||||
+//! > the semantics of C++ require destructors of function arguments to be run when the function
|
||||
+//! > returns. Whether the callee or caller is responsible for this is also platform-specific, so
|
||||
+//! > trying to hack around it manually would be messy.
|
||||
+//! >
|
||||
+//! > Also a type having a destructor changes its C++ ABI, because that type must actually exist
|
||||
+//! > in memory (unlike a trivial struct, which is often passed in registers). We don't currently
|
||||
+//! > have a way to communicate to Rust that this is happening, so even if we worked out the
|
||||
+//! > destructor issue with say, MaybeUninit, it would still be a non-starter without some RFCs
|
||||
+//! > to add explicit rustc support.
|
||||
+//! >
|
||||
+//! > Realistically, the best answer here is to have a "heavier" bindgen that can secretly
|
||||
+//! > generate FFI glue so we can pass things "by value" and have it generate by-reference code
|
||||
+//! > behind our back (like the cxx crate does). This would muddy up debugging/searchfox though.
|
||||
+//!
|
||||
+//! ## Types Should Be Trivially Relocatable
|
||||
+//!
|
||||
+//! Types in Rust are always trivially relocatable (unless suitably borrowed/[pinned][]/hidden).
|
||||
+//! This means all Rust types are legal to relocate with a bitwise copy, you cannot provide
|
||||
+//! copy or move constructors to execute when this happens, and the old location won't have its
|
||||
+//! destructor run. This will cause problems for types which have a significant location
|
||||
+//! (types that intrusively point into themselves or have their location registered with a service).
|
||||
+//!
|
||||
+//! While relocations are generally predictable if you're very careful, **you should avoid using
|
||||
+//! types with significant locations with Rust FFI**.
|
||||
+//!
|
||||
+//! Specifically, ThinVec will trivially relocate its contents whenever it needs to reallocate its
|
||||
+//! buffer to change its capacity. This is the default reallocation strategy for nsTArray, and is
|
||||
+//! suitable for the vast majority of types. Just be aware of this limitation!
|
||||
+//!
|
||||
+//! ## Auto Arrays Are Dangerous
|
||||
+//!
|
||||
+//! ThinVec has *some* support for handling auto arrays which store their buffer on the stack,
|
||||
+//! but this isn't well tested.
|
||||
+//!
|
||||
+//! Regardless of how much support we provide, Rust won't be aware of the buffer's limited lifetime,
|
||||
+//! so standard auto array safety caveats apply about returning/storing them! ThinVec won't ever
|
||||
+//! produce an auto array on its own, so this is only an issue for transferring an nsTArray into
|
||||
+//! Rust.
|
||||
+//!
|
||||
+//! ## Other Issues
|
||||
+//!
|
||||
+//! Standard FFI caveats also apply:
|
||||
+//!
|
||||
+//! * Rust is more strict about POD types being initialized (use MaybeUninit if you must)
|
||||
+//! * `ThinVec<T>` has no idea if the C++ version of `T` has move/copy/assign/delete overloads
|
||||
+//! * `nsTArray<T>` has no idea if the Rust version of `T` has a Drop/Clone impl
|
||||
+//! * C++ can do all sorts of unsound things that Rust can't catch
|
||||
+//! * C++ and Rust don't agree on how zero-sized/empty types should be handled
|
||||
+//!
|
||||
+//! The gecko-ffi feature will not work if you aren't linking with code that has nsTArray
|
||||
+//! defined. Specifically, we must share the symbol for nsTArray's empty singleton. You will get
|
||||
+//! linking errors if that isn't defined.
|
||||
+//!
|
||||
+//! The gecko-ffi feature also limits ThinVec to the legacy behaviors of nsTArray. Most notably,
|
||||
+//! nsTArray has a maximum capacity of i32::MAX (~2.1 billion items). Probably not an issue.
|
||||
+//! Probably.
|
||||
+//!
|
||||
+//! [pinned]: https://doc.rust-lang.org/std/pin/index.html
|
||||
|
||||
use std::{fmt, io, ptr, mem, slice};
|
||||
use std::collections::Bound;
|
||||
use std::iter::FromIterator;
|
||||
use std::slice::IterMut;
|
||||
-use std::ops::{Deref, DerefMut};
|
||||
+use std::ops::{Deref, DerefMut, RangeBounds};
|
||||
use std::marker::PhantomData;
|
||||
use std::alloc::*;
|
||||
use std::cmp::*;
|
||||
use std::hash::*;
|
||||
use std::borrow::*;
|
||||
-use range::RangeArgument;
|
||||
use std::ptr::NonNull;
|
||||
|
||||
-#[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")]
|
||||
-const CAP_MASK: u32 = !AUTO_MASK;
|
||||
+// modules: a simple way to cfg a whole bunch of impl details at once
|
||||
|
||||
#[cfg(not(feature = "gecko-ffi"))]
|
||||
-const MAX_CAP: usize = !0;
|
||||
-#[cfg(feature = "gecko-ffi")]
|
||||
-const MAX_CAP: usize = i32::max_value() as usize;
|
||||
+mod impl_details {
|
||||
+ pub type SizeType = usize;
|
||||
+ pub const MAX_CAP: usize = !0;
|
||||
|
||||
-#[cfg(not(feature = "gecko-ffi"))]
|
||||
-#[inline(always)]
|
||||
-fn assert_size(x: usize) -> SizeType { x }
|
||||
+ #[inline(always)]
|
||||
+ pub fn assert_size(x: usize) -> SizeType { x }
|
||||
+}
|
||||
|
||||
#[cfg(feature = "gecko-ffi")]
|
||||
-#[inline]
|
||||
-fn assert_size(x: usize) -> SizeType {
|
||||
- if x > MAX_CAP as usize {
|
||||
- panic!("nsTArray size may not exceed the capacity of a 32-bit sized int");
|
||||
+mod impl_details {
|
||||
+ // Support for briding a gecko nsTArray verbatim into a ThinVec.
|
||||
+ //
|
||||
+ // ThinVec can't see copy/move/delete implementations
|
||||
+ // from C++
|
||||
+ //
|
||||
+ // The actual layout of an nsTArray is:
|
||||
+ //
|
||||
+ // ```cpp
|
||||
+ // struct {
|
||||
+ // uint32_t mLength;
|
||||
+ // uint32_t mCapacity: 31;
|
||||
+ // uint32_t mIsAutoArray: 1;
|
||||
+ // }
|
||||
+ // ```
|
||||
+ //
|
||||
+ // Rust doesn't natively support bit-fields, so we manually mask
|
||||
+ // and shift the bit. When the "auto" bit is set, the header and buffer
|
||||
+ // are actually on the stack, meaning the ThinVec pointer-to-header
|
||||
+ // is essentially an "owned borrow", and therefore dangerous to handle.
|
||||
+ // There are no safety guards for this situation.
|
||||
+ //
|
||||
+ // On little-endian platforms, the auto bit will be the high-bit of
|
||||
+ // our capacity u32. On big-endian platforms, it will be the low bit.
|
||||
+ // Hence we need some platform-specific CFGs for the necessary masking/shifting.
|
||||
+ //
|
||||
+ // ThinVec won't ever construct an auto array. They only happen when
|
||||
+ // bridging from C++. This means we don't need to ever set/preserve the bit.
|
||||
+ // We just need to be able to read and handle it if it happens to be there.
|
||||
+ //
|
||||
+ // Handling the auto bit mostly just means not freeing/reallocating the buffer.
|
||||
+
|
||||
+ pub type SizeType = u32;
|
||||
+
|
||||
+ pub const MAX_CAP: usize = i32::max_value() as usize;
|
||||
+
|
||||
+ // Little endian: the auto bit is the high bit, and the capacity is
|
||||
+ // verbatim. So we just need to mask off the high bit. Note that
|
||||
+ // this masking is unnecessary when packing, because assert_size
|
||||
+ // guards against the high bit being set.
|
||||
+ #[cfg(target_endian = "little")]
|
||||
+ pub fn pack_capacity(cap: SizeType) -> SizeType {
|
||||
+ cap as SizeType
|
||||
+ }
|
||||
+ #[cfg(target_endian = "little")]
|
||||
+ pub fn unpack_capacity(cap: SizeType) -> usize {
|
||||
+ (cap as usize) & !(1 << 31)
|
||||
+ }
|
||||
+ #[cfg(target_endian = "little")]
|
||||
+ pub fn is_auto(cap: SizeType) -> bool {
|
||||
+ (cap & (1 << 31)) != 0
|
||||
+ }
|
||||
+
|
||||
+ // Big endian: the auto bit is the low bit, and the capacity is
|
||||
+ // shifted up one bit. Masking out the auto bit is unnecessary,
|
||||
+ // as rust shifts always shift in 0's for unsigned integers.
|
||||
+ #[cfg(target_endian = "big")]
|
||||
+ pub fn pack_capacity(cap: SizeType) -> SizeType {
|
||||
+ (cap as SizeType) << 1
|
||||
+ }
|
||||
+ #[cfg(target_endian = "big")]
|
||||
+ pub fn unpack_capacity(cap: SizeType) -> usize {
|
||||
+ (cap >> 1) as usize
|
||||
+ }
|
||||
+ #[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 {
|
||||
+ if x > MAX_CAP as usize {
|
||||
+ panic!("nsTArray size may not exceed the capacity of a 32-bit sized int");
|
||||
+ }
|
||||
+ x as SizeType
|
||||
+ }
|
||||
+
|
||||
}
|
||||
|
||||
-/// The header of a ThinVec
|
||||
+/// The header of a ThinVec.
|
||||
+///
|
||||
+/// The _cap can be a bitfield, so use accessors to avoid trouble.
|
||||
#[repr(C)]
|
||||
struct Header {
|
||||
_len: SizeType,
|
||||
@@ -53,38 +258,10 @@ impl Header {
|
||||
self._len as usize
|
||||
}
|
||||
|
||||
- #[cfg(feature = "gecko-ffi")]
|
||||
- fn cap(&self) -> usize {
|
||||
- (self._cap & CAP_MASK) as usize
|
||||
- }
|
||||
-
|
||||
- #[cfg(not(feature = "gecko-ffi"))]
|
||||
- fn cap(&self) -> usize {
|
||||
- self._cap as usize
|
||||
- }
|
||||
-
|
||||
fn set_len(&mut self, len: usize) {
|
||||
self._len = assert_size(len);
|
||||
}
|
||||
|
||||
- #[cfg(feature = "gecko-ffi")]
|
||||
- fn set_cap(&mut self, cap: usize) {
|
||||
- debug_assert!(cap & (CAP_MASK as usize) == cap);
|
||||
- // FIXME: this is busted because it reads uninit memory
|
||||
- // debug_assert!(!self.uses_stack_allocated_buffer());
|
||||
- self._cap = assert_size(cap) & CAP_MASK;
|
||||
- }
|
||||
-
|
||||
- #[cfg(feature = "gecko-ffi")]
|
||||
- fn uses_stack_allocated_buffer(&self) -> bool {
|
||||
- self._cap & AUTO_MASK != 0
|
||||
- }
|
||||
-
|
||||
- #[cfg(not(feature = "gecko-ffi"))]
|
||||
- fn set_cap(&mut self, cap: usize) {
|
||||
- self._cap = assert_size(cap);
|
||||
- }
|
||||
-
|
||||
fn data<T>(&self) -> *mut T {
|
||||
let header_size = mem::size_of::<Header>();
|
||||
let padding = padding::<T>();
|
||||
@@ -102,6 +279,41 @@ impl Header {
|
||||
}
|
||||
}
|
||||
|
||||
+
|
||||
+#[cfg(feature = "gecko-ffi")]
|
||||
+impl Header {
|
||||
+ fn cap(&self) -> usize {
|
||||
+ unpack_capacity(self._cap)
|
||||
+ }
|
||||
+
|
||||
+ fn set_cap(&mut self, cap: usize) {
|
||||
+ // debug check that our packing is working
|
||||
+ debug_assert_eq!(unpack_capacity(pack_capacity(cap as SizeType)), cap);
|
||||
+ // FIXME: this assert is busted because it reads uninit memory
|
||||
+ // debug_assert!(!self.uses_stack_allocated_buffer());
|
||||
+
|
||||
+ // NOTE: this always stores a cleared auto bit, because set_cap
|
||||
+ // is only invoked by Rust, and Rust doesn't create auto arrays.
|
||||
+ self._cap = pack_capacity(assert_size(cap));
|
||||
+ }
|
||||
+
|
||||
+ fn uses_stack_allocated_buffer(&self) -> bool {
|
||||
+ is_auto(self._cap)
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+#[cfg(not(feature = "gecko-ffi"))]
|
||||
+impl Header {
|
||||
+ fn cap(&self) -> usize {
|
||||
+ self._cap as usize
|
||||
+ }
|
||||
+
|
||||
+ fn set_cap(&mut self, cap: usize) {
|
||||
+ self._cap = assert_size(cap);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+
|
||||
/// 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
|
||||
@@ -118,9 +330,7 @@ extern {
|
||||
|
||||
// TODO: overflow checks everywhere
|
||||
|
||||
-// Utils
|
||||
-
|
||||
-fn oom() -> ! { std::process::abort() }
|
||||
+// Utils for computing layouts of allocations
|
||||
|
||||
fn alloc_size<T>(cap: usize) -> usize {
|
||||
// Compute "real" header size with pointer math
|
||||
@@ -165,9 +375,10 @@ fn layout<T>(cap: usize) -> Layout {
|
||||
fn header_with_capacity<T>(cap: usize) -> NonNull<Header> {
|
||||
debug_assert!(cap > 0);
|
||||
unsafe {
|
||||
- let header = alloc(layout::<T>(cap)) as *mut Header;
|
||||
+ let layout = layout::<T>(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::<T>() == 0 { MAX_CAP } else { cap });
|
||||
@@ -179,28 +390,8 @@ fn header_with_capacity<T>(cap: usize) -
|
||||
|
||||
|
||||
|
||||
-/// ThinVec is exactly the same as Vec, except that it stores its `len` and `capacity` in the buffer
|
||||
-/// it allocates.
|
||||
-///
|
||||
-/// This makes the memory footprint of ThinVecs lower; notably in cases where space is reserved for
|
||||
-/// a non-existence ThinVec<T>. So `Vec<ThinVec<T>>` and `Option<ThinVec<T>>::None` will waste less
|
||||
-/// space. Being pointer-sized also means it can be passed/stored in registers.
|
||||
-///
|
||||
-/// Of course, any actually constructed ThinVec will theoretically have a bigger allocation, but
|
||||
-/// the fuzzy nature of allocators means that might not actually be the case.
|
||||
-///
|
||||
-/// Properties of Vec that are preserved:
|
||||
-/// * `ThinVec::new()` doesn't allocate (it points to a statically allocated singleton)
|
||||
-/// * reallocation can be done in place
|
||||
-/// * `size_of::<ThinVec<T>>()` == `size_of::<Option<ThinVec<T>>>()`
|
||||
-/// * NOTE: This is only possible when the `unstable` feature is used.
|
||||
-///
|
||||
-/// Properties of Vec that aren't preserved:
|
||||
-/// * `ThinVec<T>` can't ever be zero-cost roundtripped to a `Box<[T]>`, `String`, or `*mut T`
|
||||
-/// * `from_raw_parts` doesn't exist
|
||||
-/// * ThinVec currently doesn't bother to not-allocate for Zero Sized Types (e.g. `ThinVec<()>`),
|
||||
-/// but it could be done if someone cared enough to implement it.
|
||||
-#[cfg_attr(feature = "gecko-ffi", repr(C))]
|
||||
+/// See the crate's top level documentation for a description of this type.
|
||||
+#[repr(C)]
|
||||
pub struct ThinVec<T> {
|
||||
ptr: NonNull<Header>,
|
||||
boo: PhantomData<T>,
|
||||
@@ -630,15 +821,15 @@ impl<T> ThinVec<T> {
|
||||
}
|
||||
|
||||
pub fn drain<R>(&mut self, range: R) -> Drain<T>
|
||||
- where R: RangeArgument<usize>
|
||||
+ where R: RangeBounds<usize>
|
||||
{
|
||||
let len = self.len();
|
||||
- let start = match range.start() {
|
||||
+ let start = match range.start_bound() {
|
||||
Bound::Included(&n) => n,
|
||||
Bound::Excluded(&n) => n + 1,
|
||||
Bound::Unbounded => 0,
|
||||
};
|
||||
- let end = match range.end() {
|
||||
+ let end = match range.end_bound() {
|
||||
Bound::Included(&n) => n + 1,
|
||||
Bound::Excluded(&n) => n,
|
||||
Bound::Unbounded => len,
|
||||
@@ -688,11 +879,30 @@ impl<T> ThinVec<T> {
|
||||
alloc_size::<T>(new_cap),
|
||||
) as *mut Header;
|
||||
|
||||
- if ptr.is_null() { oom() }
|
||||
+ if ptr.is_null() { handle_alloc_error(layout::<T>(new_cap)) }
|
||||
(*ptr).set_cap(new_cap);
|
||||
self.ptr = NonNull::new_unchecked(ptr);
|
||||
} else {
|
||||
- self.ptr = header_with_capacity::<T>(new_cap);
|
||||
+ let mut new_header = header_with_capacity::<T>(new_cap);
|
||||
+
|
||||
+ // If we get here and have a non-zero len, then we must be handling
|
||||
+ // a gecko auto array, and we have items in a stack buffer. We shouldn't
|
||||
+ // free it, but we should memcopy the contents out of it and mark it as empty.
|
||||
+ //
|
||||
+ // T is assumed to be trivially relocatable, as this is ~required
|
||||
+ // for Rust compatibility anyway. Furthermore, we assume C++ won't try
|
||||
+ // to unconditionally destroy the contents of the stack allocated buffer
|
||||
+ // (i.e. it's obfuscated behind a union).
|
||||
+ //
|
||||
+ // In effect, we are partially reimplementing the auto array move constructor
|
||||
+ // by leaving behind a valid empty instance.
|
||||
+ let len = self.len();
|
||||
+ if cfg!(feature = "gecko-ffi") && len > 0 {
|
||||
+ new_header.as_mut().data::<T>().copy_from_nonoverlapping(self.data_raw(), len);
|
||||
+ self.set_len(0);
|
||||
+ }
|
||||
+
|
||||
+ self.ptr = new_header;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1093,10 +1303,7 @@ mod tests {
|
||||
use std::mem::size_of;
|
||||
assert_eq!(size_of::<ThinVec<u8>>(), size_of::<&u8>());
|
||||
|
||||
- // We don't perform the null-pointer optimization on stable rust.
|
||||
- if cfg!(feature = "unstable") {
|
||||
- assert_eq!(size_of::<Option<ThinVec<u8>>>(), size_of::<&u8>());
|
||||
- }
|
||||
+ assert_eq!(size_of::<Option<ThinVec<u8>>>(), size_of::<&u8>());
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -1731,7 +1938,6 @@ mod std_tests {
|
||||
assert_eq!(v, &[(), ()]);
|
||||
}
|
||||
|
||||
-/* TODO: support inclusive ranges
|
||||
#[test]
|
||||
fn test_drain_inclusive_range() {
|
||||
let mut v = thin_vec!['a', 'b', 'c', 'd', 'e'];
|
||||
@@ -1761,6 +1967,7 @@ mod std_tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
+ #[cfg(not(feature = "gecko-ffi"))]
|
||||
fn test_drain_max_vec_size() {
|
||||
let mut v = ThinVec::<()>::with_capacity(usize::max_value());
|
||||
unsafe { v.set_len(usize::max_value()); }
|
||||
@@ -1781,7 +1988,6 @@ mod std_tests {
|
||||
let mut v = thin_vec![1, 2, 3, 4, 5];
|
||||
v.drain(5..=5);
|
||||
}
|
||||
-*/
|
||||
|
||||
/* TODO: implement splice?
|
||||
#[test]
|
||||
@@ -2187,7 +2393,7 @@ mod std_tests {
|
||||
assert!(v.capacity() >= 33)
|
||||
}
|
||||
|
||||
-/* TODO: implement try_reserve
|
||||
+/* TODO: implement try_reserve
|
||||
#[test]
|
||||
fn test_try_reserve() {
|
||||
|
||||
--- 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"
|
||||
rust_cascade = "0.6.0"
|
||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
||||
xpcom = { path = "../../../xpcom/rust/xpcom" }
|
||||
--- 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" }
|
||||
once_cell = "1"
|
||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
||||
xpcom = { path = "../../../../../xpcom/rust/xpcom" }
|
||||
serde = "1"
|
||||
serde_json = "1"
|
||||
--- 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" }
|
||||
tempfile = "3"
|
||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
||||
|
||||
# Get rid of failure's dependency on backtrace. Eventually
|
||||
# backtrace will move into Rust core, but we don't need it here.
|
||||
--- 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" }
|
||||
|
||||
[dependencies.thin-vec]
|
||||
-version = "0.1.0"
|
||||
+version = "0.2.1"
|
||||
features = ["gecko-ffi"]
|
||||
--- 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
|
||||
|
||||
[dependencies.thin-vec]
|
||||
-version = "0.1.0"
|
||||
+version = "0.2.1"
|
||||
features = ["gecko-ffi"]
|
||||
|
||||
[features]
|
||||
--- 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"
|
||||
xpcom_macros = { path = "xpcom_macros" }
|
||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
||||
@ -1,118 +0,0 @@
|
||||
# HG changeset patch
|
||||
# User Rob Lemley <rob@thunderbird.net>
|
||||
# Date 1662996130 0
|
||||
# Mon Sep 12 15:22:10 2022 +0000
|
||||
# Node ID 5dfb405f325609c62215f9d74e01dba029b84611
|
||||
# Parent 9998ed5c2bcee289b03828eba670053614fa26da
|
||||
Bug 1790446 - Stop rewriting RNP config.h.in when updating the source from upstream. r=dandarnell
|
||||
|
||||
Differential Revision: https://phabricator.services.mozilla.com/D157151
|
||||
|
||||
diff --git a/comm/python/thirdroc/thirdroc/rnp.py b/comm/python/thirdroc/thirdroc/rnp.py
|
||||
--- a/comm/python/thirdroc/thirdroc/rnp.py
|
||||
+++ b/comm/python/thirdroc/thirdroc/rnp.py
|
||||
@@ -11,19 +11,18 @@ import re
|
||||
from packaging.version import parse
|
||||
|
||||
from mozbuild.preprocessor import Preprocessor
|
||||
|
||||
|
||||
-def rnp_source_update(rnp_root, version_str, revision, timestamp, bug_report):
|
||||
+def rnp_source_update(rnp_root, version_str, revision, timestamp):
|
||||
"""
|
||||
Update RNP source files: generate version.h and mangle config.h.in
|
||||
:param rnp_root:
|
||||
:type rnp_root:
|
||||
:param string version_str: latest version
|
||||
:param string revision: revision hash (short form)
|
||||
:param float timestamp: UNIX timestamp from revision
|
||||
- :param string bug_report: where to report bugs for this RNP build
|
||||
"""
|
||||
version = parse(version_str)
|
||||
version_major = version.major
|
||||
version_minor = version.minor
|
||||
version_patch = version.micro
|
||||
@@ -36,20 +35,17 @@ def rnp_source_update(rnp_root, version_
|
||||
RNP_VERSION_MINOR=version_minor,
|
||||
RNP_VERSION_PATCH=version_patch,
|
||||
RNP_VERSION=version_str,
|
||||
RNP_VERSION_FULL=version_full,
|
||||
RNP_VERSION_COMMIT_TIMESTAMP=str(timestamp),
|
||||
- BUGREPORT_EMAIL=bug_report,
|
||||
)
|
||||
src_lib = os.path.join(rnp_root, "src", "lib")
|
||||
version_h_in = os.path.join(src_lib, "version.h.in")
|
||||
version_h = os.path.join(src_lib, "version.h")
|
||||
- config_h_in = os.path.join(src_lib, "config.h.in")
|
||||
readme_rnp = os.path.join(rnp_root, "..", "README.rnp")
|
||||
|
||||
generate_version_h(version_h_in, version_h, defines)
|
||||
- mangle_config_h_in(config_h_in, defines)
|
||||
update_readme(readme_rnp, revision)
|
||||
|
||||
|
||||
def rnp_preprocess(tmpl, dest, defines):
|
||||
"""
|
||||
@@ -79,30 +75,10 @@ def generate_version_h(template, destina
|
||||
with open(template) as tmpl:
|
||||
with open(destination, "w") as dest:
|
||||
rnp_preprocess(tmpl, dest, defines)
|
||||
|
||||
|
||||
-def mangle_config_h_in(template, defines):
|
||||
- """
|
||||
- Mangle RNP's config.h.in so that it will work with CONFIGURE_DEFINE_FILES
|
||||
- :param string template: path to config.h.in
|
||||
- :param dict defines: result of get_defines()
|
||||
- """
|
||||
- with open(template) as tmpl:
|
||||
- tmp_string = StringIO()
|
||||
- rnp_preprocess(tmpl, tmp_string, defines)
|
||||
-
|
||||
- tmp_string.seek(0)
|
||||
-
|
||||
- with open(template, "w") as dest:
|
||||
- for line in tmp_string:
|
||||
- if line.startswith("#cmakedefine"):
|
||||
- line = line.replace("#cmakedefine", "#undef")
|
||||
- dest.write(line)
|
||||
- dest.write("\n")
|
||||
-
|
||||
-
|
||||
def update_readme(path, revision):
|
||||
"""
|
||||
Updates the commit hash in README.rnp
|
||||
:param string path: Path to README.rnp
|
||||
:param string revision: revision to insert
|
||||
diff --git a/comm/third_party/update_rnp.sh b/comm/third_party/update_rnp.sh
|
||||
--- a/comm/third_party/update_rnp.sh
|
||||
+++ b/comm/third_party/update_rnp.sh
|
||||
@@ -42,26 +42,23 @@ TAGLIST=$(git -C "${RNPgit}" tag --list
|
||||
|
||||
LATEST_VERSION=$($THIRDROC latest_version $TAGLIST)
|
||||
REVISION=$(git -C "${RNPgit}" rev-parse --verify HEAD)
|
||||
TIMESTAMP=$(git -C "${RNPgit}" show -s --format=%ct)
|
||||
|
||||
-BUGREPORT="https://bugzilla.mozilla.org/enter_bug.cgi?product=Thunderbird"
|
||||
-
|
||||
# Cleanup rnp checkout
|
||||
rm -rf ${RNPgit}/{.git,.github,.cirrus.yml,.clang-format,.gitignore}
|
||||
rm -rf ${RNPgit}/{_config.yml,docker.sh,ci,cmake,git-hooks,travis.sh,vcpkg.txt}
|
||||
rm -rf ${RNPgit}/{Brewfile,CMakeLists.txt,CMakeSettings.json}
|
||||
|
||||
# Do the switch
|
||||
rm -rf rnp
|
||||
mv "${RNPgit}" rnp
|
||||
-# Build version.h/config.h.in
|
||||
+# Build version.h
|
||||
$THIRDROC rnp_source_update rnp/ \
|
||||
"${LATEST_VERSION}" \
|
||||
"${REVISION}" \
|
||||
- "${TIMESTAMP}" \
|
||||
- "${BUGREPORT}"
|
||||
+ "${TIMESTAMP}"
|
||||
|
||||
# Restore moz.build
|
||||
hg revert rnp/moz.build rnp/module.ver rnp/rnp.symbols rnp/src/lib/rnp/rnp_export.h \
|
||||
rnp/src/rnp/moz.build rnp/src/rnpkeys/moz.build
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
@ -1,126 +0,0 @@
|
||||
#!/bin/bash
|
||||
#set -x
|
||||
set -e
|
||||
usage()
|
||||
{
|
||||
cat << EOF
|
||||
usage: $0 options
|
||||
|
||||
This script downloads calendar langpacks for Thunderbird.
|
||||
|
||||
OPTIONS:
|
||||
-h Show this message
|
||||
-v Version string (7.0.1)
|
||||
-b Build number (1, 2, 3)
|
||||
-r Reuse downloaded files (when you don't want to redownload)
|
||||
EOF
|
||||
}
|
||||
|
||||
VER=
|
||||
BUILDNUM=
|
||||
LANG_DATE=`date "+%Y%m%d"`
|
||||
while getopts “hv:b:r” OPTION
|
||||
do
|
||||
case $OPTION in
|
||||
h)
|
||||
usage
|
||||
exit 1
|
||||
;;
|
||||
v)
|
||||
VER=$OPTARG
|
||||
;;
|
||||
b)
|
||||
BUILDNUM=$OPTARG
|
||||
;;
|
||||
?)
|
||||
usage
|
||||
exit
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [ -z "$VER" -o -z "$BUILDNUM" ]
|
||||
then
|
||||
echo "Missing version or build number."
|
||||
usage
|
||||
exit 1
|
||||
fi
|
||||
|
||||
WHITE='\033[1;33m'
|
||||
NC='\033[0m' # No Color
|
||||
|
||||
LOCALES=`curl -f https://archive.mozilla.org/pub/thunderbird/candidates/$VER-candidates/build$BUILDNUM/linux-i686/ | grep "a href"|sed -e "s|.*/\([^/]*\)/\".*|\1|"|tail -n+2 |grep -v xpi`
|
||||
#echo $LOCALES
|
||||
rm -rf lightning-langpacks
|
||||
mkdir -p lightning-langpacks
|
||||
cd lightning-langpacks
|
||||
LOCALE_COUNT=`echo $LOCALES| tr ' ' '\n' | wc -l`
|
||||
LOCALE_NUM=0
|
||||
for lang in $LOCALES; do
|
||||
LOCALE_NUM=$((LOCALE_NUM+1))
|
||||
echo -e "${WHITE}Processing calendar locale: $lang ($LOCALE_NUM/$LOCALE_COUNT)${NC}"
|
||||
mkdir -p extracted_lightning
|
||||
mkdir -p calendar-locales
|
||||
#echo Downloading TB binary for locale: $lang
|
||||
wget --quiet https://archive.mozilla.org/pub/thunderbird/candidates/$VER-candidates/build$BUILDNUM/linux-i686/$lang/thunderbird-$VER.tar.bz2
|
||||
|
||||
cd extracted_lightning
|
||||
tar -xf ../thunderbird-$VER.tar.bz2 thunderbird/distribution/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}.xpi
|
||||
set +e
|
||||
unzip -qq thunderbird/distribution/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}.xpi
|
||||
set -e
|
||||
LIGHTNING_VERSION=`cat app.ini |grep "^Version="|sed -e 's/Version=//'`
|
||||
BUILD_ID=`cat app.ini |grep "^BuildID="|sed -e 's/BuildID=//'`
|
||||
MAX_VERSION=`cat app.ini |grep MaxVersion|sed -e s/MaxVersion=//`
|
||||
MIN_VERSION=`cat app.ini |grep MinVersion|sed -e s/MinVersion=//`
|
||||
rm -rf thunderbird
|
||||
mkdir -p ../calendar-locales/chrome
|
||||
cp -r chrome/calendar-$lang ../calendar-locales/chrome
|
||||
cp -r chrome/lightning-$lang ../calendar-locales/chrome
|
||||
cd -
|
||||
|
||||
cd calendar-locales
|
||||
# create manifest
|
||||
cat > manifest.json <<EOL
|
||||
{
|
||||
"languages": {
|
||||
"$lang": {
|
||||
"chrome_resources": {
|
||||
"calendar": "chrome/calendar-$lang/locale/$lang/calendar/",
|
||||
"lightning": "chrome/lightning-$lang/locale/$lang/lightning/"
|
||||
},
|
||||
"version": "$LIGHTNING_VERSION"
|
||||
}
|
||||
},
|
||||
"applications": {
|
||||
"gecko": {
|
||||
"strict_min_version": "$MIN_VERSION",
|
||||
"id": "langpack-cal-$lang@lightning.mozilla.org",
|
||||
"strict_max_version": "$MAX_VERSION"
|
||||
}
|
||||
},
|
||||
"langpack_id": "$lang",
|
||||
"version": "7.$LIGHTNING_VERSION.$BUILD_ID",
|
||||
"name": "$lang Language Pack Calendar",
|
||||
"manifest_version": 2,
|
||||
"sources": {
|
||||
"browser": {
|
||||
"base_path": "browser/"
|
||||
}
|
||||
},
|
||||
"author": "Mozilla.cz (contributors: Pavel Cvrček, Pavel Franc, Michal Stanke, Michal Vašíček)",
|
||||
"description": "Language pack for Thunderbird for $lang, this was repacked by Fedora/RHEL package maintainer from original binaries."
|
||||
}
|
||||
|
||||
EOL
|
||||
zip --quiet -r ../langpack-cal-$lang@lightning.mozilla.org.xpi *
|
||||
cd -
|
||||
rm -rf calendar-locales
|
||||
rm -rf extracted_lightning
|
||||
|
||||
rm -f thunderbird-$VER.tar.bz2
|
||||
done
|
||||
echo "Creating lightning-langpacks-$VER.tar.xz..."
|
||||
tar cJf ../lightning-langpacks-$VER.tar.xz *.xpi
|
||||
cd ..
|
||||
rm -rf lightning-langpacks
|
||||
@ -1,17 +0,0 @@
|
||||
---
|
||||
inspections:
|
||||
# this inspection is taking way too long and causing timeouts
|
||||
abidiff: off
|
||||
# the badfunc is triggered by inet_addr and inet_ntoa which is in the third party
|
||||
# libraries bundled to firefox sources.
|
||||
badfuncs:
|
||||
ignore:
|
||||
- /usr/lib*/thunderbird/libxul.so
|
||||
# We don't plan to build Firefox with the LTO because it brings more problems
|
||||
# than benefits to the package.
|
||||
annocheck:
|
||||
- rhel-policy: --ignore-unknown --verbose --skip-lto --skip-cf-protection --skip-property-note
|
||||
runpath:
|
||||
# rpath to bundled content
|
||||
allowed_paths:
|
||||
- /usr/lib64/thunderbird/bundled/lib64
|
||||
5
sources
5
sources
@ -1,5 +0,0 @@
|
||||
SHA512 (nspr-4.34.0-3.el8_1.src.rpm) = fe4715694c297cd8cefa577946358a90103bde73e78a3fdf13d202a3791736e8a48fbece09ee3d15f6d81ae051e26d96400b03bb6bf8630715746c5e1a643543
|
||||
SHA512 (cbindgen-vendor.tar.xz) = 590e27b6c093a5c1bd839ca39c68537097d0849087a4a385ee6d7b180e9ceadbbb8974fa997f5f75af03e2c243a2f232d0d4c4c46e253ea464521b76c6886067
|
||||
SHA512 (nss-3.79.0-11.el8_1.src.rpm) = c4516e7917a45ac2d401700b6a7e23d5942d62fe2307cf130c526eea5a924516f82c2d2426b919c89004c4466c78061ea050721c1889a01fcd436cb562d4b1bd
|
||||
SHA512 (thunderbird-102.12.0.processed-source.tar.xz) = 268bd425bad64558d57c9d1d83e309752d47587e94eee24da4afd95cda5acc56e879a620cf327e2f49eb776a6ef47acb3d8083fb94156e5e1fd11965e11beb33
|
||||
SHA512 (thunderbird-langpacks-102.12.0-20230605.tar.xz) = d4aad029685511b244719e8ead23e01c480ffb4d19f8e5ce5fe3565faaef719038941dd73e5298b371ade0695d3791e6f453189a09701f51bf3b159f5daf6e44
|
||||
@ -1,76 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="16"
|
||||
height="16"
|
||||
viewBox="0 0 4.2333332 4.2333335"
|
||||
version="1.1"
|
||||
id="svg826"
|
||||
inkscape:version="0.92+devel unknown"
|
||||
sodipodi:docname="thunderbird-symbolic.svg">
|
||||
<defs
|
||||
id="defs820" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#555753"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="1"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="32"
|
||||
inkscape:cx="14.909311"
|
||||
inkscape:cy="6.5299379"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:current-layer="layer1"
|
||||
inkscape:document-rotation="0"
|
||||
showgrid="false"
|
||||
units="px"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1136"
|
||||
inkscape:window-x="1920"
|
||||
inkscape:window-y="27"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:snap-global="true" />
|
||||
<metadata
|
||||
id="metadata823">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(0,-292.76664)">
|
||||
<path
|
||||
style="fill:#bebebe;fill-opacity:1;stroke-width:0.50472808;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:1.00945637, 3.02836921000000014"
|
||||
d="M 6.2871094 0.6796875 C 5.4163558 0.91578892 4.8510898 1.5936957 4.5292969 2.1464844 C 2.421315 3.2450921 0.99225272 5.3610823 0.9921875 7.7949219 C 0.99477587 10.359489 2.3110205 12.446765 4.71875 13.445312 C 3.4595645 12.812546 2.2935825 11.525048 1.9707031 10.179688 C 1.7935937 9.4417327 1.7111632 8.3804473 1.7871094 7.8671875 C 2.0153769 8.1799434 2.3679623 8.3686337 2.6191406 8.3535156 C 2.4938628 8.2316259 2.1405878 7.2674351 2.2246094 6.7109375 C 2.3603578 5.8118257 3.1848776 4.5727304 3.6171875 4.3652344 C 3.5950724 4.1994643 3.6227354 4.5729785 3.6347656 4.6757812 C 3.6727178 5.0001403 3.7890738 5.2722323 3.7246094 5.5625 C 3.6729882 5.7950165 3.4515893 6.0294455 3.4980469 6.4824219 C 3.5108599 6.6073731 3.6284702 6.8445848 3.7539062 6.9277344 C 3.7535036 6.9231566 3.7580261 6.9016692 3.7578125 6.8964844 C 4.1688563 6.4878098 4.2988638 6.3923311 4.8164062 6.1835938 C 5.3947783 5.9504725 5.7292796 5.4840924 6.5429688 5.3242188 C 7.1567719 5.2036518 7.7980995 5.4618768 8.4160156 5.4316406 C 8.9595412 5.4051839 9.6230469 5.3164062 9.6230469 5.3164062 C 9.6230469 5.3164062 10.529591 6.3734458 10.554688 8.0839844 C 10.561372 8.5399466 10.393117 9.2581935 10.080078 9.6074219 C 10.10866 9.6301636 10.842076 9.8181331 11.496094 8.9296875 L 11.496094 8.9277344 C 11.500502 8.9217421 11.509138 8.9123452 11.513672 8.90625 C 11.511804 8.9162203 11.509634 8.919117 11.507812 8.9296875 C 11.082979 11.395346 10.343305 12.786026 9.3730469 13.716797 L 9.3652344 13.716797 C 9.1593686 13.914136 8.9415569 14.089651 8.7167969 14.253906 C 8.6515695 14.300524 8.584386 14.344389 8.5175781 14.388672 C 8.3185959 14.523496 8.1179918 14.6549 7.9042969 14.771484 C 7.453226 15.017472 9.0852392 14.946167 10.126953 14.476562 C 10.157938 14.470814 10.189917 14.46715 10.220703 14.460938 C 9.8033537 14.744465 9.3535156 15 9.3535156 15 C 9.3535156 15 10.890634 14.899538 11.974609 13.804688 C 11.975453 13.803262 11.975783 13.800425 11.976562 13.798828 C 13.818222 12.736706 15.007176 10.687802 15.007812 8.21875 C 15.005272 5.4392694 13.347542 2.9608845 10.865234 2.0253906 C 9.9215437 1.5797455 8.881353 1.3464382 7.8261719 1.34375 C 7.5325222 1.3437527 7.2448312 1.3664635 6.9609375 1.4003906 C 6.9469035 1.339967 6.9417802 1.323023 6.9726562 1.203125 C 6.8504944 1.2378967 6.8589251 1.2466706 6.7519531 1.2988281 C 6.7527631 1.1850643 6.7593232 1.2159555 6.7519531 1.0976562 C 6.5269885 1.1694673 6.5079647 1.1993654 6.3398438 1.3085938 C 6.3964573 1.0867355 6.399826 1.1278526 6.5527344 0.88671875 C 6.3493259 0.94186206 6.0726487 1.1030774 5.7460938 1.4511719 C 5.8509855 1.1114301 5.9907037 1.0292938 6.2871094 0.6796875 z "
|
||||
transform="matrix(0.26458333,0,0,0.26458333,0,292.76664)"
|
||||
id="path24330" />
|
||||
<path
|
||||
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26511249;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;opacity:1"
|
||||
d="M 0.81054688 293.97852 L 0.59179688 294.12695 L 1.4453125 295.40234 L 2.9335938 294.85156 L 2.8417969 294.60352 L 1.5507812 295.08008 L 0.81054688 293.97852 z "
|
||||
id="path24387" />
|
||||
<path
|
||||
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
|
||||
d="m 1.7871094,9.8730469 0.1210937,0.5820311 -0.1230469,-0.02344 c 0,0 0.2754046,0.874485 0.8561662,1.437975 0.5080908,0.49319 0.9335266,1.121624 2.1243026,1.601087 C 4.3317049,12.663641 4.1812012,12.346136 3.9980469,11.6875 l 0.2128906,0.07031 C 4.5424397,12.049861 4.8536251,12.30456 5.5800781,12.4375 5.4786992,12.266213 5.448324,12.238135 5.3847656,12.142578 l 4.7363284,1.554688 0.316406,-0.945313 z"
|
||||
transform="matrix(0.26458333,0,0,0.26458333,0,292.76664)"
|
||||
id="path24379"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cccccccccccc" />
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 7.8 KiB |
Loading…
Reference in New Issue
Block a user