From fc3a3c40ed81987072c9598e71898f75ef7ebcfd Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Fri, 1 Nov 2024 22:53:26 -0400 Subject: [PATCH] undo patch --- Cargo.lock | 76 ++++++++++++++++++++---------------------------------- Cargo.toml | 8 +++--- 2 files changed, 32 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 96d9e50..32c26eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1472,13 +1472,14 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe" dependencies = [ "atomicwrites", "cosmic-config-derive", "cosmic-settings-daemon", "dirs", "futures-util", - "iced_futures 0.14.0-dev", + "iced_futures", "known-folders", "notify", "once_cell", @@ -1493,6 +1494,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe" dependencies = [ "quote", "syn 1.0.109", @@ -1687,7 +1689,7 @@ source = "git+https://github.com/pop-os/cosmic-settings-subscriptions#ff9883a029 dependencies = [ "cosmic-dbus-networkmanager", "futures", - "iced_futures 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_futures", "itertools 0.13.0", "libpulse-binding", "log", @@ -1760,6 +1762,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe" dependencies = [ "almost", "cosmic-config", @@ -3107,11 +3110,12 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe" dependencies = [ "dnd", "iced_accessibility", - "iced_core 0.14.0-dev", - "iced_futures 0.14.0-dev", + "iced_core", + "iced_futures", "iced_renderer", "iced_widget", "iced_winit", @@ -3124,6 +3128,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe" dependencies = [ "accesskit", "accesskit_winit", @@ -3132,6 +3137,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe" dependencies = [ "bitflags 2.6.0", "bytes", @@ -3153,34 +3159,13 @@ dependencies = [ "window_clipboard", ] -[[package]] -name = "iced_core" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" -dependencies = [ - "bitflags 2.6.0", - "bytes", - "dnd", - "glam", - "log", - "mime", - "num-traits", - "once_cell", - "palette", - "raw-window-handle", - "rustc-hash 2.0.0", - "smol_str", - "thiserror", - "web-time", - "window_clipboard", -] - [[package]] name = "iced_futures" version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe" dependencies = [ "futures", - "iced_core 0.14.0-dev", + "iced_core", "log", "rustc-hash 2.0.0", "tokio", @@ -3188,19 +3173,6 @@ dependencies = [ "wasm-timer", ] -[[package]] -name = "iced_futures" -version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" -dependencies = [ - "futures", - "iced_core 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", - "log", - "rustc-hash 2.0.0", - "wasm-bindgen-futures", - "wasm-timer", -] - [[package]] name = "iced_glyphon" version = "0.6.0" @@ -3216,13 +3188,14 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe" dependencies = [ "bitflags 2.6.0", "bytemuck", "cosmic-text", "half", - "iced_core 0.14.0-dev", - "iced_futures 0.14.0-dev", + "iced_core", + "iced_futures", "image 0.24.9", "kamadak-exif", "log", @@ -3237,6 +3210,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3248,12 +3222,13 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe" dependencies = [ "bytes", "dnd", "iced_accessibility", - "iced_core 0.14.0-dev", - "iced_futures 0.14.0-dev", + "iced_core", + "iced_futures", "raw-window-handle", "smithay-client-toolkit", "thiserror", @@ -3263,6 +3238,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe" dependencies = [ "bytemuck", "cosmic-text", @@ -3278,6 +3254,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe" dependencies = [ "as-raw-xcb-connection", "bitflags 2.6.0", @@ -3308,6 +3285,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe" dependencies = [ "dnd", "iced_accessibility", @@ -3326,10 +3304,11 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe" dependencies = [ "dnd", "iced_accessibility", - "iced_futures 0.14.0-dev", + "iced_futures", "iced_graphics", "iced_runtime", "log", @@ -4297,6 +4276,7 @@ checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libcosmic" version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe" dependencies = [ "apply", "ashpd 0.9.2", @@ -4311,8 +4291,8 @@ dependencies = [ "freedesktop-icons", "iced", "iced_accessibility", - "iced_core 0.14.0-dev", - "iced_futures 0.14.0-dev", + "iced_core", + "iced_futures", "iced_renderer", "iced_runtime", "iced_tiny_skia", @@ -7921,7 +7901,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 4f73e6d..aebedd4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,13 +47,13 @@ lto = "thin" cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "bd65e0f2d55429954839c9e6c7bc5b0d198b85f0" } # For development and testing purposes -[patch.'https://github.com/pop-os/libcosmic'] +# [patch.'https://github.com/pop-os/libcosmic'] # libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" } # cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" } # cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" } -libcosmic = { path = "../libcosmic" } -cosmic-config = { path = "../libcosmic/cosmic-config" } -cosmic-theme = { path = "../libcosmic/cosmic-theme" } +# libcosmic = { path = "../libcosmic" } +# cosmic-config = { path = "../libcosmic/cosmic-config" } +# cosmic-theme = { path = "../libcosmic/cosmic-theme" } # [patch.'https://github.com/pop-os/dbus-settings-bindings'] # cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }