diff --git a/Cargo.lock b/Cargo.lock index 30ecbfb..35b3fce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -220,9 +220,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.20" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192" +checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" dependencies = [ "anstyle", "anstyle-parse", @@ -833,6 +833,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" dependencies = [ "memchr", + "regex-automata", "serde", ] @@ -1437,7 +1438,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1458,7 +1459,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "quote", "syn 2.0.106", @@ -1494,7 +1495,7 @@ dependencies = [ "libc", "libcosmic", "log", - "lzma-rust2", + "lzma-rust2 0.14.2", "md-5", "mime_guess", "notify-debouncer-full", @@ -1576,7 +1577,7 @@ dependencies = [ [[package]] name = "cosmic-settings-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-settings-daemon#eac9b17070947d627d2450ee58a77d48377c511e" +source = "git+https://github.com/pop-os/cosmic-settings-daemon#8616c40d235164779cd3f2ceec1fe9b2b4aceb40" dependencies = [ "cosmic-config", "ron", @@ -1597,7 +1598,7 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.14.2" -source = "git+https://github.com/pop-os/cosmic-text.git#e04bfd098f58958b09f0cf5e14a67f87e49dbaec" +source = "git+https://github.com/pop-os/cosmic-text.git#1140ce89b09433a10835d1219ea4f714329d1557" dependencies = [ "bitflags 2.9.4", "fontdb 0.23.0", @@ -1607,7 +1608,7 @@ dependencies = [ "rangemap", "rustc-hash 1.1.0", "self_cell", - "skrifa 0.36.0", + "skrifa", "smol_str", "swash", "sys-locale", @@ -1620,7 +1621,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "almost", "cosmic-config", @@ -1842,9 +1843,9 @@ checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376" [[package]] name = "deflate64" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" +checksum = "26bf8fc351c5ed29b5c2f0cbbac1b209b74f60ecd62e675a998df72c49af5204" [[package]] name = "deranged" @@ -2439,9 +2440,9 @@ checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "font-types" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a596f5713680923a2080d86de50fe472fb290693cf0f701187a1c8b36996b7" +checksum = "511e2c18a516c666d27867d2f9821f76e7d591f762e9fc41dd6cc5c90fe54b0b" dependencies = [ "bytemuck", ] @@ -2530,10 +2531,11 @@ dependencies = [ [[package]] name = "freedesktop-desktop-entry" -version = "0.7.17" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cad6ec36904c816446700d81a2a2b7968aa9f678c24821974fa9bd53b315228" +checksum = "528df05c8ed0bfd569c7018914ba1995be2a133ba9ead17628ddb0ff94b86331" dependencies = [ + "bstr", "gettext-rs", "log", "memchr", @@ -2954,9 +2956,9 @@ dependencies = [ [[package]] name = "grid" -version = "0.11.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" +checksum = "12101ecc8225ea6d675bc70263074eab6169079621c2186fe0c66590b2df9681" [[package]] name = "guillotiere" @@ -2980,14 +2982,14 @@ dependencies = [ [[package]] name = "harfrust" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a4c970f1a00edc1626f1e3cc039492b15b73df28b9fff70f95404a571b4fae" +checksum = "1f3fd23d35c2d8bcf34a1f0e9ea8c0ad263f0c8a9a47108eee23aac76e71645a" dependencies = [ "bitflags 2.9.4", "bytemuck", "core_maths", - "read-fonts 0.34.0", + "read-fonts", "smallvec", ] @@ -3175,7 +3177,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "dnd", "iced_accessibility", @@ -3193,7 +3195,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "accesskit", "accesskit_winit", @@ -3202,7 +3204,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "bitflags 2.9.4", "bytes", @@ -3226,7 +3228,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "futures", "iced_core", @@ -3252,7 +3254,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "bitflags 2.9.4", "bytemuck", @@ -3274,7 +3276,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3286,7 +3288,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3301,7 +3303,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "bytemuck", "cosmic-text", @@ -3317,7 +3319,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "as-raw-xcb-connection", "bitflags 2.9.4", @@ -3348,7 +3350,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3367,7 +3369,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -4452,7 +4454,7 @@ checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#4a71189d346e766c46f5bfaeb494a921fe0fccbd" +source = "git+https://github.com/pop-os/libcosmic.git#6c5b799b343f877c310d9f9bf23ea3f282bdf1a2" dependencies = [ "apply", "ashpd 0.12.0", @@ -4481,7 +4483,6 @@ dependencies = [ "iced_winit", "image", "libc", - "license", "mime 0.3.17", "palette", "raw-window-handle", @@ -4546,16 +4547,6 @@ dependencies = [ "zlib-rs", ] -[[package]] -name = "license" -version = "3.7.0+3.27.0" -source = "git+https://github.com/evenorog/license.git#6dac4a556165c96b8e94fefe1a6ad75f45721891" -dependencies = [ - "reword", - "serde", - "serde_json", -] - [[package]] name = "linebender_resource_handle" version = "0.1.1" @@ -4704,6 +4695,16 @@ dependencies = [ "sha2", ] +[[package]] +name = "lzma-rust2" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d3176655c152883186e161a1031192759660878ac04b2f776290b4f4e770a9" +dependencies = [ + "crc", + "sha2", +] + [[package]] name = "mac-notification-sys" version = "0.6.6" @@ -6170,19 +6171,9 @@ dependencies = [ [[package]] name = "read-fonts" -version = "0.29.3" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04ca636dac446b5664bd16c069c00a9621806895b8bb02c2dc68542b23b8f25d" -dependencies = [ - "bytemuck", - "font-types", -] - -[[package]] -name = "read-fonts" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8941f8e9d5f8ad3aebea330d01ac68c0167600eb31a86ecd86e97be4d13b51f5" +checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358" dependencies = [ "bytemuck", "core_maths", @@ -6315,15 +6306,6 @@ dependencies = [ "usvg", ] -[[package]] -name = "reword" -version = "7.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2de73ec80cfacafa51b73b0db31d6c3a4718fc6b0d479ef445609704020c1b0" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "rfd" version = "0.15.4" @@ -6734,22 +6716,12 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "skrifa" -version = "0.31.3" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbeb4ca4399663735553a09dd17ce7e49a0a0203f03b706b39628c4d913a8607" +checksum = "8c31071dedf532758ecf3fed987cdb4bd9509f900e026ab684b4ecb81ea49841" dependencies = [ "bytemuck", - "read-fonts 0.29.3", -] - -[[package]] -name = "skrifa" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37004372610e83ee2a4c69c7d896b41f33da6a3dc1a4fe07dd9b2629a549b1dc" -dependencies = [ - "bytemuck", - "read-fonts 0.34.0", + "read-fonts", ] [[package]] @@ -6958,11 +6930,11 @@ dependencies = [ [[package]] name = "swash" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f745de914febc7c9ab4388dfaf94bbc87e69f57bb41133a9b0c84d4be49856f3" +checksum = "47846491253e976bdd07d0f9cc24b7daf24720d11309302ccbbc6e6b6e53550a" dependencies = [ - "skrifa 0.31.3", + "skrifa", "yazi", "zeno", ] @@ -7037,12 +7009,13 @@ dependencies = [ [[package]] name = "taffy" -version = "0.3.11" -source = "git+https://github.com/DioxusLabs/taffy?rev=7781c70#7781c70241f7f572130c13106f2a869a9cf80885" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b25026fb8cc9ab51ab9fdabe5d11706796966f6d1c78e19871ef63be2b8f0644" dependencies = [ "arrayvec", "grid", - "num-traits", + "serde", "slotmap", ] @@ -7539,9 +7512,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "uds_windows" @@ -9314,7 +9287,7 @@ dependencies = [ "getrandom 0.3.3", "hmac", "indexmap 2.11.4", - "lzma-rust2", + "lzma-rust2 0.13.0", "memchr", "pbkdf2", "ppmd-rust", diff --git a/Cargo.toml b/Cargo.toml index e1c1a2d..5f8b89b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,8 +44,8 @@ xdg-mime = { git = "https://github.com/ebassi/xdg-mime-rs" } bzip2 = { version = "0.6", optional = true } #TODO: replace with pure Rust crate flate2 = "1.1" tar = "0.4.44" -lzma-rust2 = { version = "0.13", optional = true } -ordermap = { version = "0.5.10", features = ["serde"] } +lzma-rust2 = { version = "0.14", optional = true } +ordermap = { version = "0.5.12", features = ["serde"] } # Internationalization i18n-embed = { version = "0.16", features = [ "fluent-system", @@ -59,7 +59,7 @@ zip = "5.1.1" uzers = "0.12.1" md-5 = "0.10.6" png = "0.18" -jxl-oxide = { version = "0.12.4", features = ["image"] } +jxl-oxide = { version = "0.12.5", features = ["image"] } num_cpus = "1.17.0" # Completion-based IO runtime to enable io_uring / IOCP file IO support. @@ -135,6 +135,3 @@ tokio = { version = "1", features = ["rt", "macros"] } [workspace] members = ["cosmic-files-applet"] - -[patch.crates-io] -license = { git = "https://github.com/evenorog/license.git" } diff --git a/src/app.rs b/src/app.rs index 8e1420f..9d05d22 100644 --- a/src/app.rs +++ b/src/app.rs @@ -2096,6 +2096,7 @@ impl Application for App { .version(env!("CARGO_PKG_VERSION")) .author("System76") .license("GPL-3.0-only") + .license_url("https://spdx.org/licenses/GPL-3.0-only") .developers([("Jeremy Soller", "jeremy@system76.com")]) .links([ (fl!("repository"), "https://github.com/pop-os/cosmic-files"), @@ -4695,7 +4696,7 @@ impl Application for App { Some(match &self.context_page { ContextPage::About => context_drawer::about( &self.about, - Message::LaunchUrl, + |url| Message::LaunchUrl(url.to_string()), Message::ToggleContextPage(ContextPage::About), ), ContextPage::EditHistory => context_drawer::context_drawer(