Fixed the problem of unsuccessful compilation under Linux

This commit is contained in:
Tim-Paik 2022-05-02 15:56:39 +08:00
parent 46f65e0c7e
commit 111b0a9e15
Signed by: Tim-Paik
GPG Key ID: DC36A050DB42566D
4 changed files with 34 additions and 20 deletions

31
Cargo.lock generated
View File

@ -1033,17 +1033,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7efd1d698db0759e6ef11a7cd44407407399a910c774dd804c64c032da7826ff" checksum = "7efd1d698db0759e6ef11a7cd44407407399a910c774dd804c64c032da7826ff"
[[package]] [[package]]
name = "libayatana-appindicator" name = "libappindicator"
version = "0.2.0" 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 = "0379d22a323947cb27b4dbe3b14fc1dcde07c9e9c3eca52ddf97ca0819c28cc4" checksum = "97b29fab3280d59f3d06725f75da9ef9a1b001b2c748b1abfebd1c966c61d7de"
dependencies = [ dependencies = [
"glib", "glib",
"gtk", "gtk",
"gtk-sys", "gtk-sys",
"libappindicator-sys",
"log", "log",
] ]
[[package]]
name = "libappindicator-sys"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90bdcb8c5cfc11febe2ff3f18386d6cb7d29f464cbaf6b286985c3f1a501d74f"
dependencies = [
"gtk-sys",
"pkg-config",
]
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.125" version = "0.2.125"
@ -1188,6 +1199,7 @@ dependencies = [
"new_mime_guess", "new_mime_guess",
"rcedit", "rcedit",
"serde", "serde",
"tao",
"toml", "toml",
"winres", "winres",
"wry", "wry",
@ -1200,6 +1212,7 @@ dependencies = [
"bincode", "bincode",
"brotli", "brotli",
"serde", "serde",
"tao",
"winres", "winres",
"wry", "wry",
] ]
@ -1293,16 +1306,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
dependencies = [ dependencies = [
"malloc_buf", "malloc_buf",
"objc_exception",
]
[[package]]
name = "objc_exception"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
dependencies = [
"cc",
] ]
[[package]] [[package]]
@ -1796,7 +1799,7 @@ dependencies = [
"gtk", "gtk",
"instant", "instant",
"lazy_static", "lazy_static",
"libayatana-appindicator", "libappindicator",
"libc", "libc",
"log", "log",
"ndk", "ndk",

View File

@ -11,8 +11,9 @@ gumdrop = "0.8"
image = "0.24" image = "0.24"
new_mime_guess = "4.0" new_mime_guess = "4.0"
serde = {version = "1.0", features = ["derive"]} serde = {version = "1.0", features = ["derive"]}
tao = {version = "*", default-features = false}
toml = "0.5" toml = "0.5"
wry = {version = "0.15", features = ["devtools"]} wry = {version = "0.15", default-features = false, features = ["protocol", "tray", "gtk-tray", "transparent", "fullscreen", "devtools"]}
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
rcedit = {git = "https://github.com/Tim-Paik/rcedit-rs.git", rev = "2805fca"} rcedit = {git = "https://github.com/Tim-Paik/rcedit-rs.git", rev = "2805fca"}

View File

@ -1,11 +1,17 @@
use crate::data; use crate::data;
use anyhow::Context;
use std::{ use std::{
env, fs, fs,
hash::{Hash, Hasher},
io::{self, Write}, io::{self, Write},
}; };
#[cfg(windows)]
use anyhow::Context;
#[cfg(windows)]
use std::{
env,
hash::{Hash, Hasher},
};
fn options() -> fs::OpenOptions { fn options() -> fs::OpenOptions {
#[cfg(not(windows))] #[cfg(not(windows))]
use std::os::unix::prelude::OpenOptionsExt; use std::os::unix::prelude::OpenOptionsExt;
@ -19,7 +25,10 @@ fn options() -> fs::OpenOptions {
} }
#[cfg(not(windows))] #[cfg(not(windows))]
fn get_runtime_data() -> anyhow::Result<Vec<u8>> { fn get_runtime_data(
_icon_path: Option<std::path::PathBuf>,
_manifest_path: Option<std::path::PathBuf>,
) -> anyhow::Result<Vec<u8>> {
Ok(include_bytes!("../../target/release/neutauri_runtime").to_vec()) Ok(include_bytes!("../../target/release/neutauri_runtime").to_vec())
} }

View File

@ -7,7 +7,8 @@ version = "0.1.0"
bincode = "1.3" bincode = "1.3"
brotli = "3.3" brotli = "3.3"
serde = {version = "1.0", features = ["derive"]} serde = {version = "1.0", features = ["derive"]}
wry = "0.15" tao = {version = "*", default-features = false}
wry = {version = "0.15", default-features = false, features = ["protocol", "tray", "gtk-tray", "transparent", "fullscreen"]}
[target.'cfg(windows)'.build-dependencies] [target.'cfg(windows)'.build-dependencies]
winres = "0.1" winres = "0.1"