diff --git a/Cargo.lock b/Cargo.lock index a634231c..2745462a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -493,6 +493,7 @@ dependencies = [ "libcosmic", "libsystemd", "log-panics", + "once_cell", "ordered-float", "png", "puffin 0.14.3", @@ -1632,7 +1633,7 @@ dependencies = [ [[package]] name = "iced" version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" +source = "git+https://github.com/pop-os/iced.git?branch=runtime-state-operate#c43f0c4794c8199c2b15cd1dc3c98ae72777a994" dependencies = [ "iced_core", "iced_futures", @@ -1645,7 +1646,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" +source = "git+https://github.com/pop-os/iced.git?branch=runtime-state-operate#c43f0c4794c8199c2b15cd1dc3c98ae72777a994" dependencies = [ "bitflags 1.3.2", "instant", @@ -1658,7 +1659,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.6.0" -source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" +source = "git+https://github.com/pop-os/iced.git?branch=runtime-state-operate#c43f0c4794c8199c2b15cd1dc3c98ae72777a994" dependencies = [ "futures", "iced_core", @@ -1671,7 +1672,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.8.0" -source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" +source = "git+https://github.com/pop-os/iced.git?branch=runtime-state-operate#c43f0c4794c8199c2b15cd1dc3c98ae72777a994" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -1688,7 +1689,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" +source = "git+https://github.com/pop-os/iced.git?branch=runtime-state-operate#c43f0c4794c8199c2b15cd1dc3c98ae72777a994" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -1700,7 +1701,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" +source = "git+https://github.com/pop-os/iced.git?branch=runtime-state-operate#c43f0c4794c8199c2b15cd1dc3c98ae72777a994" dependencies = [ "iced_core", "iced_futures", @@ -1710,7 +1711,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.8.0" -source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" +source = "git+https://github.com/pop-os/iced.git?branch=runtime-state-operate#c43f0c4794c8199c2b15cd1dc3c98ae72777a994" dependencies = [ "iced_core", "once_cell", @@ -1720,7 +1721,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" +source = "git+https://github.com/pop-os/iced.git?branch=runtime-state-operate#c43f0c4794c8199c2b15cd1dc3c98ae72777a994" dependencies = [ "bytemuck", "cosmic-text", @@ -1738,7 +1739,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.10.0" -source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" +source = "git+https://github.com/pop-os/iced.git?branch=runtime-state-operate#c43f0c4794c8199c2b15cd1dc3c98ae72777a994" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -1760,7 +1761,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?rev=5765053#5765053ad70d7b0fded56fe9e9c73649509a03ae" +source = "git+https://github.com/pop-os/iced.git?branch=runtime-state-operate#c43f0c4794c8199c2b15cd1dc3c98ae72777a994" dependencies = [ "iced_renderer", "iced_runtime", @@ -2593,9 +2594,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.2" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "option-ext" @@ -4977,3 +4978,18 @@ checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" dependencies = [ "simd-adler32", ] + +[[patch.unused]] +name = "iced_accessibility" +version = "0.1.0" +source = "git+https://github.com/pop-os/iced.git?branch=runtime-state-operate#c43f0c4794c8199c2b15cd1dc3c98ae72777a994" + +[[patch.unused]] +name = "iced_sctk" +version = "0.1.0" +source = "git+https://github.com/pop-os/iced.git?branch=runtime-state-operate#c43f0c4794c8199c2b15cd1dc3c98ae72777a994" + +[[patch.unused]] +name = "iced_winit" +version = "0.9.1" +source = "git+https://github.com/pop-os/iced.git?branch=runtime-state-operate#c43f0c4794c8199c2b15cd1dc3c98ae72777a994" diff --git a/Cargo.toml b/Cargo.toml index 167b854a..d99da2e4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,6 +42,7 @@ tracing = { version = "0.1.37", features = ["max_level_debug", "release_max_leve puffin = { version = "0.14.3", optional = true } puffin_egui = { version = "0.21.0", optional = true } cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "35dd0b8", default-features = false, features = ["libcosmic"] } +once_cell = "1.18.0" [dependencies.id_tree] git = "https://github.com/Drakulix/id-tree.git" @@ -77,3 +78,18 @@ lto = "fat" [patch."https://github.com/Smithay/smithay.git"] smithay = { git = "https://github.com/smithay//smithay", rev = "43ce6b4372" } + +[patch."https://github.com/pop-os/libcosmic.git"] +iced = { git = "https://github.com/pop-os/iced.git", branch = "runtime-state-operate" } +iced_accessibility = { git = "https://github.com/pop-os/iced.git", branch = "runtime-state-operate" } +iced_core = { git = "https://github.com/pop-os/iced.git", branch = "runtime-state-operate" } +iced_futures = { git = "https://github.com/pop-os/iced.git", branch = "runtime-state-operate" } +iced_graphics = { git = "https://github.com/pop-os/iced.git", branch = "runtime-state-operate" } +iced_renderer = { git = "https://github.com/pop-os/iced.git", branch = "runtime-state-operate" } +iced_runtime = { git = "https://github.com/pop-os/iced.git", branch = "runtime-state-operate" } +iced_sctk = { git = "https://github.com/pop-os/iced.git", branch = "runtime-state-operate" } +iced_style = { git = "https://github.com/pop-os/iced.git", branch = "runtime-state-operate" } +iced_tiny_skia = { git = "https://github.com/pop-os/iced.git", branch = "runtime-state-operate" } +iced_wgpu = { git = "https://github.com/pop-os/iced.git", branch = "runtime-state-operate" } +iced_widget = { git = "https://github.com/pop-os/iced.git", branch = "runtime-state-operate" } +iced_winit = { git = "https://github.com/pop-os/iced.git", branch = "runtime-state-operate" }