Tim-Paik
/
neutauri
mirror of https://github.com/Tim-Paik/neutauri.git
1
0
Fork 0
Code Issues Releases Activity

update deps and use vc-ltl instead of crt-static

This commit is contained in:
Tim-Paik 2023-04-17 23:17:30 +08:00
parent 2a8e27995a
commit 3449221f81
Signed by: Tim-Paik
GPG Key ID: DC36A050DB42566D
5 changed files with 65 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
Cargo.lock generated
View File

@ -321,9 +321,9 @@ dependencies = [
[[package]] [[package]]
name = "crossbeam-channel" name = "crossbeam-channel"
version = "0.5.7" version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"crossbeam-utils", "crossbeam-utils",
@ -523,12 +523,21 @@ dependencies = [
"flume", "flume",
"half", "half",
"lebe", "lebe",
"miniz_oxide", "miniz_oxide 0.6.2",
"rayon-core", "rayon-core",
"smallvec", "smallvec",
"zune-inflate", "zune-inflate",
] ]
[[package]]
name = "fdeflate"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
dependencies = [
"simd-adler32",
]
[[package]] [[package]]
name = "field-offset" name = "field-offset"
version = "0.3.5" version = "0.3.5"
@ -546,7 +555,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
dependencies = [ dependencies = [
"crc32fast", "crc32fast",
"miniz_oxide", "miniz_oxide 0.6.2",
] ]
[[package]] [[package]]
@ -642,7 +651,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.13", "syn 2.0.15",
] ]
[[package]] [[package]]
@ -789,9 +798,9 @@ dependencies = [
[[package]] [[package]]
name = "getrandom" name = "getrandom"
version = "0.2.8" version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"js-sys", "js-sys",
@ -1072,9 +1081,9 @@ dependencies = [
[[package]] [[package]]
name = "inquire" name = "inquire"
version = "0.6.0" version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd079157ad94a32f7511b2e13037f3ae417ad80a6a9b0de29154d48b86f5d6c8" checksum = "f4bf420bd01f298a3ed8f57af9babedb296b4edfc1dbd8b159cee883aa90edaa"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"crossterm", "crossterm",
@ -1316,6 +1325,16 @@ dependencies = [
"adler", "adler",
] ]
[[package]]
name = "miniz_oxide"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
dependencies = [
"adler",
"simd-adler32",
]
[[package]] [[package]]
name = "mio" name = "mio"
version = "0.8.6" version = "0.8.6"
@ -1334,7 +1353,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
dependencies = [ dependencies = [
"getrandom 0.2.8", "getrandom 0.2.9",
] ]
[[package]] [[package]]
@ -1377,6 +1396,7 @@ dependencies = [
"rcedit", "rcedit",
"serde", "serde",
"toml 0.7.3", "toml 0.7.3",
"vc-ltl",
"winres", "winres",
"wry", "wry",
] ]
@ -1400,6 +1420,7 @@ name = "neutauri_runtime"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"neutauri_data", "neutauri_data",
"vc-ltl",
"winres", "winres",
"wry", "wry",
] ]
@ -1688,14 +1709,15 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
[[package]] [[package]]
name = "png" name = "png"
version = "0.17.7" version = "0.17.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"crc32fast", "crc32fast",
"fdeflate",
"flate2", "flate2",
"miniz_oxide", "miniz_oxide 0.7.1",
] ]
[[package]] [[package]]
@ -1837,7 +1859,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [ dependencies = [
"getrandom 0.2.8", "getrandom 0.2.9",
] ]
[[package]] [[package]]
@ -1919,7 +1941,7 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [ dependencies = [
"getrandom 0.2.8", "getrandom 0.2.9",
"redox_syscall", "redox_syscall",
"thiserror", "thiserror",
] ]
@ -1999,29 +2021,29 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.159" version = "1.0.160"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.159" version = "1.0.160"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.13", "syn 2.0.15",
] ]
[[package]] [[package]]
name = "serde_json" name = "serde_json"
version = "1.0.95" version = "1.0.96"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
dependencies = [ dependencies = [
"itoa 1.0.6", "itoa 1.0.6",
"ryu", "ryu",
@ -2197,9 +2219,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.13" version = "2.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2313,7 +2335,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.13", "syn 2.0.15",
] ]
[[package]] [[package]]
@ -2452,13 +2474,19 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "1.3.0" version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb"
dependencies = [ dependencies = [
"getrandom 0.2.8", "getrandom 0.2.9",
] ]
[[package]]
name = "vc-ltl"
version = "5.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a598ed2ecab95d080d2d55110bb484572145f36793f15a25447189a86752ada4"
[[package]] [[package]]
name = "version-compare" name = "version-compare"
version = "0.1.1" version = "0.1.1"
@ -2813,9 +2841,9 @@ dependencies = [
[[package]] [[package]]
name = "wry" name = "wry"
version = "0.27.1" version = "0.27.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b958a84f347bf8ec2e882b3f767bdb3f7797e89867bb9d6f0d1fe3df26754fe9" checksum = "e8cf0dbfa7ccbd2e3832a3098b19d4b552360ea00a40b244a99caef46bffd84f"
dependencies = [ dependencies = [
"base64", "base64",
"block", "block",

3
neutauri_bundler/Cargo.toml
View File

@ -7,10 +7,11 @@ version = "0.1.0"
anyhow = "1.0" anyhow = "1.0"
gumdrop = "0.8" gumdrop = "0.8"
inquire = "0.6" inquire = "0.6"
neutauri_data = {path = "../neutauri_data", features = ["bundler"]} neutauri_data = {path = "../neutauri_data", default-features = false, features = ["bundler"]}
new_mime_guess = "4.0" new_mime_guess = "4.0"
serde = {version = "1.0", features = ["derive"]} serde = {version = "1.0", features = ["derive"]}
toml = "0.7" toml = "0.7"
vc-ltl = "5.0.5"
wry = {version = "0.27", default-features = false, features = ["protocol", "tray", "transparent", "fullscreen", "devtools"]} wry = {version = "0.27", default-features = false, features = ["protocol", "tray", "transparent", "fullscreen", "devtools"]}
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]

1
neutauri_data/Cargo.toml
View File

@ -14,5 +14,6 @@ toml = {version = "0.7", optional = true}
wry = {version = "0.27", default-features = false, features = ["protocol", "tray", "transparent", "fullscreen"]} wry = {version = "0.27", default-features = false, features = ["protocol", "tray", "transparent", "fullscreen"]}
[features] [features]
default = ["runtime"]
bundler = ["anyhow", "new_mime_guess", "toml", "image"] bundler = ["anyhow", "new_mime_guess", "toml", "image"]
runtime = [] runtime = []

3
neutauri_data/src/lib.rs
View File

@ -2,7 +2,7 @@ use bincode::Options;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::{ use std::{
fs, fs,
io::{self, Read, Result, SeekFrom, Seek}, io::{self, Read, Result},
path::{self, Component, Path, PathBuf}, path::{self, Component, Path, PathBuf},
}; };
use wry::application::dpi::Position; use wry::application::dpi::Position;
@ -120,6 +120,7 @@ impl File {
#[cfg(feature = "runtime")] #[cfg(feature = "runtime")]
impl Data { impl Data {
pub fn new<P: AsRef<path::Path> + Copy>(path: P) -> Result<Self> { pub fn new<P: AsRef<path::Path> + Copy>(path: P) -> Result<Self> {
use std::io::{Seek, SeekFrom};
let mut base = fs::File::open(path)?; let mut base = fs::File::open(path)?;
let base_length = base.metadata()?.len(); let base_length = base.metadata()?.len();
let mut magic_number_start_data = [0; MAGIC_NUMBER_START.len()]; let mut magic_number_start_data = [0; MAGIC_NUMBER_START.len()];

3
neutauri_runtime/Cargo.toml
View File

@ -4,7 +4,8 @@ name = "neutauri_runtime"
version = "0.1.0" version = "0.1.0"
[dependencies] [dependencies]
neutauri_data = {path = "../neutauri_data", features = ["runtime"]} neutauri_data = {path = "../neutauri_data", default-features = false, features = ["runtime"]}
vc-ltl = "5.0.5"
wry = {version = "0.27", default-features = false, features = ["protocol", "tray", "transparent", "fullscreen"]} wry = {version = "0.27", default-features = false, features = ["protocol", "tray", "transparent", "fullscreen"]}
[target.'cfg(windows)'.build-dependencies] [target.'cfg(windows)'.build-dependencies]