Merge branch 'refs/heads/master' into recent_section

# Conflicts:
#	Cargo.lock
#	src/tab.rs
This commit is contained in:
Francesco-gaglione 2024-08-27 08:45:47 +02:00
commit a27e67b957
6 changed files with 306 additions and 170 deletions

View file

@ -17,17 +17,17 @@ freedesktop_entry_parser = { version = "1.3", optional = true }
fs_extra = { git = "https://github.com/pop-os/fs_extra.git" }
gio = { version = "0.19", optional = true }
glob = "0.3"
ignore = "0.4"
image = "0.24"
notify-rust = "4"
once_cell = "1.19"
open = "5.0.2"
icu_collator = "1.5"
icu_provider = { version = "1.5", features = ["sync"] }
ignore = "0.4"
image = "0.24"
libc = "0.2"
log = "0.4"
mime_guess = "2"
notify-debouncer-full = "0.3"
notify-rust = { version = "4", optional = true }
once_cell = "1.19"
open = "5.0.2"
paste = "1.0"
rayon = "1"
regex = "1"
@ -36,9 +36,9 @@ shlex = { version = "1.3" }
tar = "0.4.41"
tokio = { version = "1", features = ["sync"] }
trash = { git = "https://github.com/jackpot51/trash-rs.git", branch = "delete-info" }
url = "2.5"
xdg = { version = "2.5.2", optional = true }
xdg-mime = "0.3"
url = "2.5"
# Internationalization
i18n-embed = { version = "0.14", features = [
"fluent-system",
@ -49,6 +49,8 @@ rust-embed = "8"
slotmap = "1.0.7"
recently-used-xbel = "1.0.0"
zip = "2.1.6"
unix_permissions_ext = "0.1.2"
users = "0.11.0"
[dependencies.libcosmic]
git = "https://github.com/pop-os/libcosmic.git"
@ -60,9 +62,10 @@ version = "0.2.1"
features = ["serde"]
[features]
default = ["desktop", "gvfs", "winit", "wgpu"]
default = ["desktop", "gvfs", "notify", "winit", "wgpu"]
desktop = ["libcosmic/desktop", "dep:freedesktop_entry_parser", "dep:xdg"]
gvfs = ["dep:gio"]
notify = ["dep:notify-rust"]
wayland = ["libcosmic/wayland"]
winit = ["libcosmic/winit"]
wgpu = ["libcosmic/wgpu"]