diff --git a/Cargo.lock b/Cargo.lock
index 24b1948d7fb09368eee5c21d26695bf65fd68d19..53cd97a6a076b49c42f90ac06121ca10aeab9d0b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,64 +20,75 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
[[package]]
name = "accesskit"
-version = "0.12.2"
-source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d"
+version = "0.16.0"
+source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3"
+
+[[package]]
+name = "accesskit_atspi_common"
+version = "0.9.0"
+source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3"
+dependencies = [
+ "accesskit",
+ "accesskit_consumer",
+ "atspi-common",
+ "serde",
+ "thiserror",
+ "zvariant 3.15.2",
+]
[[package]]
name = "accesskit_consumer"
-version = "0.17.0"
-source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d"
+version = "0.24.0"
+source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3"
dependencies = [
"accesskit",
+ "immutable-chunkmap",
]
[[package]]
name = "accesskit_macos"
-version = "0.11.0"
-source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d"
+version = "0.17.0"
+source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3"
dependencies = [
"accesskit",
"accesskit_consumer",
- "icrate 0.1.2",
- "objc2 0.5.2",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
"once_cell",
]
[[package]]
name = "accesskit_unix"
-version = "0.7.1"
-source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d"
+version = "0.12.0"
+source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3"
dependencies = [
"accesskit",
- "accesskit_consumer",
- "async-channel",
- "async-executor",
- "async-task",
+ "accesskit_atspi_common",
"atspi",
"futures-lite 1.13.0",
- "futures-util",
- "once_cell",
"serde",
+ "tokio",
+ "tokio-stream",
"zbus 3.15.2",
]
[[package]]
name = "accesskit_windows"
-version = "0.16.0"
-source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d"
+version = "0.22.0"
+source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3"
dependencies = [
"accesskit",
"accesskit_consumer",
- "once_cell",
"paste",
"static_assertions",
- "windows 0.48.0",
+ "windows 0.54.0",
]
[[package]]
name = "accesskit_winit"
-version = "0.18.1"
-source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d"
+version = "0.22.0"
+source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3"
dependencies = [
"accesskit",
"accesskit_macos",
@@ -96,12 +107,6 @@ dependencies = [
"gimli",
]
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
[[package]]
name = "adler2"
version = "2.0.0"
@@ -138,9 +143,9 @@ checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
[[package]]
name = "allocator-api2"
-version = "0.2.18"
+version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+checksum = "611cc2ae7d2e242c457e4be7f97036b8ad9ca152b499f53faf99b1ed8fc2553f"
[[package]]
name = "almost"
@@ -158,7 +163,7 @@ dependencies = [
"derive_more",
"futures",
"futures-util",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.1",
"i18n-embed",
"i18n-embed-fl",
"lektor_lib",
@@ -177,9 +182,9 @@ dependencies = [
[[package]]
name = "android-activity"
-version = "0.5.2"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289"
+checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
dependencies = [
"android-properties",
"bitflags 2.6.0",
@@ -191,7 +196,7 @@ dependencies = [
"log",
"ndk",
"ndk-context",
- "ndk-sys",
+ "ndk-sys 0.6.0+11769913",
"num_enum",
"thiserror",
]
@@ -219,15 +224,15 @@ dependencies = [
[[package]]
name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
[[package]]
name = "anyhow"
-version = "1.0.89"
+version = "1.0.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
[[package]]
name = "apply"
@@ -270,11 +275,11 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
[[package]]
name = "ash"
-version = "0.37.3+1.3.251"
+version = "0.38.0+1.3.281"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
+checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f"
dependencies = [
- "libloading 0.7.4",
+ "libloading",
]
[[package]]
@@ -283,7 +288,7 @@ version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093"
dependencies = [
- "async-fs 2.1.2",
+ "async-fs",
"async-net",
"enumflags2",
"futures-channel",
@@ -355,23 +360,11 @@ checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
dependencies = [
"async-task",
"concurrent-queue",
- "fastrand 2.1.1",
- "futures-lite 2.3.0",
+ "fastrand 2.2.0",
+ "futures-lite 2.5.0",
"slab",
]
-[[package]]
-name = "async-fs"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
-dependencies = [
- "async-lock 2.8.0",
- "autocfg",
- "blocking",
- "futures-lite 1.13.0",
-]
-
[[package]]
name = "async-fs"
version = "2.1.2"
@@ -380,7 +373,7 @@ checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
dependencies = [
"async-lock 3.4.0",
"blocking",
- "futures-lite 2.3.0",
+ "futures-lite 2.5.0",
]
[[package]]
@@ -405,18 +398,18 @@ dependencies = [
[[package]]
name = "async-io"
-version = "2.3.4"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
+checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
dependencies = [
"async-lock 3.4.0",
"cfg-if",
"concurrent-queue",
"futures-io",
- "futures-lite 2.3.0",
+ "futures-lite 2.5.0",
"parking",
- "polling 3.7.3",
- "rustix 0.38.37",
+ "polling 3.7.4",
+ "rustix 0.38.39",
"slab",
"tracing",
"windows-sys 0.59.0",
@@ -448,9 +441,9 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7"
dependencies = [
- "async-io 2.3.4",
+ "async-io 2.4.0",
"blocking",
- "futures-lite 2.3.0",
+ "futures-lite 2.5.0",
]
[[package]]
@@ -466,7 +459,7 @@ dependencies = [
"cfg-if",
"event-listener 3.1.0",
"futures-lite 1.13.0",
- "rustix 0.38.37",
+ "rustix 0.38.39",
"windows-sys 0.48.0",
]
@@ -477,15 +470,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
dependencies = [
"async-channel",
- "async-io 2.3.4",
+ "async-io 2.4.0",
"async-lock 3.4.0",
"async-signal",
"async-task",
"blocking",
"cfg-if",
"event-listener 5.3.1",
- "futures-lite 2.3.0",
- "rustix 0.38.37",
+ "futures-lite 2.5.0",
+ "rustix 0.38.39",
"tracing",
]
@@ -497,7 +490,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -506,13 +499,13 @@ version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
dependencies = [
- "async-io 2.3.4",
+ "async-io 2.4.0",
"async-lock 3.4.0",
"atomic-waker",
"cfg-if",
"futures-core",
"futures-io",
- "rustix 0.38.37",
+ "rustix 0.38.39",
"signal-hook-registry",
"slab",
"windows-sys 0.59.0",
@@ -532,7 +525,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -546,7 +539,7 @@ name = "atomicwrites"
version = "0.4.2"
source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768"
dependencies = [
- "rustix 0.38.37",
+ "rustix 0.38.39",
"tempfile",
"windows-sys 0.48.0",
]
@@ -666,7 +659,7 @@ checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -678,7 +671,7 @@ dependencies = [
"addr2line",
"cfg-if",
"libc",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
"object",
"rustc-demangle",
"windows-targets 0.52.6",
@@ -707,18 +700,18 @@ dependencies = [
[[package]]
name = "bit-set"
-version = "0.5.3"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f"
dependencies = [
"bit-vec",
]
[[package]]
name = "bit-vec"
-version = "0.6.3"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22"
[[package]]
name = "bit_field"
@@ -756,33 +749,13 @@ dependencies = [
"generic-array",
]
-[[package]]
-name = "block-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7"
-dependencies = [
- "objc-sys",
-]
-
-[[package]]
-name = "block2"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68"
-dependencies = [
- "block-sys",
- "objc2 0.4.1",
-]
-
[[package]]
name = "block2"
-version = "0.4.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f"
+checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
dependencies = [
- "block-sys",
- "objc2 0.5.2",
+ "objc2",
]
[[package]]
@@ -794,7 +767,7 @@ dependencies = [
"async-channel",
"async-task",
"futures-io",
- "futures-lite 2.3.0",
+ "futures-lite 2.5.0",
"piper",
]
@@ -827,7 +800,7 @@ checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -838,23 +811,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
-
-[[package]]
-name = "calloop"
-version = "0.12.4"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298"
-dependencies = [
- "bitflags 2.6.0",
- "log",
- "polling 3.7.3",
- "rustix 0.38.37",
- "slab",
- "thiserror",
-]
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
[[package]]
name = "calloop"
@@ -864,41 +823,29 @@ checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
dependencies = [
"bitflags 2.6.0",
"log",
- "polling 3.7.3",
- "rustix 0.38.37",
+ "polling 3.7.4",
+ "rustix 0.38.39",
"slab",
"thiserror",
]
-[[package]]
-name = "calloop-wayland-source"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02"
-dependencies = [
- "calloop 0.12.4",
- "rustix 0.38.37",
- "wayland-backend",
- "wayland-client",
-]
-
[[package]]
name = "calloop-wayland-source"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
dependencies = [
- "calloop 0.13.0",
- "rustix 0.38.37",
+ "calloop",
+ "rustix 0.38.39",
"wayland-backend",
"wayland-client",
]
[[package]]
name = "cc"
-version = "1.1.30"
+version = "1.1.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
+checksum = "40545c26d092346d8a8dab71ee48e7685a7a9cba76e634790c215b41a4a7b4cf"
dependencies = [
"jobserver",
"libc",
@@ -966,9 +913,9 @@ dependencies = [
[[package]]
name = "clap_complete"
-version = "4.5.33"
+version = "4.5.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9646e2e245bf62f45d39a0f3f36f1171ad1ea0d6967fd114bca72cb02a8fcdfb"
+checksum = "11611dca53440593f38e6b25ec629de50b14cdfa63adc0fb856115a2c6d97595"
dependencies = [
"clap",
]
@@ -982,7 +929,7 @@ dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -1003,7 +950,7 @@ dependencies = [
[[package]]
name = "clipboard_macos"
version = "0.1.0"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9"
+source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265"
dependencies = [
"objc",
"objc-foundation",
@@ -1013,7 +960,7 @@ dependencies = [
[[package]]
name = "clipboard_wayland"
version = "0.2.2"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9"
+source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265"
dependencies = [
"dnd",
"mime 0.1.0",
@@ -1023,7 +970,7 @@ dependencies = [
[[package]]
name = "clipboard_x11"
version = "0.4.2"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9"
+source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265"
dependencies = [
"thiserror",
"x11rb",
@@ -1197,7 +1144,7 @@ dependencies = [
[[package]]
name = "cosmic-config"
version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic.git#9c62f19e4b80b6bcffde024698015d3a533cb944"
+source = "git+https://github.com/pop-os/libcosmic.git#8c69491f2a324fff53d6e8a6180dd6f4916f64a5"
dependencies = [
"atomicwrites",
"cosmic-config-derive",
@@ -1219,7 +1166,7 @@ dependencies = [
[[package]]
name = "cosmic-config-derive"
version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic.git#9c62f19e4b80b6bcffde024698015d3a533cb944"
+source = "git+https://github.com/pop-os/libcosmic.git#8c69491f2a324fff53d6e8a6180dd6f4916f64a5"
dependencies = [
"quote",
"syn 1.0.109",
@@ -1228,7 +1175,7 @@ dependencies = [
[[package]]
name = "cosmic-settings-daemon"
version = "0.1.0"
-source = "git+https://github.com/pop-os/dbus-settings-bindings#931f5db558bf3fcb572ff4e18f7f1618a7430046"
+source = "git+https://github.com/pop-os/dbus-settings-bindings#62100129240d164e39fff16bda34faad520936de"
dependencies = [
"zbus 4.4.0",
]
@@ -1236,15 +1183,15 @@ dependencies = [
[[package]]
name = "cosmic-text"
version = "0.12.1"
-source = "git+https://github.com/pop-os/cosmic-text.git#4fe90bb6126c22f589b46768d7754d65ae300c5e"
+source = "git+https://github.com/pop-os/cosmic-text.git#1f4065c1c3399efad58841082212f7c039b58480"
dependencies = [
"bitflags 2.6.0",
- "fontdb",
+ "fontdb 0.16.2",
"log",
"rangemap",
"rayon",
"rustc-hash 1.1.0",
- "rustybuzz 0.14.1",
+ "rustybuzz",
"self_cell 1.0.4",
"smol_str",
"swash",
@@ -1259,7 +1206,7 @@ dependencies = [
[[package]]
name = "cosmic-theme"
version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic.git#9c62f19e4b80b6bcffde024698015d3a533cb944"
+source = "git+https://github.com/pop-os/libcosmic.git#8c69491f2a324fff53d6e8a6180dd6f4916f64a5"
dependencies = [
"almost",
"cosmic-config",
@@ -1371,11 +1318,12 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
[[package]]
name = "d3d12"
-version = "0.19.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
+version = "22.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017"
dependencies = [
"bitflags 2.6.0",
- "libloading 0.8.5",
+ "libloading",
"winapi",
]
@@ -1400,7 +1348,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -1411,7 +1359,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -1463,7 +1411,7 @@ dependencies = [
"convert_case",
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
"unicode-xid",
]
@@ -1476,7 +1424,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -1524,7 +1472,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -1533,7 +1481,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
dependencies = [
- "libloading 0.8.5",
+ "libloading",
]
[[package]]
@@ -1548,21 +1496,35 @@ dependencies = [
[[package]]
name = "dnd"
version = "0.1.0"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9"
+source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265"
dependencies = [
"bitflags 2.6.0",
"mime 0.1.0",
"raw-window-handle",
- "smithay-client-toolkit 0.19.2",
+ "smithay-client-toolkit",
"smithay-clipboard",
]
+[[package]]
+name = "document-features"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0"
+dependencies = [
+ "litrs",
+]
+
[[package]]
name = "downcast-rs"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+[[package]]
+name = "dpi"
+version = "0.1.1"
+source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e"
+
[[package]]
name = "drm"
version = "0.11.1"
@@ -1573,7 +1535,7 @@ dependencies = [
"bytemuck",
"drm-ffi",
"drm-fourcc",
- "rustix 0.38.37",
+ "rustix 0.38.39",
]
[[package]]
@@ -1583,7 +1545,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6"
dependencies = [
"drm-sys",
- "rustix 0.38.37",
+ "rustix 0.38.39",
]
[[package]]
@@ -1632,7 +1594,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -1716,15 +1678,14 @@ dependencies = [
[[package]]
name = "exr"
-version = "1.72.0"
+version = "1.73.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4"
+checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0"
dependencies = [
"bit_field",
- "flume",
"half",
"lebe",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
"rayon-core",
"smallvec",
"zune-inflate",
@@ -1747,15 +1708,15 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
[[package]]
name = "fdeflate"
-version = "0.3.5"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab"
+checksum = "07c6f4c64c1d33a3111c4466f7365ebdcc37c5bd1ea0d62aae2e3d722aacbedb"
dependencies = [
"simd-adler32",
]
@@ -1788,7 +1749,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
dependencies = [
"crc32fast",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
]
[[package]]
@@ -1847,15 +1808,6 @@ dependencies = [
"thiserror",
]
-[[package]]
-name = "flume"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
-dependencies = [
- "spin",
-]
-
[[package]]
name = "fnv"
version = "1.0.7"
@@ -1870,9 +1822,9 @@ checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
[[package]]
name = "font-types"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dda6e36206148f69fc6ecb1bb6c0dedd7ee469f3db1d0dc2045beea28430ca43"
+checksum = "b3971f9a5ca983419cdc386941ba3b9e1feba01a0ab888adf78739feb2798492"
dependencies = [
"bytemuck",
]
@@ -1883,7 +1835,7 @@ version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7"
dependencies = [
- "roxmltree 0.20.0",
+ "roxmltree",
]
[[package]]
@@ -1900,6 +1852,20 @@ dependencies = [
"ttf-parser 0.20.0",
]
+[[package]]
+name = "fontdb"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770"
+dependencies = [
+ "fontconfig-parser",
+ "log",
+ "memmap2 0.9.5",
+ "slotmap",
+ "tinyvec",
+ "ttf-parser 0.21.1",
+]
+
[[package]]
name = "foreign-types"
version = "0.5.0"
@@ -1918,7 +1884,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -2034,11 +2000,11 @@ dependencies = [
[[package]]
name = "futures-lite"
-version = "2.3.0"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1"
dependencies = [
- "fastrand 2.1.1",
+ "fastrand 2.2.0",
"futures-core",
"futures-io",
"parking",
@@ -2053,7 +2019,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -2117,16 +2083,6 @@ dependencies = [
"wasi",
]
-[[package]]
-name = "gif"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
-dependencies = [
- "color_quant",
- "weezl",
-]
-
[[package]]
name = "gif"
version = "0.13.1"
@@ -2156,9 +2112,9 @@ dependencies = [
[[package]]
name = "glam"
-version = "0.24.2"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
[[package]]
name = "glow"
@@ -2174,24 +2130,13 @@ dependencies = [
[[package]]
name = "glutin_wgl_sys"
-version = "0.5.0"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead"
+checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c"
dependencies = [
"gl_generator",
]
-[[package]]
-name = "glyphon"
-version = "0.5.0"
-source = "git+https://github.com/pop-os/glyphon.git?tag=v0.5.0#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8"
-dependencies = [
- "cosmic-text",
- "etagere",
- "lru",
- "wgpu",
-]
-
[[package]]
name = "gpu-alloc"
version = "0.6.0"
@@ -2213,9 +2158,9 @@ dependencies = [
[[package]]
name = "gpu-allocator"
-version = "0.25.0"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884"
+checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7"
dependencies = [
"log",
"presser",
@@ -2226,9 +2171,9 @@ dependencies = [
[[package]]
name = "gpu-descriptor"
-version = "0.2.4"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
+checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557"
dependencies = [
"bitflags 2.6.0",
"gpu-descriptor-types",
@@ -2237,9 +2182,9 @@ dependencies = [
[[package]]
name = "gpu-descriptor-types"
-version = "0.1.2"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c"
+checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
dependencies = [
"bitflags 2.6.0",
]
@@ -2301,9 +2246,9 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.15.0"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
dependencies = [
"allocator-api2",
"equivalent",
@@ -2320,7 +2265,7 @@ dependencies = [
"bitflags 2.6.0",
"com",
"libc",
- "libloading 0.8.5",
+ "libloading",
"thiserror",
"widestring",
"winapi",
@@ -2449,9 +2394,9 @@ dependencies = [
[[package]]
name = "hyper-util"
-version = "0.1.9"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
dependencies = [
"bytes",
"futures-channel",
@@ -2482,9 +2427,9 @@ dependencies = [
[[package]]
name = "i18n-embed"
-version = "0.15.0"
+version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e901c87176ac0b615033c81dbe927c230f74700abfd60ed953a6f547c87bbe6d"
+checksum = "a7839d8c7bb8da7bd58c1112d3a1aeb7f178ff3df4ae87783e758ca3bfb750b7"
dependencies = [
"arc-swap",
"fluent",
@@ -2504,9 +2449,9 @@ dependencies = [
[[package]]
name = "i18n-embed-fl"
-version = "0.9.1"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d73fe51b9655599147183495551696628b335f75b2dbfa225196b16d69d7288e"
+checksum = "f6e9571c3cba9eba538eaa5ee40031b26debe76f0c7e17bafc97ea57a76cd82e"
dependencies = [
"dashmap",
"find-crate",
@@ -2515,25 +2460,25 @@ dependencies = [
"i18n-config",
"i18n-embed",
"lazy_static",
- "proc-macro-error",
+ "proc-macro-error2",
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.79",
+ "syn 2.0.87",
"unic-langid",
]
[[package]]
name = "i18n-embed-impl"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81093c4701672f59416582fe3145676126fd23ba5db910acad0793c1108aaa58"
+checksum = "0f2cc0e0523d1fe6fc2c6f66e5038624ea8091b3e7748b5e8e0c84b1698db6c2"
dependencies = [
"find-crate",
"i18n-config",
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -2547,7 +2492,7 @@ dependencies = [
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
- "windows-core",
+ "windows-core 0.52.0",
]
[[package]]
@@ -2561,8 +2506,8 @@ dependencies = [
[[package]]
name = "iced"
-version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic.git#9c62f19e4b80b6bcffde024698015d3a533cb944"
+version = "0.14.0-dev"
+source = "git+https://github.com/pop-os/libcosmic.git#8c69491f2a324fff53d6e8a6180dd6f4916f64a5"
dependencies = [
"dnd",
"iced_accessibility",
@@ -2580,7 +2525,7 @@ dependencies = [
[[package]]
name = "iced_accessibility"
version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic.git#9c62f19e4b80b6bcffde024698015d3a533cb944"
+source = "git+https://github.com/pop-os/libcosmic.git#8c69491f2a324fff53d6e8a6180dd6f4916f64a5"
dependencies = [
"accesskit",
"accesskit_winit",
@@ -2588,46 +2533,61 @@ dependencies = [
[[package]]
name = "iced_core"
-version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic.git#9c62f19e4b80b6bcffde024698015d3a533cb944"
+version = "0.14.0-dev"
+source = "git+https://github.com/pop-os/libcosmic.git#8c69491f2a324fff53d6e8a6180dd6f4916f64a5"
dependencies = [
"bitflags 2.6.0",
+ "bytes",
"dnd",
+ "glam",
"log",
"mime 0.1.0",
"num-traits",
+ "once_cell",
"palette",
"raw-window-handle",
+ "rustc-hash 2.0.0",
"serde",
"smol_str",
"thiserror",
"web-time",
"window_clipboard",
- "xxhash-rust",
]
[[package]]
name = "iced_futures"
-version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic.git#9c62f19e4b80b6bcffde024698015d3a533cb944"
+version = "0.14.0-dev"
+source = "git+https://github.com/pop-os/libcosmic.git#8c69491f2a324fff53d6e8a6180dd6f4916f64a5"
dependencies = [
"futures",
"iced_core",
"log",
+ "rustc-hash 2.0.0",
"tokio",
"wasm-bindgen-futures",
"wasm-timer",
]
+[[package]]
+name = "iced_glyphon"
+version = "0.6.0"
+source = "git+https://github.com/pop-os/glyphon.git?tag=iced-0.14-dev#6ef9d12a20cfd0f7bdf38136a26ded9f7459ec8b"
+dependencies = [
+ "cosmic-text",
+ "etagere",
+ "lru",
+ "rustc-hash 2.0.0",
+ "wgpu",
+]
+
[[package]]
name = "iced_graphics"
-version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic.git#9c62f19e4b80b6bcffde024698015d3a533cb944"
+version = "0.14.0-dev"
+source = "git+https://github.com/pop-os/libcosmic.git#8c69491f2a324fff53d6e8a6180dd6f4916f64a5"
dependencies = [
"bitflags 2.6.0",
"bytemuck",
"cosmic-text",
- "glam",
"half",
"iced_core",
"iced_futures",
@@ -2637,16 +2597,15 @@ dependencies = [
"lyon_path",
"once_cell",
"raw-window-handle",
- "rustc-hash 1.1.0",
+ "rustc-hash 2.0.0",
"thiserror",
"unicode-segmentation",
- "xxhash-rust",
]
[[package]]
name = "iced_renderer"
-version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic.git#9c62f19e4b80b6bcffde024698015d3a533cb944"
+version = "0.14.0-dev"
+source = "git+https://github.com/pop-os/libcosmic.git#8c69491f2a324fff53d6e8a6180dd6f4916f64a5"
dependencies = [
"iced_graphics",
"iced_tiny_skia",
@@ -2657,67 +2616,60 @@ dependencies = [
[[package]]
name = "iced_runtime"
-version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic.git#9c62f19e4b80b6bcffde024698015d3a533cb944"
+version = "0.14.0-dev"
+source = "git+https://github.com/pop-os/libcosmic.git#8c69491f2a324fff53d6e8a6180dd6f4916f64a5"
dependencies = [
+ "bytes",
"dnd",
"iced_core",
"iced_futures",
+ "raw-window-handle",
"thiserror",
"window_clipboard",
]
-[[package]]
-name = "iced_style"
-version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic.git#9c62f19e4b80b6bcffde024698015d3a533cb944"
-dependencies = [
- "iced_core",
- "once_cell",
- "palette",
-]
-
[[package]]
name = "iced_tiny_skia"
-version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic.git#9c62f19e4b80b6bcffde024698015d3a533cb944"
+version = "0.14.0-dev"
+source = "git+https://github.com/pop-os/libcosmic.git#8c69491f2a324fff53d6e8a6180dd6f4916f64a5"
dependencies = [
"bytemuck",
"cosmic-text",
"iced_graphics",
- "kurbo",
+ "kurbo 0.10.4",
"log",
"resvg",
- "rustc-hash 1.1.0",
+ "rustc-hash 2.0.0",
"softbuffer",
"tiny-skia",
- "xxhash-rust",
]
[[package]]
name = "iced_wgpu"
-version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic.git#9c62f19e4b80b6bcffde024698015d3a533cb944"
+version = "0.14.0-dev"
+source = "git+https://github.com/pop-os/libcosmic.git#8c69491f2a324fff53d6e8a6180dd6f4916f64a5"
dependencies = [
"as-raw-xcb-connection",
"bitflags 2.6.0",
"bytemuck",
"futures",
"glam",
- "glyphon",
"guillotiere",
+ "iced_glyphon",
"iced_graphics",
"log",
"lyon",
"once_cell",
"raw-window-handle",
"resvg",
- "rustix 0.38.37",
- "smithay-client-toolkit 0.19.2",
+ "rustc-hash 2.0.0",
+ "rustix 0.38.39",
+ "smithay-client-toolkit",
+ "thiserror",
"tiny-xlib",
"wayland-backend",
"wayland-client",
- "wayland-protocols 0.32.4",
+ "wayland-protocols",
"wayland-sys",
"wgpu",
"x11rb",
@@ -2725,15 +2677,16 @@ dependencies = [
[[package]]
name = "iced_widget"
-version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic.git#9c62f19e4b80b6bcffde024698015d3a533cb944"
+version = "0.14.0-dev"
+source = "git+https://github.com/pop-os/libcosmic.git#8c69491f2a324fff53d6e8a6180dd6f4916f64a5"
dependencies = [
"dnd",
"iced_renderer",
"iced_runtime",
- "iced_style",
"num-traits",
+ "once_cell",
"ouroboros",
+ "rustc-hash 2.0.0",
"thiserror",
"unicode-segmentation",
"window_clipboard",
@@ -2741,16 +2694,18 @@ dependencies = [
[[package]]
name = "iced_winit"
-version = "0.12.0"
-source = "git+https://github.com/pop-os/libcosmic.git#9c62f19e4b80b6bcffde024698015d3a533cb944"
+version = "0.14.0-dev"
+source = "git+https://github.com/pop-os/libcosmic.git#8c69491f2a324fff53d6e8a6180dd6f4916f64a5"
dependencies = [
"dnd",
+ "iced_futures",
"iced_graphics",
"iced_runtime",
- "iced_style",
"log",
+ "rustc-hash 2.0.0",
"thiserror",
"tracing",
+ "wasm-bindgen-futures",
"web-sys",
"winapi",
"window_clipboard",
@@ -2758,81 +2713,198 @@ dependencies = [
]
[[package]]
-name = "icrate"
-version = "0.0.4"
+name = "icu_collections"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
dependencies = [
- "block2 0.3.0",
- "dispatch",
- "objc2 0.4.1",
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
]
[[package]]
-name = "icrate"
-version = "0.1.2"
+name = "icu_locid"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
dependencies = [
- "block2 0.4.0",
- "objc2 0.5.2",
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
]
[[package]]
-name = "ident_case"
-version = "1.0.1"
+name = "icu_locid_transform"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
[[package]]
-name = "idna"
-version = "0.5.0"
+name = "icu_locid_transform_data"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
[[package]]
-name = "image"
-version = "0.24.9"
+name = "icu_normalizer"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "exr",
- "gif 0.13.1",
- "jpeg-decoder",
- "num-traits",
- "png",
- "qoi",
- "tiff",
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
]
[[package]]
-name = "imagesize"
-version = "0.12.0"
+name = "icu_normalizer_data"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
[[package]]
-name = "indexmap"
-version = "2.6.0"
+name = "icu_properties"
+version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
dependencies = [
- "equivalent",
- "hashbrown 0.15.0",
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
]
[[package]]
-name = "inotify"
-version = "0.9.6"
+name = "icu_properties_data"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "image"
+version = "0.24.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "color_quant",
+ "exr",
+ "gif",
+ "jpeg-decoder",
+ "num-traits",
+ "png",
+ "qoi",
+ "tiff",
+]
+
+[[package]]
+name = "imagesize"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284"
+
+[[package]]
+name = "immutable-chunkmap"
+version = "2.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.1",
+]
+
+[[package]]
+name = "inotify"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
dependencies = [
"bitflags 1.3.2",
"inotify-sys",
@@ -2893,6 +2965,15 @@ version = "2.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
[[package]]
name = "itoa"
version = "1.0.11"
@@ -2964,7 +3045,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
dependencies = [
"libc",
- "libloading 0.8.5",
+ "libloading",
"pkg-config",
]
@@ -3005,11 +3086,22 @@ dependencies = [
[[package]]
name = "kurbo"
-version = "0.9.5"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440"
+dependencies = [
+ "arrayvec",
+ "smallvec",
+]
+
+[[package]]
+name = "kurbo"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b"
+checksum = "89234b2cc610a7dd927ebde6b41dd1a5d4214cffaef4cf1fb2195d592f92518f"
dependencies = [
"arrayvec",
+ "smallvec",
]
[[package]]
@@ -3017,7 +3109,7 @@ name = "kurisu_api"
version = "8.0.1"
dependencies = [
"derive_more",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.1",
"lektor_procmacros",
"lektor_utils",
"log",
@@ -3058,13 +3150,13 @@ name = "lektor_mpris"
version = "8.0.1"
dependencies = [
"derive_more",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.1",
"lektor_procmacros",
"lektor_utils",
"log",
"serde",
"tokio",
- "zbus 4.4.0",
+ "zbus 5.1.1",
]
[[package]]
@@ -3075,7 +3167,7 @@ dependencies = [
"chrono",
"derive_more",
"futures",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.1",
"kurisu_api",
"lektor_procmacros",
"lektor_utils",
@@ -3112,7 +3204,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -3121,7 +3213,7 @@ version = "8.0.1"
dependencies = [
"anyhow",
"futures",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.1",
"kurisu_api",
"lektor_nkdb",
"lektor_utils",
@@ -3138,7 +3230,7 @@ version = "8.0.1"
dependencies = [
"aho-corasick",
"futures",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.1",
"lektor_payloads",
"log",
]
@@ -3167,7 +3259,7 @@ dependencies = [
"axum",
"clap",
"futures",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.1",
"hyper",
"hyper-util",
"lektor_mpris",
@@ -3187,14 +3279,14 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.161"
+version = "0.2.162"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
[[package]]
name = "libcosmic"
version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic.git#9c62f19e4b80b6bcffde024698015d3a533cb944"
+source = "git+https://github.com/pop-os/libcosmic.git#8c69491f2a324fff53d6e8a6180dd6f4916f64a5"
dependencies = [
"apply",
"ashpd 0.9.2",
@@ -3211,7 +3303,6 @@ dependencies = [
"iced_futures",
"iced_renderer",
"iced_runtime",
- "iced_style",
"iced_tiny_skia",
"iced_wgpu",
"iced_widget",
@@ -3232,16 +3323,6 @@ dependencies = [
"zbus 4.4.0",
]
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if",
- "winapi",
-]
-
[[package]]
name = "libloading"
version = "0.8.5"
@@ -3254,9 +3335,9 @@ dependencies = [
[[package]]
name = "libm"
-version = "0.2.8"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
[[package]]
name = "libredox"
@@ -3287,6 +3368,18 @@ version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7"
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
+[[package]]
+name = "litrs"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
+
[[package]]
name = "lkt"
version = "8.0.1"
@@ -3341,9 +3434,6 @@ name = "lru"
version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
-dependencies = [
- "hashbrown 0.15.0",
-]
[[package]]
name = "lyon"
@@ -3367,9 +3457,9 @@ dependencies = [
[[package]]
name = "lyon_geom"
-version = "1.0.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9"
+checksum = "8af69edc087272df438b3ee436c4bb6d7c04aa8af665cfd398feae627dbd8570"
dependencies = [
"arrayvec",
"euclid",
@@ -3378,9 +3468,9 @@ dependencies = [
[[package]]
name = "lyon_path"
-version = "1.0.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c08a606c7a59638d6c6aa18ac91a06aa9fb5f765a7efb27e6a4da58700740d7"
+checksum = "8e0b8aec2f58586f6eef237985b9a9b7cb3a3aff4417c575075cf95bf925252e"
dependencies = [
"lyon_geom",
"num-traits",
@@ -3456,9 +3546,9 @@ dependencies = [
[[package]]
name = "metal"
-version = "0.27.0"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25"
+checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21"
dependencies = [
"bitflags 2.6.0",
"block",
@@ -3472,7 +3562,7 @@ dependencies = [
[[package]]
name = "mime"
version = "0.1.0"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9"
+source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265"
dependencies = [
"smithay-clipboard",
]
@@ -3483,15 +3573,6 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
[[package]]
name = "miniz_oxide"
version = "0.8.0"
@@ -3534,17 +3615,18 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b"
[[package]]
name = "naga"
-version = "0.19.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
+version = "22.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad"
dependencies = [
"arrayvec",
"bit-set",
"bitflags 2.6.0",
+ "cfg_aliases 0.1.1",
"codespan-reporting",
"hexf-parse",
"indexmap",
"log",
- "num-traits",
"rustc-hash 1.1.0",
"spirv",
"termcolor",
@@ -3554,14 +3636,14 @@ dependencies = [
[[package]]
name = "ndk"
-version = "0.8.0"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
+checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
dependencies = [
"bitflags 2.6.0",
"jni-sys",
"log",
- "ndk-sys",
+ "ndk-sys 0.6.0+11769913",
"num_enum",
"raw-window-handle",
"thiserror",
@@ -3582,6 +3664,15 @@ dependencies = [
"jni-sys",
]
+[[package]]
+name = "ndk-sys"
+version = "0.6.0+11769913"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
+dependencies = [
+ "jni-sys",
+]
+
[[package]]
name = "nix"
version = "0.26.4"
@@ -3728,7 +3819,7 @@ dependencies = [
"proc-macro-crate 3.2.0",
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -3738,7 +3829,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
dependencies = [
"malloc_buf",
- "objc_exception",
]
[[package]]
@@ -3760,29 +3850,89 @@ checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
[[package]]
name = "objc2"
-version = "0.4.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d"
+checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
dependencies = [
"objc-sys",
- "objc2-encode 3.0.0",
+ "objc2-encode",
]
[[package]]
-name = "objc2"
-version = "0.5.2"
+name = "objc2-app-kit"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
+checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
dependencies = [
- "objc-sys",
- "objc2-encode 4.0.3",
+ "bitflags 2.6.0",
+ "block2",
+ "libc",
+ "objc2",
+ "objc2-core-data",
+ "objc2-core-image",
+ "objc2-foundation",
+ "objc2-quartz-core",
]
[[package]]
-name = "objc2-encode"
-version = "3.0.0"
+name = "objc2-cloud-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-core-location",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-contacts"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-image"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
+]
+
+[[package]]
+name = "objc2-core-location"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666"
+checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-contacts",
+ "objc2-foundation",
+]
[[package]]
name = "objc2-encode"
@@ -3791,12 +3941,108 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"
[[package]]
-name = "objc_exception"
-version = "0.1.2"
+name = "objc2-foundation"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
+checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
dependencies = [
- "cc",
+ "bitflags 2.6.0",
+ "block2",
+ "dispatch",
+ "libc",
+ "objc2",
+]
+
+[[package]]
+name = "objc2-link-presentation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-metal"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
+]
+
+[[package]]
+name = "objc2-symbols"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-ui-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-cloud-kit",
+ "objc2-core-data",
+ "objc2-core-image",
+ "objc2-core-location",
+ "objc2-foundation",
+ "objc2-link-presentation",
+ "objc2-quartz-core",
+ "objc2-symbols",
+ "objc2-uniform-type-identifiers",
+ "objc2-user-notifications",
+]
+
+[[package]]
+name = "objc2-uniform-type-identifiers"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-core-location",
+ "objc2-foundation",
]
[[package]]
@@ -3860,9 +4106,9 @@ dependencies = [
[[package]]
name = "ouroboros"
-version = "0.17.2"
+version = "0.18.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954"
+checksum = "944fa20996a25aded6b4795c6d63f10014a7a83f8be9828a11860b08c5fc4a67"
dependencies = [
"aliasable",
"ouroboros_macro",
@@ -3871,15 +4117,16 @@ dependencies = [
[[package]]
name = "ouroboros_macro"
-version = "0.17.2"
+version = "0.18.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8"
+checksum = "39b0deead1528fd0e5947a8546a9642a9777c25f6e1e26f34c97b204bbb465bd"
dependencies = [
"heck 0.4.1",
- "proc-macro-error",
+ "itertools",
"proc-macro2",
+ "proc-macro2-diagnostics",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -3913,7 +4160,7 @@ dependencies = [
"by_address",
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -4012,7 +4259,7 @@ dependencies = [
"phf_shared",
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -4021,7 +4268,7 @@ version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
dependencies = [
- "siphasher",
+ "siphasher 0.3.11",
]
[[package]]
@@ -4030,11 +4277,31 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
+[[package]]
+name = "pin-project"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
[[package]]
name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
[[package]]
name = "pin-utils"
@@ -4049,7 +4316,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
dependencies = [
"atomic-waker",
- "fastrand 2.1.1",
+ "fastrand 2.2.0",
"futures-io",
]
@@ -4069,7 +4336,7 @@ dependencies = [
"crc32fast",
"fdeflate",
"flate2",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
]
[[package]]
@@ -4090,15 +4357,15 @@ dependencies = [
[[package]]
name = "polling"
-version = "3.7.3"
+version = "3.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
+checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
dependencies = [
"cfg-if",
"concurrent-queue",
"hermit-abi 0.4.0",
"pin-project-lite",
- "rustix 0.38.37",
+ "rustix 0.38.39",
"tracing",
"windows-sys 0.59.0",
]
@@ -4152,7 +4419,6 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
- "syn 1.0.109",
"version_check",
]
@@ -4168,20 +4434,55 @@ dependencies = [
]
[[package]]
-name = "proc-macro2"
-version = "1.0.88"
+name = "proc-macro-error-attr2"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
dependencies = [
- "unicode-ident",
+ "proc-macro2",
+ "quote",
]
[[package]]
-name = "profiling"
-version = "1.0.16"
+name = "proc-macro-error2"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
-
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "proc-macro2-diagnostics"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "version_check",
+ "yansi",
+]
+
+[[package]]
+name = "profiling"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
+
[[package]]
name = "qoi"
version = "0.4.1"
@@ -4237,10 +4538,11 @@ dependencies = [
[[package]]
name = "quinn-udp"
-version = "0.5.5"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b"
+checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da"
dependencies = [
+ "cfg_aliases 0.2.1",
"libc",
"once_cell",
"socket2 0.5.7",
@@ -4325,17 +4627,11 @@ dependencies = [
"crossbeam-utils",
]
-[[package]]
-name = "rctree"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f"
-
[[package]]
name = "read-fonts"
-version = "0.22.3"
+version = "0.22.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb94d9ac780fdcf9b6b252253f7d8f221379b84bd3573131139b383df69f85e1"
+checksum = "4a04b892cb6f91951f144c33321843790c8574c825aafdb16d815fd7183b5229"
dependencies = [
"bytemuck",
"font-types",
@@ -4350,15 +4646,6 @@ dependencies = [
"bitflags 1.3.2",
]
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags 1.3.2",
-]
-
[[package]]
name = "redox_syscall"
version = "0.4.1"
@@ -4390,9 +4677,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.11.0"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
dependencies = [
"aho-corasick",
"memchr",
@@ -4425,9 +4712,9 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
[[package]]
name = "reqwest"
-version = "0.12.8"
+version = "0.12.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
dependencies = [
"base64 0.22.1",
"bytes",
@@ -4467,15 +4754,14 @@ dependencies = [
[[package]]
name = "resvg"
-version = "0.37.0"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4"
+checksum = "944d052815156ac8fa77eaac055220e95ba0b01fa8887108ca710c03805d9051"
dependencies = [
- "gif 0.12.0",
+ "gif",
"jpeg-decoder",
"log",
"pico-args",
- "png",
"rgb",
"svgtypes",
"tiny-skia",
@@ -4547,12 +4833,6 @@ dependencies = [
"serde_derive",
]
-[[package]]
-name = "roxmltree"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
-
[[package]]
name = "roxmltree"
version = "0.20.0"
@@ -4579,7 +4859,7 @@ dependencies = [
"proc-macro2",
"quote",
"rust-embed-utils",
- "syn 2.0.79",
+ "syn 2.0.87",
"walkdir",
]
@@ -4637,9 +4917,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.38.37"
+version = "0.38.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee"
dependencies = [
"bitflags 2.6.0",
"errno",
@@ -4650,9 +4930,9 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.23.15"
+version = "0.23.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993"
+checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e"
dependencies = [
"once_cell",
"ring",
@@ -4694,22 +4974,6 @@ version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
-[[package]]
-name = "rustybuzz"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c"
-dependencies = [
- "bitflags 2.6.0",
- "bytemuck",
- "smallvec",
- "ttf-parser 0.20.0",
- "unicode-bidi-mirroring 0.1.0",
- "unicode-ccc 0.1.2",
- "unicode-properties",
- "unicode-script",
-]
-
[[package]]
name = "rustybuzz"
version = "0.14.1"
@@ -4721,8 +4985,8 @@ dependencies = [
"libm",
"smallvec",
"ttf-parser 0.21.1",
- "unicode-bidi-mirroring 0.2.0",
- "unicode-ccc 0.2.0",
+ "unicode-bidi-mirroring",
+ "unicode-ccc",
"unicode-properties",
"unicode-script",
]
@@ -4756,14 +5020,14 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "sctk-adwaita"
-version = "0.8.3"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7"
+checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec"
dependencies = [
"ab_glyph",
"log",
"memmap2 0.9.5",
- "smithay-client-toolkit 0.18.1",
+ "smithay-client-toolkit",
"tiny-skia",
]
@@ -4784,29 +5048,29 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a"
[[package]]
name = "serde"
-version = "1.0.210"
+version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.210"
+version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
name = "serde_json"
-version = "1.0.129"
+version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dbcf9b78a125ee667ae19388837dd12294b858d101fdd393cb9d5501ef09eb2"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [
"indexmap",
"itoa",
@@ -4833,7 +5097,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -4928,6 +5192,12 @@ version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+[[package]]
+name = "siphasher"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+
[[package]]
name = "skrifa"
version = "0.22.3"
@@ -4965,31 +5235,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "smithay-client-toolkit"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a"
-dependencies = [
- "bitflags 2.6.0",
- "calloop 0.12.4",
- "calloop-wayland-source 0.2.0",
- "cursor-icon",
- "libc",
- "log",
- "memmap2 0.9.5",
- "rustix 0.38.37",
- "thiserror",
- "wayland-backend",
- "wayland-client",
- "wayland-csd-frame",
- "wayland-cursor",
- "wayland-protocols 0.31.2",
- "wayland-protocols-wlr 0.2.0",
- "wayland-scanner",
- "xkeysym",
-]
-
[[package]]
name = "smithay-client-toolkit"
version = "0.19.2"
@@ -4998,21 +5243,21 @@ checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
dependencies = [
"bitflags 2.6.0",
"bytemuck",
- "calloop 0.13.0",
- "calloop-wayland-source 0.3.0",
+ "calloop",
+ "calloop-wayland-source",
"cursor-icon",
"libc",
"log",
"memmap2 0.9.5",
"pkg-config",
- "rustix 0.38.37",
+ "rustix 0.38.39",
"thiserror",
"wayland-backend",
"wayland-client",
"wayland-csd-frame",
"wayland-cursor",
- "wayland-protocols 0.32.4",
- "wayland-protocols-wlr 0.3.4",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
"wayland-scanner",
"xkbcommon",
"xkeysym",
@@ -5025,7 +5270,7 @@ source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007de
dependencies = [
"libc",
"raw-window-handle",
- "smithay-client-toolkit 0.19.2",
+ "smithay-client-toolkit",
"wayland-backend",
]
@@ -5069,7 +5314,7 @@ dependencies = [
"cocoa",
"core-graphics",
"drm",
- "fastrand 2.1.1",
+ "fastrand 2.2.0",
"foreign-types",
"js-sys",
"log",
@@ -5077,7 +5322,7 @@ dependencies = [
"objc",
"raw-window-handle",
"redox_syscall 0.4.1",
- "rustix 0.38.37",
+ "rustix 0.38.39",
"tiny-xlib",
"wasm-bindgen",
"wayland-backend",
@@ -5093,9 +5338,6 @@ name = "spin"
version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-dependencies = [
- "lock_api",
-]
[[package]]
name = "spirv"
@@ -5106,6 +5348,12 @@ dependencies = [
"bitflags 2.6.0",
]
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
[[package]]
name = "static_assertions"
version = "1.1.0"
@@ -5135,18 +5383,18 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "svg_fmt"
-version = "0.4.3"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca"
+checksum = "ce5d813d71d82c4cbc1742135004e4a79fd870214c155443451c139c9470a0aa"
[[package]]
name = "svgtypes"
-version = "0.13.0"
+version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70"
+checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e"
dependencies = [
- "kurbo",
- "siphasher",
+ "kurbo 0.11.1",
+ "siphasher 1.0.1",
]
[[package]]
@@ -5173,9 +5421,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.79"
+version = "2.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
dependencies = [
"proc-macro2",
"quote",
@@ -5197,11 +5445,22 @@ dependencies = [
"futures-core",
]
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
[[package]]
name = "sys-locale"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0"
+checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4"
dependencies = [
"libc",
]
@@ -5219,14 +5478,14 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.13.0"
+version = "3.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
dependencies = [
"cfg-if",
- "fastrand 2.1.1",
+ "fastrand 2.2.0",
"once_cell",
- "rustix 0.38.37",
+ "rustix 0.38.39",
"windows-sys 0.59.0",
]
@@ -5245,28 +5504,28 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
dependencies = [
- "rustix 0.38.37",
+ "rustix 0.38.39",
"windows-sys 0.59.0",
]
[[package]]
name = "thiserror"
-version = "1.0.64"
+version = "1.0.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.64"
+version = "1.0.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -5323,7 +5582,7 @@ checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c"
dependencies = [
"as-raw-xcb-connection",
"ctor-lite",
- "libloading 0.8.5",
+ "libloading",
"pkg-config",
"tracing",
]
@@ -5335,6 +5594,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
dependencies = [
"displaydoc",
+ "zerovec",
]
[[package]]
@@ -5354,9 +5614,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.40.0"
+version = "1.41.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
dependencies = [
"backtrace",
"bytes",
@@ -5378,7 +5638,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -5516,7 +5776,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
]
[[package]]
@@ -5603,24 +5863,12 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
-[[package]]
-name = "unicode-bidi-mirroring"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694"
-
[[package]]
name = "unicode-bidi-mirroring"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86"
-[[package]]
-name = "unicode-ccc"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1"
-
[[package]]
name = "unicode-ccc"
version = "0.2.0"
@@ -5639,15 +5887,6 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
-[[package]]
-name = "unicode-normalization"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
-dependencies = [
- "tinyvec",
-]
-
[[package]]
name = "unicode-properties"
version = "0.1.3"
@@ -5692,9 +5931,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]]
name = "url"
-version = "2.5.2"
+version = "2.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
dependencies = [
"form_urlencoded",
"idna",
@@ -5710,9 +5949,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
[[package]]
name = "ustr"
-version = "1.0.0"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e904a2279a4a36d2356425bb20be271029cc650c335bc82af8bfae30085a3d0"
+checksum = "18b19e258aa08450f93369cf56dd78063586adf19e92a75b338a800f799a0208"
dependencies = [
"ahash",
"byteorder",
@@ -5723,64 +5962,42 @@ dependencies = [
[[package]]
name = "usvg"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756"
-dependencies = [
- "base64 0.21.7",
- "log",
- "pico-args",
- "usvg-parser",
- "usvg-text-layout",
- "usvg-tree",
- "xmlwriter",
-]
-
-[[package]]
-name = "usvg-parser"
-version = "0.37.0"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc"
+checksum = "b84ea542ae85c715f07b082438a4231c3760539d902e11d093847a0b22963032"
dependencies = [
+ "base64 0.22.1",
"data-url",
"flate2",
+ "fontdb 0.18.0",
"imagesize",
- "kurbo",
+ "kurbo 0.11.1",
"log",
- "roxmltree 0.19.0",
+ "pico-args",
+ "roxmltree",
+ "rustybuzz",
"simplecss",
- "siphasher",
+ "siphasher 1.0.1",
+ "strict-num",
"svgtypes",
- "usvg-tree",
-]
-
-[[package]]
-name = "usvg-text-layout"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c"
-dependencies = [
- "fontdb",
- "kurbo",
- "log",
- "rustybuzz 0.12.1",
+ "tiny-skia-path",
"unicode-bidi",
"unicode-script",
"unicode-vo",
- "usvg-tree",
+ "xmlwriter",
]
[[package]]
-name = "usvg-tree"
-version = "0.37.0"
+name = "utf16_iter"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3"
-dependencies = [
- "rctree",
- "strict-num",
- "svgtypes",
- "tiny-skia-path",
-]
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
[[package]]
name = "version_check"
@@ -5841,7 +6058,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
"wasm-bindgen-shared",
]
@@ -5875,7 +6092,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -5909,7 +6126,7 @@ checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6"
dependencies = [
"cc",
"downcast-rs",
- "rustix 0.38.37",
+ "rustix 0.38.39",
"scoped-tls",
"smallvec",
"wayland-sys",
@@ -5917,12 +6134,12 @@ dependencies = [
[[package]]
name = "wayland-client"
-version = "0.31.6"
+version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d"
+checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280"
dependencies = [
"bitflags 2.6.0",
- "rustix 0.38.37",
+ "rustix 0.38.39",
"wayland-backend",
"wayland-scanner",
]
@@ -5940,32 +6157,20 @@ dependencies = [
[[package]]
name = "wayland-cursor"
-version = "0.31.6"
+version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb"
+checksum = "32b08bc3aafdb0035e7fe0fdf17ba0c09c268732707dca4ae098f60cb28c9e4c"
dependencies = [
- "rustix 0.38.37",
+ "rustix 0.38.39",
"wayland-client",
"xcursor",
]
[[package]]
name = "wayland-protocols"
-version = "0.31.2"
+version = "0.32.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4"
-dependencies = [
- "bitflags 2.6.0",
- "wayland-backend",
- "wayland-client",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-protocols"
-version = "0.32.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0"
+checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e"
dependencies = [
"bitflags 2.6.0",
"wayland-backend",
@@ -5975,40 +6180,27 @@ dependencies = [
[[package]]
name = "wayland-protocols-plasma"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
-dependencies = [
- "bitflags 2.6.0",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols 0.31.2",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-protocols-wlr"
-version = "0.2.0"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
+checksum = "9b31cab548ee68c7eb155517f2212049dc151f7cd7910c2b66abfd31c3ee12bd"
dependencies = [
"bitflags 2.6.0",
"wayland-backend",
"wayland-client",
- "wayland-protocols 0.31.2",
+ "wayland-protocols",
"wayland-scanner",
]
[[package]]
name = "wayland-protocols-wlr"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109"
+checksum = "782e12f6cd923c3c316130d56205ebab53f55d6666b7faddfad36cecaeeb4022"
dependencies = [
"bitflags 2.6.0",
"wayland-backend",
"wayland-client",
- "wayland-protocols 0.32.4",
+ "wayland-protocols",
"wayland-scanner",
]
@@ -6047,9 +6239,9 @@ dependencies = [
[[package]]
name = "web-time"
-version = "0.2.4"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -6072,12 +6264,13 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
[[package]]
name = "wgpu"
-version = "0.19.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
+version = "22.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433"
dependencies = [
"arrayvec",
- "cfg-if",
"cfg_aliases 0.1.1",
+ "document-features",
"js-sys",
"log",
"naga",
@@ -6096,14 +6289,15 @@ dependencies = [
[[package]]
name = "wgpu-core"
-version = "0.19.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
+version = "22.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a"
dependencies = [
"arrayvec",
"bit-vec",
"bitflags 2.6.0",
"cfg_aliases 0.1.1",
- "codespan-reporting",
+ "document-features",
"indexmap",
"log",
"naga",
@@ -6114,15 +6308,15 @@ dependencies = [
"rustc-hash 1.1.0",
"smallvec",
"thiserror",
- "web-sys",
"wgpu-hal",
"wgpu-types",
]
[[package]]
name = "wgpu-hal"
-version = "0.19.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
+version = "22.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f"
dependencies = [
"android_system_properties",
"arrayvec",
@@ -6142,10 +6336,11 @@ dependencies = [
"js-sys",
"khronos-egl",
"libc",
- "libloading 0.8.5",
+ "libloading",
"log",
"metal",
"naga",
+ "ndk-sys 0.5.0+25.2.9519653",
"objc",
"once_cell",
"parking_lot 0.12.3",
@@ -6164,8 +6359,9 @@ dependencies = [
[[package]]
name = "wgpu-types"
-version = "0.19.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109"
+version = "22.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d"
dependencies = [
"bitflags 2.6.0",
"js-sys",
@@ -6212,7 +6408,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "window_clipboard"
version = "0.4.1"
-source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9"
+source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265"
dependencies = [
"clipboard-win",
"clipboard_macos",
@@ -6226,22 +6422,23 @@ dependencies = [
[[package]]
name = "windows"
-version = "0.48.0"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-targets 0.48.5",
+ "windows-core 0.52.0",
+ "windows-targets 0.52.6",
]
[[package]]
name = "windows"
-version = "0.52.0"
+version = "0.54.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
+checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
dependencies = [
- "windows-core",
+ "windows-core 0.54.0",
+ "windows-implement",
+ "windows-interface",
"windows-targets 0.52.6",
]
@@ -6254,26 +6451,36 @@ dependencies = [
"windows-targets 0.52.6",
]
+[[package]]
+name = "windows-core"
+version = "0.54.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
+dependencies = [
+ "windows-result 0.1.2",
+ "windows-targets 0.52.6",
+]
+
[[package]]
name = "windows-implement"
-version = "0.48.0"
+version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c"
+checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.87",
]
[[package]]
name = "windows-interface"
-version = "0.48.0"
+version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7"
+checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.87",
]
[[package]]
@@ -6282,11 +6489,20 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
dependencies = [
- "windows-result",
+ "windows-result 0.2.0",
"windows-strings",
"windows-targets 0.52.6",
]
+[[package]]
+name = "windows-result"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
[[package]]
name = "windows-result"
version = "0.2.0"
@@ -6302,7 +6518,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
dependencies = [
- "windows-result",
+ "windows-result 0.2.0",
"windows-targets 0.52.6",
]
@@ -6522,46 +6738,50 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winit"
-version = "0.29.10"
-source = "git+https://github.com/pop-os/winit.git?branch=winit-0.29#bdc66109acc85c912264c9e4b864520345bdb45f"
+version = "0.30.5"
+source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e"
dependencies = [
"ahash",
"android-activity",
"atomic-waker",
"bitflags 2.6.0",
+ "block2",
"bytemuck",
- "calloop 0.12.4",
- "cfg_aliases 0.1.1",
+ "calloop",
+ "cfg_aliases 0.2.1",
+ "concurrent-queue",
"core-foundation",
"core-graphics",
"cursor-icon",
- "icrate 0.0.4",
+ "dpi",
"js-sys",
"libc",
- "log",
"memmap2 0.9.5",
"ndk",
- "ndk-sys",
- "objc2 0.4.1",
- "once_cell",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+ "objc2-ui-kit",
"orbclient",
"percent-encoding",
+ "pin-project",
"raw-window-handle",
- "redox_syscall 0.3.5",
- "rustix 0.38.37",
+ "redox_syscall 0.4.1",
+ "rustix 0.38.39",
"sctk-adwaita",
- "smithay-client-toolkit 0.18.1",
+ "smithay-client-toolkit",
"smol_str",
+ "tracing",
"unicode-segmentation",
"wasm-bindgen",
"wasm-bindgen-futures",
"wayland-backend",
"wayland-client",
- "wayland-protocols 0.31.2",
+ "wayland-protocols",
"wayland-protocols-plasma",
"web-sys",
"web-time",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
"x11-dl",
"x11rb",
"xkbcommon-dl",
@@ -6585,6 +6805,18 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
[[package]]
name = "x11-dl"
version = "2.21.0"
@@ -6605,9 +6837,9 @@ dependencies = [
"as-raw-xcb-connection",
"gethostname",
"libc",
- "libloading 0.8.5",
+ "libloading",
"once_cell",
- "rustix 0.38.37",
+ "rustix 0.38.39",
"x11rb-protocol",
]
@@ -6674,9 +6906,9 @@ dependencies = [
[[package]]
name = "xml-rs"
-version = "0.8.22"
+version = "0.8.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26"
+checksum = "af310deaae937e48a26602b730250b4949e125f468f11e6990be3e5304ddd96f"
[[package]]
name = "xmlwriter"
@@ -6685,10 +6917,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
[[package]]
-name = "xxhash-rust"
-version = "0.8.12"
+name = "yansi"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
[[package]]
name = "yazi"
@@ -6696,6 +6928,30 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1"
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
+]
+
[[package]]
name = "zbus"
version = "3.15.2"
@@ -6703,15 +6959,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6"
dependencies = [
"async-broadcast 0.5.1",
- "async-executor",
- "async-fs 1.6.0",
- "async-io 1.13.0",
- "async-lock 2.8.0",
"async-process 1.8.1",
"async-recursion",
- "async-task",
"async-trait",
- "blocking",
"byteorder",
"derivative",
"enumflags2",
@@ -6728,6 +6978,7 @@ dependencies = [
"serde_repr",
"sha1",
"static_assertions",
+ "tokio",
"tracing",
"uds_windows",
"winapi",
@@ -6745,8 +6996,8 @@ checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
dependencies = [
"async-broadcast 0.7.1",
"async-executor",
- "async-fs 2.1.2",
- "async-io 2.3.4",
+ "async-fs",
+ "async-io 2.4.0",
"async-lock 3.4.0",
"async-process 2.3.0",
"async-recursion",
@@ -6776,6 +7027,36 @@ dependencies = [
"zvariant 4.2.0",
]
+[[package]]
+name = "zbus"
+version = "5.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1162094dc63b1629fcc44150bcceeaa80798cd28bcbe7fa987b65a034c258608"
+dependencies = [
+ "async-broadcast 0.7.1",
+ "async-recursion",
+ "async-trait",
+ "enumflags2",
+ "event-listener 5.3.1",
+ "futures-core",
+ "futures-util",
+ "hex",
+ "nix 0.29.0",
+ "ordered-stream",
+ "serde",
+ "serde_repr",
+ "static_assertions",
+ "tokio",
+ "tracing",
+ "uds_windows",
+ "windows-sys 0.59.0",
+ "winnow 0.6.20",
+ "xdg-home",
+ "zbus_macros 5.1.1",
+ "zbus_names 4.1.0",
+ "zvariant 5.1.0",
+]
+
[[package]]
name = "zbus_macros"
version = "3.15.2"
@@ -6799,10 +7080,25 @@ dependencies = [
"proc-macro-crate 3.2.0",
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
"zvariant_utils 2.1.0",
]
+[[package]]
+name = "zbus_macros"
+version = "5.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cd2dcdce3e2727f7d74b7e33b5a89539b3cc31049562137faf7ae4eb86cd16d"
+dependencies = [
+ "proc-macro-crate 3.2.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "zbus_names 4.1.0",
+ "zvariant 5.1.0",
+ "zvariant_utils 3.0.2",
+]
+
[[package]]
name = "zbus_names"
version = "2.6.1"
@@ -6825,6 +7121,18 @@ dependencies = [
"zvariant 4.2.0",
]
+[[package]]
+name = "zbus_names"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "856b7a38811f71846fd47856ceee8bccaec8399ff53fb370247e66081ace647b"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "winnow 0.6.20",
+ "zvariant 5.1.0",
+]
+
[[package]]
name = "zeno"
version = "0.2.3"
@@ -6849,7 +7157,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure",
]
[[package]]
@@ -6858,6 +7187,28 @@ version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
[[package]]
name = "zune-inflate"
version = "0.2.54"
@@ -6895,6 +7246,21 @@ dependencies = [
"zvariant_derive 4.2.0",
]
+[[package]]
+name = "zvariant"
+version = "5.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1200ee6ac32f1e5a312e455a949a4794855515d34f9909f4a3e082d14e1a56f"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "static_assertions",
+ "winnow 0.6.20",
+ "zvariant_derive 5.1.0",
+ "zvariant_utils 3.0.2",
+]
+
[[package]]
name = "zvariant_derive"
version = "3.15.2"
@@ -6917,10 +7283,23 @@ dependencies = [
"proc-macro-crate 3.2.0",
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
"zvariant_utils 2.1.0",
]
+[[package]]
+name = "zvariant_derive"
+version = "5.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "687e3b97fae6c9104fbbd36c73d27d149abf04fb874e2efbd84838763daa8916"
+dependencies = [
+ "proc-macro-crate 3.2.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "zvariant_utils 3.0.2",
+]
+
[[package]]
name = "zvariant_utils"
version = "1.0.1"
@@ -6940,5 +7319,19 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "zvariant_utils"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20d1d011a38f12360e5fcccceeff5e2c42a8eb7f27f0dcba97a0862ede05c9c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde",
+ "static_assertions",
+ "syn 2.0.87",
+ "winnow 0.6.20",
]
diff --git a/amadeus/src/app.rs b/amadeus/src/app.rs
index dbf2fdcab9f0edc427ff599e76c42a66ddca9755..003e1056301e8047905238e5683e70070d54e3de 100644
--- a/amadeus/src/app.rs
+++ b/amadeus/src/app.rs
@@ -23,10 +23,10 @@ use crate::{
store::Store,
};
use cosmic::{
- app::{Command, Core},
+ app::Core,
iced::{Length, Subscription},
prelude::*,
- style, theme, widget, Application,
+ style, theme, widget, Application, Task,
};
use futures::{
prelude::*,
@@ -212,7 +212,7 @@ impl Application for AppModel {
fn init(
mut core: Core,
(config, cosmic_config): Self::Flags,
- ) -> (Self, Command<Self::Message>) {
+ ) -> (Self, Task<cosmic::app::Message<Self::Message>>) {
core.window.show_maximize = false;
core.window.show_minimize = false;
let host = config.host().1;
@@ -267,12 +267,12 @@ impl Application for AppModel {
})
}};
- (@ destructive, $expr:expr) => { $expr.style(style::Button::AppletIcon) };
+ (@ destructive, $expr:expr) => { $expr.class(style::Button::AppletIcon) };
(@ , $expr:expr) => { $expr };
}
let pre = [
- Element::from(widget::horizontal_space(Length::Fill)),
+ Element::from(widget::horizontal_space()),
icon!(PREVIOUS => PlaybackPrevious),
];
@@ -281,7 +281,7 @@ impl Application for AppModel {
icon!(SHUFFLE => QueueShuffle),
icon!(CROP => QueueCrop | destructive),
icon!(METEOR => QueueClear | destructive),
- Element::from(widget::horizontal_space(Length::Fill)),
+ Element::from(widget::horizontal_space()),
];
let infix = match &self.lektord_state {
@@ -370,7 +370,7 @@ impl Application for AppModel {
}
/// Handles messages emitted by the application and its widgets.
- fn update(&mut self, message: Self::Message) -> Command<Self::Message> {
+ fn update(&mut self, message: Self::Message) -> Task<cosmic::app::Message<Self::Message>> {
match message {
Message::UpdateConfig(message) => self.update_config(message),
@@ -381,33 +381,33 @@ impl Application for AppModel {
Message::SendCommand(cmd) => self.send_command(cmd),
Message::OpenKaraInfo(kid) => {
log::error!("open kara info {kid}");
- Command::none()
+ Task::none()
}
Message::ChangeFilterStageBuffer(buffer) => {
self.search_filter.modify_stage_buffer(buffer);
- Command::none()
+ Task::none()
}
Message::AddFilterAtomFromStageBuffer => {
self.search_filter.commit();
- Command::none()
+ Task::none()
}
Message::RemoveFilterAtom(id) => {
self.search_filter.remove(id);
- Command::none()
+ Task::none()
}
Message::ClearFilters => {
self.search_filter.clear();
self.search_results.clear();
- Command::none()
+ Task::none()
}
Message::QueryWithFiltersResults(results) => {
self.search_results = results;
- Command::none()
+ Task::none()
}
Message::SearchOnlyAuthor(author) => {
log::error!("implement search of only author {author}, need to clear everything and do the query");
- Command::none()
+ Task::none()
}
Message::QueryWithFilters => {
let config = self.connect_config.clone();
@@ -427,7 +427,10 @@ impl Application for AppModel {
}
/// Called when a nav item is selected.
- fn on_nav_select(&mut self, id: widget::nav_bar::Id) -> Command<Self::Message> {
+ fn on_nav_select(
+ &mut self,
+ id: widget::nav_bar::Id,
+ ) -> Task<cosmic::app::Message<Self::Message>> {
self.nav.activate(id);
self.update_title()
}
@@ -435,7 +438,7 @@ impl Application for AppModel {
impl AppModel {
/// Updates the header and window titles.
- fn update_title(&mut self) -> Command<Message> {
+ fn update_title(&mut self) -> Task<cosmic::app::Message<Message>> {
let mut window_title = fl!("app-title");
if let Some(page) = self.nav.text(self.nav.active()) {
window_title.push_str(" — ");
@@ -446,7 +449,7 @@ impl AppModel {
/// Update the connect config with a set config in the application. Because communications may
/// be in progress, we must wait to write the config pointer…
- fn update_connect_config(&self) -> Command<Message> {
+ fn update_connect_config(&self) -> Task<cosmic::app::Message<Message>> {
let config = self.config.get_connect_config();
let connect_config = self.connect_config.clone();
cosmic::command::future(async move {
@@ -456,7 +459,10 @@ impl AppModel {
}
/// Toggle the context page to the correct one.
- fn toggle_context_page(&mut self, context_page: ContextPage) -> Command<Message> {
+ fn toggle_context_page(
+ &mut self,
+ context_page: ContextPage,
+ ) -> Task<cosmic::app::Message<Message>> {
if self.context_page == context_page {
self.core.window.show_context = !self.core.window.show_context;
} else {
@@ -464,32 +470,32 @@ impl AppModel {
self.core.window.show_context = true;
}
self.set_context_title(self.context_page.title());
- Command::none()
+ Task::none()
}
/// Open an url in the user's browser.
- fn open_url(&self, url: &str) -> Command<Message> {
+ fn open_url(&self, url: &str) -> Task<cosmic::app::Message<Message>> {
match open::that_detached(url) {
Err(err) => log::error!("failed to open \"{url}\": {err}"),
Ok(()) => log::info!("opened link: \"{url}\""),
}
- Command::none()
+ Task::none()
}
/// Handle the update config message.
- fn update_config(&mut self, message: ConfigMessage) -> Command<Message> {
+ fn update_config(&mut self, message: ConfigMessage) -> Task<cosmic::app::Message<Message>> {
macro_rules! save_config {
($setter:ident ($arg:expr) $(=> $on_ok:expr)?) => {
match self.config.$setter(&self.cosmic_config, $arg) {
Ok(_) => save_config!(@on-ok $($on_ok)?),
Err(err) => {
log::error!("failed to save config: {err}");
- Command::none()
+ Task::none()
}
}
};
(@on-ok $arg:expr) => {{ $arg }};
- (@on-ok ) => {{ Command::none() }};
+ (@on-ok ) => {{ Task::none() }};
}
macro_rules! update_remote_addr {
@@ -504,7 +510,7 @@ impl AppModel {
}
_ => {
self.tmp_remote_valid = false;
- Command::none()
+ Task::none()
}
}
}};
@@ -526,7 +532,7 @@ impl AppModel {
ConfigMessage::ChangeLogLevel(level) => save_config! {
set_log_level(level) => {
lektor_utils::logger::set_level(level.into());
- Command::none()
+ Task::none()
}
},
@@ -559,16 +565,19 @@ impl AppModel {
}
/// Handle updates from lektord.
- fn handle_lektord_message(&mut self, message: LektordMessage) -> Command<Message> {
+ fn handle_lektord_message(
+ &mut self,
+ message: LektordMessage,
+ ) -> Task<cosmic::app::Message<Message>> {
match message {
// Downloaded metadata informations.
LektordMessage::DownloadedKaraInfo(kara) => {
self.store.set(kara);
- Command::none()
+ Task::none()
}
LektordMessage::DownloadedKarasInfo(karas) => {
karas.into_iter().for_each(|kara| self.store.set(kara));
- Command::none()
+ Task::none()
}
// Disconnected, if any query failed we set the disconnected status
@@ -576,7 +585,7 @@ impl AppModel {
if let LektordState::Connected { .. } = mem::take(&mut self.lektord_state) {
log::error!("disconnected from lektord instance");
}
- Command::none()
+ Task::none()
}
// Initial connection, done by the update subscription. It is needed for most update to
@@ -590,13 +599,13 @@ impl AppModel {
LektordMessage::EpochUpdate(new) => self
.lektord_state
.map_mut(|_, epochs, _| epochs.update(new).into_commands())
- .unwrap_or_else(Command::none),
+ .unwrap_or_else(Task::none),
// Playback update messages from subscription. Will be ignored while the update
// subscription don't send us the connect message.
LektordMessage::PlaybackUpdate(state) => {
_ = self.lektord_state.map_mut(|_, _, ptr| *ptr = Some(state));
- Command::none()
+ Task::none()
}
// Down here, got updates from lektord.
@@ -622,36 +631,36 @@ impl AppModel {
LektordMessage::ChangedHistory(kids) => {
self.store.set_history(kids);
- Command::none()
+ Task::none()
}
LektordMessage::ChangedQueueLevel(lvl, kids) => {
self.store.set_queue_level(lvl, kids);
- Command::none()
+ Task::none()
}
LektordMessage::ChangedQueue(mut queue) => {
PRIORITY_VALUES.iter().for_each(|&level| {
let kids = mem::take(&mut queue[level.index()]);
self.store.set_queue_level(level, kids);
});
- Command::none()
+ Task::none()
}
LektordMessage::ChangedPlaylistContent(name, plt) => {
self.store.set_playlist_content(name, plt);
- Command::none()
+ Task::none()
}
LektordMessage::ChangedPlaylistsContent(changes) => {
changes
.into_iter()
.for_each(|(name, plt)| self.store.set_playlist_content(name, plt));
- Command::none()
+ Task::none()
}
}
}
/// Send commands to lektord.
- fn send_command(&mut self, cmd: LektordCommand) -> Command<Message> {
+ fn send_command(&mut self, cmd: LektordCommand) -> Task<cosmic::app::Message<Message>> {
let config = self.connect_config.clone();
use lektor_payloads::*;
macro_rules! msg {
diff --git a/amadeus/src/app/bottom_bar.rs b/amadeus/src/app/bottom_bar.rs
index 890815d59bbc795a9c62da7f1a94965fa46f3642..6f12b2e1dc034ecb85c6cc3d9ef40c7dd5460ec2 100644
--- a/amadeus/src/app/bottom_bar.rs
+++ b/amadeus/src/app/bottom_bar.rs
@@ -10,7 +10,7 @@ use cosmic::{
alignment::{Horizontal, Vertical},
Alignment, Length,
},
- iced_core::text::Wrap,
+ iced_core::text::Wrapping,
prelude::*,
style, theme,
widget::{self, tooltip::Position},
@@ -27,10 +27,10 @@ fn view_right_part<'a>(kara: &Kara) -> Element<'a, Message> {
macro_rules! tag {
($str:expr, $color:ident) => {
widget::text(format!(" {} ", $str))
- .style(style::Text::Color(theme::active().cosmic().$color().into()))
+ .class(style::Text::Color(theme::active().cosmic().$color().into()))
.apply(widget::container)
.padding(space_xxxs)
- .style(style::Container::Card)
+ .class(style::Container::Card)
.apply(Element::<Message>::from)
};
}
@@ -59,7 +59,7 @@ fn view_right_part<'a>(kara: &Kara) -> Element<'a, Message> {
.push(row_1)
.push(row_2)
.spacing(space_xxs)
- .align_items(Alignment::End)
+ .align_x(Alignment::End)
.width(Length::Shrink)
.apply(widget::container)
.align_x(Horizontal::Right)
@@ -70,26 +70,26 @@ fn view_right_part<'a>(kara: &Kara) -> Element<'a, Message> {
fn view_left_part<'a>(kara: &Kara) -> Element<'a, Message> {
let title = widget::text::title2(kara.song_title.clone())
- .style(theme::Text::Color(
+ .class(theme::Text::Color(
theme::active().cosmic().accent_text_color().into(),
))
- .wrap(Wrap::None);
+ .wrapping(Wrapping::None);
let source = (kara.tags.get_value(TagKey::Number))
.map(|num| format!("{}{num} - {}", kara.song_type, kara.song_source))
.unwrap_or_else(|| format!("{} - {}", kara.song_type, kara.song_source))
.apply(widget::text::title4)
- .style(theme::Text::Color(
+ .class(theme::Text::Color(
theme::active().cosmic().accent_text_color().into(),
))
.font(font::light())
- .wrap(Wrap::None);
+ .wrapping(Wrapping::None);
widget::column()
.push(title)
.push(source)
.apply(widget::button::custom)
- .style(style::Button::Transparent)
+ .class(style::Button::Transparent)
.on_press(Message::OpenKaraInfo(kara.id))
.apply(widget::container)
.align_x(Horizontal::Left)
@@ -101,14 +101,14 @@ fn view_left_part<'a>(kara: &Kara) -> Element<'a, Message> {
fn view_kara_id<'a>(kid: KId) -> Element<'a, Message> {
widget::text::title1(kid.to_string())
- .style(theme::Text::Color(
+ .class(theme::Text::Color(
theme::active().cosmic().accent_text_color().into(),
))
- .wrap(Wrap::None)
+ .wrapping(Wrapping::None)
.apply(widget::button::custom)
- .style(style::Button::Transparent)
+ .class(style::Button::Transparent)
.on_press(Message::SendCommand(LektordCommand::DownloadKaraInfo(kid)))
- .apply(|btn| widget::tooltip(btn, fl!("click-to-dl"), Position::Top))
+ .apply(|btn| widget::tooltip(btn, widget::text(fl!("click-to-dl")), Position::Top))
.apply(widget::container)
.align_x(Horizontal::Left)
.align_y(Vertical::Center)
@@ -132,7 +132,7 @@ pub fn view<'a>(app: &AppModel) -> Element<'a, Message> {
.padding(theme::active().cosmic().space_xs())
.apply(widget::container)
.align_y(Vertical::Bottom)
- .style(style::Container::Primary)
+ .class(style::Container::Primary)
.into(),
}
}
diff --git a/amadeus/src/app/context_pages/about.rs b/amadeus/src/app/context_pages/about.rs
index db5c1b39e7b702e473f272d248bb0b5f80b8cefd..369f22e9eb80129315f4fa6213e5181e1c6c7711 100644
--- a/amadeus/src/app/context_pages/about.rs
+++ b/amadeus/src/app/context_pages/about.rs
@@ -20,7 +20,7 @@ pub fn view(app: &AppModel) -> Element<Message> {
}};
}
- let app_icon = widget::image::Handle::from_memory(APP_ICON)
+ let app_icon = widget::image::Handle::from_bytes(APP_ICON)
.apply(widget::image)
.width(128);
@@ -77,7 +77,7 @@ pub fn view(app: &AppModel) -> Element<Message> {
amadeus_section.into(),
lektord_section.into(),
]))
- .align_items(Alignment::Center)
+ .align_x(Alignment::Center)
.spacing(theme::active().cosmic().space_xxs())
.width(Length::Fill)
.into()
diff --git a/amadeus/src/app/context_pages/config.rs b/amadeus/src/app/context_pages/config.rs
index d6ba36249807421de9768d66c207fa774d70f3f2..91d789a68e5e81a9493d5aab5c0fcf01a7ab913e 100644
--- a/amadeus/src/app/context_pages/config.rs
+++ b/amadeus/src/app/context_pages/config.rs
@@ -35,7 +35,7 @@ pub fn view(app: &AppModel) -> Element<Message> {
let log_levels = dropdown!(
crate::config::LOG_LEVELS, lektor_utils::logger::get().into() => ChangeLogLevel
);
- let dark_theme = widget::toggler(None, theme::active_type().is_dark(), |is_dark| {
+ let dark_theme = widget::toggler(theme::active_type().is_dark()).on_toggle(|is_dark| {
UpdateConfig(ChangeTheme(match is_dark {
true => theme::system_dark(),
false => theme::system_light(),
diff --git a/amadeus/src/app/context_pages/kara_info.rs b/amadeus/src/app/context_pages/kara_info.rs
index 39096063c9cf4fb1d004bd58c9172e0f4541b57b..57eb9a36b00ab3483945ca33a574b3816da362e8 100644
--- a/amadeus/src/app/context_pages/kara_info.rs
+++ b/amadeus/src/app/context_pages/kara_info.rs
@@ -14,9 +14,9 @@ pub fn view<'a>(kara_or_kid: KaraOrId<'_>) -> Element<'a, Message> {
match kara_or_kid {
KaraOrId::Id(kid) => widget::text::monotext(kid.to_string())
.apply(widget::button::custom)
- .style(style::Button::Transparent)
+ .class(style::Button::Transparent)
.on_press(Message::SendCommand(LektordCommand::DownloadKaraInfo(kid)))
- .apply(|btn| widget::tooltip(btn, fl!("click-to-dl"), Position::Left))
+ .apply(|btn| widget::tooltip(btn, widget::text(fl!("click-to-dl")), Position::Left))
.apply(Element::from),
KaraOrId::Kara(kara) => widget::text::monotext(format!("{kara:#?}")).into(),
diff --git a/amadeus/src/app/kard.rs b/amadeus/src/app/kard.rs
index e6dc1cc404305e23991b290a2156e9525f6db302..39a797fc48b373c55a120f325032104f1a68f8ec 100644
--- a/amadeus/src/app/kard.rs
+++ b/amadeus/src/app/kard.rs
@@ -29,7 +29,7 @@ fn kara_title<'a>(kara: &Kara) -> Element<'a, Message> {
.into(),
])
.apply(widget::button::custom)
- .style(style::Button::Transparent)
+ .class(style::Button::Transparent)
.on_press(Message::OpenKaraInfo(kara.id))
.apply(Element::from)
}
@@ -44,10 +44,10 @@ fn kara_tags<'a>(kara: &Kara) -> Element<'a, Message> {
macro_rules! tag {
($str:expr, $color:ident) => {
widget::text(format!(" {} ", $str))
- .style(style::Text::Color(theme::active().cosmic().$color().into()))
+ .class(style::Text::Color(theme::active().cosmic().$color().into()))
.apply(widget::container)
.padding(space_xxxs)
- .style(style::Container::Card)
+ .class(style::Container::Card)
.apply(Element::<Message>::from)
};
}
@@ -71,7 +71,7 @@ fn kara_tags<'a>(kara: &Kara) -> Element<'a, Message> {
widget::column::with_children(vec![row_1, row_2])
.spacing(space_xxs)
- .align_items(Alignment::End)
+ .align_x(Alignment::End)
.width(Length::Shrink)
.into()
}
@@ -81,18 +81,18 @@ fn kara_tags<'a>(kara: &Kara) -> Element<'a, Message> {
pub fn view<'a>(kara_or_id: KaraOrId) -> Element<'a, Message> {
match kara_or_id {
KaraOrId::Id(kid) => vec![widget::text::title3(kid.to_string())
- .style(style::Text::Color(
+ .class(style::Text::Color(
theme::active().cosmic().destructive_text_color().into(),
))
.font(font::mono())
.apply(widget::button::custom)
- .style(style::Button::Transparent)
+ .class(style::Button::Transparent)
.on_press(Message::SendCommand(LektordCommand::DownloadKaraInfo(kid)))
- .apply(|btn| widget::tooltip(btn, fl!("click-to-dl"), Position::Top))
+ .apply(|btn| widget::tooltip(btn, widget::text(fl!("click-to-dl")), Position::Top))
.into()],
KaraOrId::Kara(kara) => vec![
kara_title(kara),
- widget::horizontal_space(Length::Fill).into(),
+ widget::horizontal_space().into(),
kara_tags(kara),
// TODO: Add the controls here...
],
diff --git a/amadeus/src/app/pages.rs b/amadeus/src/app/pages.rs
index 0d2fc73a314eefbfcdeee0967d7274ef1f430dec..c79b3c02417d49bdbd3e771c16dcd8fc4e6b7c25 100644
--- a/amadeus/src/app/pages.rs
+++ b/amadeus/src/app/pages.rs
@@ -85,7 +85,7 @@ pub fn not_found<'a>(page: Option<Page>) -> impl Into<Element<'a, Message>> {
.push_maybe(
page.map(|page| widget::text::title3(fl!("unimplemented", what = page.to_string()))),
)
- .align_items(Alignment::Center)
+ .align_x(Alignment::Center)
.apply(widget::container)
.width(Length::Fill)
.height(Length::Fill)
@@ -151,10 +151,10 @@ impl<'a> PageViewControl<'a> {
.width(32)
.height(32);
- match is_destructive_icon {
- true => button.style(style::Button::Destructive).into(),
- false => button.into(),
- }
+ Element::from(match is_destructive_icon {
+ true => button.class(style::Button::Destructive),
+ false => button,
+ })
}
}
@@ -278,11 +278,11 @@ impl<'a> PageView<'a> {
// Not found, got an error…
return widget::column()
.push(
- widget::text::title1(fl!("error-found")).style(style::Text::Color(
+ widget::text::title1(fl!("error-found")).class(style::Text::Color(
theme::active().cosmic().warning_text_color().into(),
)),
)
- .align_items(Alignment::Center)
+ .align_x(Alignment::Center)
.apply(widget::container)
.width(Length::Fill)
.height(Length::Fill)
@@ -302,7 +302,7 @@ impl<'a> PageView<'a> {
let title_row = page_title(title, self.title_is_custom, self.controls, is_empty);
widget::column::with_capacity(1 + self.content.len())
.push(title_row)
- .extend(self.content.into_iter())
+ .extend(self.content)
.spacing(space_m)
.apply(widget::container)
.padding(theme::active().cosmic().space_m())
@@ -322,7 +322,7 @@ fn page_title<'a>(
let Spacing { space_xxs, .. } = theme::active().cosmic().spacing;
widget::row::with_capacity(2 + controls.len())
.push(title)
- .push_maybe((!title_is_custom).then(|| widget::horizontal_space(Length::Fill)))
+ .push_maybe((!title_is_custom).then(widget::horizontal_space))
.extend(
controls
.into_iter()
@@ -330,6 +330,6 @@ fn page_title<'a>(
)
.width(Length::Fill)
.height(48)
- .align_items(Alignment::Center)
+ .align_y(Alignment::Center)
.spacing(space_xxs)
}
diff --git a/amadeus/src/app/pages/playlist.rs b/amadeus/src/app/pages/playlist.rs
index a12026625e141e30ed1dabcf4519a17a9efe481f..007ba72c650fb5421b9cbb7abf1da086726e4653 100644
--- a/amadeus/src/app/pages/playlist.rs
+++ b/amadeus/src/app/pages/playlist.rs
@@ -28,7 +28,7 @@ pub fn view(store: &Store, id: KId) -> impl Into<Element<Message>> {
.map(|owner| -> Element<'_, Message> {
widget::text::body(owner)
.apply(widget::button::custom)
- .style(style::Button::Transparent)
+ .class(style::Button::Transparent)
.into()
});
diff --git a/amadeus/src/app/pages/queue.rs b/amadeus/src/app/pages/queue.rs
index 53938deb186e236a14c0d3afb306bdc4a95cf73e..bc7ab1e839b0d131aface18f063d89511d700f18 100644
--- a/amadeus/src/app/pages/queue.rs
+++ b/amadeus/src/app/pages/queue.rs
@@ -10,7 +10,7 @@ use super::{page_title, PageViewControl};
fn view_queue_level(store: &Store, level: Priority) -> impl IntoIterator<Item = Element<Message>> {
let title = page_title(
- widget::text::title2(format!("{} {level}", fl!("queue"))).style(style::Text::Default),
+ widget::text::title2(format!("{} {level}", fl!("queue"))).class(style::Text::Default),
false,
vec![
PageViewControl::new(
diff --git a/amadeus/src/app/pages/search.rs b/amadeus/src/app/pages/search.rs
index 86d1f49ac90b118bad2d5e614461cfb3c0fa9c30..c305e7a55272082e3b084821a6e54a242e752611 100644
--- a/amadeus/src/app/pages/search.rs
+++ b/amadeus/src/app/pages/search.rs
@@ -59,11 +59,11 @@ impl FilterAtom {
widget::row::with_capacity(2)
.push(icon)
.push(widget::text(text))
- .align_items(Alignment::Center)
+ .align_y(Alignment::Center)
.spacing(theme::active().cosmic().space_xxxs())
.apply(widget::button::custom)
.on_press(Message::RemoveFilterAtom(self.0))
- .style(style::Button::Destructive)
+ .class(style::Button::Destructive)
.into()
}
}
diff --git a/amadeus/src/app/progress_bar.rs b/amadeus/src/app/progress_bar.rs
index 2bfde63cd6d96455539ee7e10c2d0ac686820472..dd302d164c458a7f192307365bbced05408ebc78 100644
--- a/amadeus/src/app/progress_bar.rs
+++ b/amadeus/src/app/progress_bar.rs
@@ -15,24 +15,24 @@ pub fn view(app: &AppModel) -> Element<Message> {
return widget::row().into();
};
- widget::row::with_children(vec![
- format_time(time)
- .apply(widget::text::monotext)
- .font(font::light())
- .style(style::Text::Accent)
- .into(),
- widget::progress_bar(0.0..=duration, time)
- .height(10.0)
- .width(100.0)
- .style(style::ProgressBar::Primary)
- .into(),
- format_time(duration)
- .apply(widget::text::monotext)
- .font(font::light())
- .style(style::Text::Accent)
- .into(),
- ])
- .align_items(Alignment::Center)
- .spacing(theme::active().cosmic().space_xxs())
- .into()
+ widget::row::with_capacity(3)
+ .push(
+ widget::text::monotext(format_time(time))
+ .font(font::light())
+ .class(style::Text::Accent),
+ )
+ .push(
+ widget::progress_bar(0.0..=duration, time)
+ .height(10.0)
+ .width(100.0)
+ .class(style::ProgressBar::Primary),
+ )
+ .push(
+ widget::text::monotext(format_time(duration))
+ .font(font::light())
+ .class(style::Text::Accent),
+ )
+ .align_y(Alignment::Center)
+ .spacing(theme::active().cosmic().space_xxs())
+ .into()
}
diff --git a/amadeus/src/app/subscriptions/playback.rs b/amadeus/src/app/subscriptions/playback.rs
index c5329911d580cea193f18199534d4bff18536c1a..bb44b899ef9f8fbe76b5033916cb0b3892d1123f 100644
--- a/amadeus/src/app/subscriptions/playback.rs
+++ b/amadeus/src/app/subscriptions/playback.rs
@@ -1,6 +1,6 @@
use crate::app::{LektordMessage, Message};
-use cosmic::iced::{subscription, Subscription};
-use futures::SinkExt;
+use cosmic::iced::{self, Subscription};
+use futures::prelude::*;
use lektor_lib::{requests, ConnectConfig};
use std::{any::TypeId, sync::Arc, time::Duration};
use tokio::sync::RwLock;
@@ -18,7 +18,7 @@ impl Suscription {
use {LektordMessage::*, Message::*};
let Self { config } = self;
- subscription::channel(TypeId::of::<Self>(), 10, move |mut channel| async move {
+ let stream = iced::stream::channel(10, |mut channel| async move {
log::info!("lektord playback subscription launched");
loop {
match requests::get_status(config.read().await.as_ref()).await {
@@ -33,6 +33,8 @@ impl Suscription {
}
}
}
- })
+ });
+
+ Subscription::run_with_id(TypeId::of::<Self>(), stream)
}
}
diff --git a/amadeus/src/app/subscriptions/updates.rs b/amadeus/src/app/subscriptions/updates.rs
index 09cbfa2336a1cf822c88e4fa9c37cbe8c3bf7136..9786cb9df62834c7ce273108a1a3a6fe97858e69 100644
--- a/amadeus/src/app/subscriptions/updates.rs
+++ b/amadeus/src/app/subscriptions/updates.rs
@@ -2,8 +2,8 @@ use crate::{
app::{LektordMessage, Message},
connection::Epochs,
};
-use cosmic::iced::{subscription, Subscription};
-use futures::SinkExt;
+use cosmic::iced::{self, Subscription};
+use futures::prelude::*;
use lektor_lib::{requests, ConnectConfig};
use std::{any::TypeId, sync::Arc, time::Duration};
use tokio::sync::RwLock;
@@ -21,7 +21,7 @@ impl Suscription {
use {LektordMessage::*, Message::*};
let Self { config } = self;
- subscription::channel(TypeId::of::<Self>(), 10, move |mut channel| async move {
+ let stream = iced::stream::channel(10, move |mut channel| async move {
log::info!("lektord updates subscription launched");
'connect: loop {
log::debug!("try initial connection");
@@ -43,6 +43,8 @@ impl Suscription {
}
}
}
- })
+ });
+
+ Subscription::run_with_id(TypeId::of::<Self>(), stream)
}
}
diff --git a/amadeus/src/connection.rs b/amadeus/src/connection.rs
index ecd430a2049222c77b66cf1d114e655999981b54..ed5772ac8c75f43e221f6584e2c3bf348eb5f987 100644
--- a/amadeus/src/connection.rs
+++ b/amadeus/src/connection.rs
@@ -1,5 +1,5 @@
use crate::app::Message;
-use cosmic::{app::Command, Apply as _};
+use cosmic::{app::Task, Apply as _};
use lektor_payloads::{KId, PlayStateWithCurrent};
use std::{mem, ops};
@@ -32,22 +32,21 @@ impl LektordQueryChanges {
}
/// Get the commands to send to do the refresh.
- pub fn into_commands(self) -> Command<Message> {
- use {crate::app::LektordCommand::*, Message::*};
- match self.is_any() {
- false => Command::none(),
- true => [
- self.queue.then_some(SendCommand(QueueGet)),
- self.queue.then_some(SendCommand(HistoryGet)),
- self.playlists.then_some(SendCommand(PlaylistsGet)),
- self.database.then_some(SendCommand(DatabaseGet)),
- ]
+ pub fn into_commands(self) -> Task<Message> {
+ (self.is_any().then_some(()))
+ .map_or_else(Default::default, |_| {
+ use {crate::app::LektordCommand::*, Message::*};
+ [
+ self.queue.then_some(SendCommand(QueueGet)),
+ self.queue.then_some(SendCommand(HistoryGet)),
+ self.playlists.then_some(SendCommand(PlaylistsGet)),
+ self.database.then_some(SendCommand(DatabaseGet)),
+ ]
+ })
.into_iter()
.flatten()
- .map(cosmic::app::message::app)
- .map(cosmic::app::command::message)
- .apply(Command::batch),
- }
+ .map(|message| Task::done(cosmic::app::Message::App(message)))
+ .apply(Task::batch)
}
}
diff --git a/lektor_mpris/src/lib.rs b/lektor_mpris/src/lib.rs
index 82dd54af66b6153be4f22c9a98fa9cf356707cb1..2f3f1a3a6101342276f6c3db3bf7f29fd8890964 100644
--- a/lektor_mpris/src/lib.rs
+++ b/lektor_mpris/src/lib.rs
@@ -23,7 +23,7 @@
pub mod types;
mod server;
-mod r#trait;
+mod traits;
-pub use r#trait::*;
+pub use traits::*;
pub use server::{MPRISAdapter, MPRISBuilder};
diff --git a/lektor_mpris/src/server.rs b/lektor_mpris/src/server.rs
index 38ce3f20086141fc13861990190ce350aa83886a..42e35123d30f72ed5e8a54c2b16a72cf3a654d3b 100644
--- a/lektor_mpris/src/server.rs
+++ b/lektor_mpris/src/server.rs
@@ -2,7 +2,7 @@
//! `org.mpris.MediaPlayer2.TrackList`
use crate::{types::*, AsMpris};
-use zbus::{Connection, ConnectionBuilder, SignalContext};
+use zbus::{connection, object_server::SignalEmitter, Connection};
/// The adapter for MPRIS.
#[derive(Debug)]
@@ -61,7 +61,7 @@ impl<T: AsMpris + Send + Sync + Clone + 'static> MPRISBuilder<T> {
let obj_tracks = TrackList(self.application.clone());
log::info!("try to create new dbus connection for: {name}");
- let connection = ConnectionBuilder::session()?
+ let connection = connection::Builder::session()?
.name(name)?
.serve_at("/org/mpris/MediaPlayer2", obj_main)?
.serve_at("/org/mpris/MediaPlayer2", obj_player)?
@@ -338,7 +338,7 @@ impl<T: AsMpris + Send + Sync + Clone + 'static> TrackList<T> {
/// TrackAdded signal
#[zbus(signal, name = "TrackAdded")]
async fn track_added(
- #[zbus(signal_context)] ctxt: SignalContext<'_>,
+ #[zbus(signal_emitter)] emitter: SignalEmitter<'_>,
metadata: TrackMetadata,
after: ObjectPath,
) -> zbus::Result<()>;
@@ -346,7 +346,7 @@ impl<T: AsMpris + Send + Sync + Clone + 'static> TrackList<T> {
/// TrackListReplaced signal
#[zbus(signal, name = "TrackListReplaced")]
async fn track_list_replaced(
- #[zbus(signal_context)] ctxt: SignalContext<'_>,
+ #[zbus(signal_emitter)] emitter: SignalEmitter<'_>,
tracks: Vec<ObjectPath>,
current: ObjectPath,
) -> zbus::Result<()>;
@@ -354,7 +354,7 @@ impl<T: AsMpris + Send + Sync + Clone + 'static> TrackList<T> {
/// TrackMetadataChanged signal
#[zbus(signal, name = "TrackMetadataChanged")]
async fn track_metadata_changed(
- #[zbus(signal_context)] ctxt: SignalContext<'_>,
+ #[zbus(signal_emitter)] emitter: SignalEmitter<'_>,
track_id: ObjectPath,
metadata: TrackMetadata,
) -> zbus::Result<()>;
@@ -362,7 +362,7 @@ impl<T: AsMpris + Send + Sync + Clone + 'static> TrackList<T> {
/// TrackRemoved signal
#[zbus(signal, name = "TrackRemoved")]
async fn track_removed(
- #[zbus(signal_context)] ctxt: SignalContext<'_>,
+ #[zbus(signal_emitter)] emitter: SignalEmitter<'_>,
track_id: ObjectPath,
) -> zbus::Result<()>;
}
diff --git a/lektor_mpris/src/trait.rs b/lektor_mpris/src/traits.rs
similarity index 100%
rename from lektor_mpris/src/trait.rs
rename to lektor_mpris/src/traits.rs
diff --git a/lektor_mpris/src/types.rs b/lektor_mpris/src/types.rs
index 93afd3dee889d203d5cdcfb421841721eb1f0e3a..cf268909bdb7120fbcf52e9e0b3277d273a427ff 100644
--- a/lektor_mpris/src/types.rs
+++ b/lektor_mpris/src/types.rs
@@ -2,7 +2,9 @@
use hashbrown::HashMap;
use serde::{Deserialize, Serialize};
-use zbus::zvariant::{Dict as ZDict, ObjectPath as ZObjectPath, Type as ZType, Value as ZValue};
+use zbus::zvariant::{
+ Dict as ZDict, ObjectPath as ZObjectPath, Signature, Type as ZType, Value as ZValue,
+};
/// The loop status.
#[derive(Debug, Deserialize, Serialize, ZType, Clone, Copy, PartialEq, Eq)]
@@ -177,14 +179,15 @@ impl From<TimeMicroSec> for ZValue<'_> {
impl From<TrackMetadata> for ZValue<'_> {
fn from(TrackMetadata(value): TrackMetadata) -> Self {
- let mut dict = ZDict::new(
- "s".try_into().expect("invalid signature"),
- "v".try_into().expect("invalid signature"),
- );
- for (key, value) in value {
- dict.append(key.into(), value.into())
- .expect("invalid entry found")
- }
- dict.into()
+ (value.into_iter())
+ .try_fold(
+ ZDict::new(&Signature::Str, &Signature::Variant),
+ |mut dict, (key, value)| {
+ dict.append(key.into(), value.into())?;
+ Ok::<_, zbus::Error>(dict)
+ },
+ )
+ .expect("invalid entry found")
+ .into()
}
}