diff --git a/Cargo.lock b/Cargo.lock index 5192b2a..4e69d76 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -307,7 +307,7 @@ dependencies = [ "futures-io", "futures-lite 2.2.0", "parking", - "polling 3.3.2", + "polling 3.4.0", "rustix 0.38.31", "slab", "tracing", @@ -602,7 +602,7 @@ checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ "bitflags 2.4.2", "log", - "polling 3.3.2", + "polling 3.4.0", "rustix 0.38.31", "slab", "thiserror", @@ -893,7 +893,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396" +source = "git+https://github.com/pop-os/libcosmic/#045dca649a6d5f820670c1d0423c35c7e89e7ee6" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -913,7 +913,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396" +source = "git+https://github.com/pop-os/libcosmic/#045dca649a6d5f820670c1d0423c35c7e89e7ee6" dependencies = [ "quote", "syn 1.0.109", @@ -965,7 +965,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396" +source = "git+https://github.com/pop-os/libcosmic/#045dca649a6d5f820670c1d0423c35c7e89e7ee6" dependencies = [ "almost", "cosmic-config", @@ -1091,8 +1091,7 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "d3d12" version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" +source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7" dependencies = [ "bitflags 2.4.2", "libloading 0.8.1", @@ -2157,7 +2156,7 @@ dependencies = [ "serde", "serde_derive", "thiserror", - "toml 0.8.9", + "toml 0.8.10", "unic-langid", ] @@ -2220,7 +2219,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396" +source = "git+https://github.com/pop-os/libcosmic/#045dca649a6d5f820670c1d0423c35c7e89e7ee6" dependencies = [ "iced_accessibility", "iced_core", @@ -2235,7 +2234,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396" +source = "git+https://github.com/pop-os/libcosmic/#045dca649a6d5f820670c1d0423c35c7e89e7ee6" dependencies = [ "accesskit", "accesskit_unix", @@ -2244,7 +2243,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396" +source = "git+https://github.com/pop-os/libcosmic/#045dca649a6d5f820670c1d0423c35c7e89e7ee6" dependencies = [ "bitflags 1.3.2", "iced_accessibility", @@ -2263,7 +2262,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396" +source = "git+https://github.com/pop-os/libcosmic/#045dca649a6d5f820670c1d0423c35c7e89e7ee6" dependencies = [ "futures", "iced_core", @@ -2276,7 +2275,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396" +source = "git+https://github.com/pop-os/libcosmic/#045dca649a6d5f820670c1d0423c35c7e89e7ee6" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2300,7 +2299,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396" +source = "git+https://github.com/pop-os/libcosmic/#045dca649a6d5f820670c1d0423c35c7e89e7ee6" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2312,7 +2311,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396" +source = "git+https://github.com/pop-os/libcosmic/#045dca649a6d5f820670c1d0423c35c7e89e7ee6" dependencies = [ "iced_accessibility", "iced_core", @@ -2324,7 +2323,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396" +source = "git+https://github.com/pop-os/libcosmic/#045dca649a6d5f820670c1d0423c35c7e89e7ee6" dependencies = [ "enum-repr", "float-cmp", @@ -2350,7 +2349,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396" +source = "git+https://github.com/pop-os/libcosmic/#045dca649a6d5f820670c1d0423c35c7e89e7ee6" dependencies = [ "iced_core", "once_cell", @@ -2360,7 +2359,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396" +source = "git+https://github.com/pop-os/libcosmic/#045dca649a6d5f820670c1d0423c35c7e89e7ee6" dependencies = [ "bytemuck", "cosmic-text", @@ -2377,7 +2376,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396" +source = "git+https://github.com/pop-os/libcosmic/#045dca649a6d5f820670c1d0423c35c7e89e7ee6" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2396,7 +2395,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396" +source = "git+https://github.com/pop-os/libcosmic/#045dca649a6d5f820670c1d0423c35c7e89e7ee6" dependencies = [ "iced_renderer", "iced_runtime", @@ -2655,7 +2654,7 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?branch=update-iced-latest#96ad9deab4e9a5fe2a33fc4cfb2af19266723396" +source = "git+https://github.com/pop-os/libcosmic/#045dca649a6d5f820670c1d0423c35c7e89e7ee6" dependencies = [ "apply", "ashpd", @@ -2955,9 +2954,9 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" [[package]] name = "naga" version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8878eb410fc90853da3908aebfe61d73d26d4437ef850b70050461f939509899" +source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7" dependencies = [ + "arrayvec", "bit-set", "bitflags 2.4.2", "codespan-reporting", @@ -3428,9 +3427,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" +checksum = "30054e72317ab98eddd8561db0f6524df3367636884b7b21b703e4b280a84a14" dependencies = [ "cfg-if", "concurrent-queue", @@ -4254,7 +4253,7 @@ dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml 0.8.9", + "toml 0.8.10", "version-compare", ] @@ -4433,14 +4432,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a4b9e8023eb94392d3dca65d717c53abc5dad49c07cb65bb8fcd87115fa325" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.1", + "toml_edit 0.22.4", ] [[package]] @@ -4465,9 +4464,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951" dependencies = [ "indexmap", "serde", @@ -5100,9 +5099,8 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe9a310dcf2e6b85f00c46059aaeaf4184caa8e29a1ecd4b7a704c3482332d" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7" dependencies = [ "arrayvec", "cfg-if", @@ -5126,8 +5124,7 @@ dependencies = [ [[package]] name = "wgpu-core" version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b15e451d4060ada0d99a64df44e4d590213496da7c4f245572d51071e8e30ed" +source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7" dependencies = [ "arrayvec", "bit-vec", @@ -5151,9 +5148,8 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bb47856236bfafc0bc591a925eb036ac19cd987624a447ff353e7a7e7e6f72" +version = "0.19.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7" dependencies = [ "android_system_properties", "arrayvec", @@ -5196,8 +5192,7 @@ dependencies = [ [[package]] name = "wgpu-types" version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "895fcbeb772bfb049eb80b2d6e47f6c9af235284e9703c96fc0218a42ffd5af2" +source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7" dependencies = [ "bitflags 2.4.2", "js-sys", diff --git a/Cargo.toml b/Cargo.toml index 629f703..bfae32d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ default = ["wgpu"] wgpu = ["libcosmic/wgpu"] [dependencies] -libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["wayland", "tokio", "single-instance", "dbus-config", "desktop"], branch = "update-iced-latest"} +libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["wayland", "tokio", "single-instance", "dbus-config", "desktop"]} tokio = { version = "1.17.0", features = ["sync", "rt", "process"] } pretty_env_logger = "0.5" log = "0.4" @@ -35,5 +35,8 @@ nix = "0.26" clap = { version = "4.4.8", features = ["derive"] } switcheroo-control = { git = "https://github.com/pop-os/dbus-settings-bindings" } +[patch.crates-io] +wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "faed98b" } + [profile.release] lto = "thin"