merge: epoch-1.9.0 d'upstream

# Conflicts:
#	Cargo.lock
#	src/menu.rs
This commit is contained in:
Lionel DARNIS 2026-09-24 20:51:53 +02:00
commit 4b5fcfe5d7
26 changed files with 1250 additions and 1132 deletions

View file

@ -1,6 +1,6 @@
[package]
name = "cosmic-files"
version = "1.8.0"
version = "1.9.0"
authors = ["Jeremy Soller <jeremy@system76.com>"]
edition = "2024"
license = "GPL-3.0-only"
@ -11,16 +11,16 @@ anyhow = "1"
jiff = "0.2"
jiff-icu = "0.2"
icu = { version = "2.2.0", features = ["compiled_data"] }
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "32283d7", optional = true }
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "c0cff4d", optional = true }
cosmic-mime-apps = { git = "https://github.com/pop-os/cosmic-mime-apps.git", optional = true }
dirs = "6.0.0"
gio = { version = "0.21", optional = true }
glib = { version = "0.21", optional = true }
glob = "0.3"
ignore = "0.4"
image = "0.25"
image.workspace = true
libc = "0.2"
log = "0.4"
log.workspace = true
mime_guess = "2"
notify-debouncer-full = "0.7"
notify-rust = { version = "4", optional = true }
@ -166,4 +166,8 @@ mime = { git = "https://forge.aditua.com/leyoda/window_clipboard.git", branch =
cosmic-text = { path = "../cosmic-text" }
[workspace]
members = ["cosmic-files-applet"]
members = ["cosmic-files-applet", "cosmic-files-thumbnailer"]
[workspace.dependencies]
image = "0.25"
log = "0.4"