undo patch
This commit is contained in:
parent
aae148df64
commit
fc3a3c40ed
2 changed files with 32 additions and 52 deletions
76
Cargo.lock
generated
76
Cargo.lock
generated
|
|
@ -1472,13 +1472,14 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cosmic-config"
|
name = "cosmic-config"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
|
source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"atomicwrites",
|
"atomicwrites",
|
||||||
"cosmic-config-derive",
|
"cosmic-config-derive",
|
||||||
"cosmic-settings-daemon",
|
"cosmic-settings-daemon",
|
||||||
"dirs",
|
"dirs",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"iced_futures 0.14.0-dev",
|
"iced_futures",
|
||||||
"known-folders",
|
"known-folders",
|
||||||
"notify",
|
"notify",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
|
|
@ -1493,6 +1494,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cosmic-config-derive"
|
name = "cosmic-config-derive"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
|
source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"quote",
|
"quote",
|
||||||
"syn 1.0.109",
|
"syn 1.0.109",
|
||||||
|
|
@ -1687,7 +1689,7 @@ source = "git+https://github.com/pop-os/cosmic-settings-subscriptions#ff9883a029
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cosmic-dbus-networkmanager",
|
"cosmic-dbus-networkmanager",
|
||||||
"futures",
|
"futures",
|
||||||
"iced_futures 0.14.0-dev (git+https://github.com/pop-os/libcosmic)",
|
"iced_futures",
|
||||||
"itertools 0.13.0",
|
"itertools 0.13.0",
|
||||||
"libpulse-binding",
|
"libpulse-binding",
|
||||||
"log",
|
"log",
|
||||||
|
|
@ -1760,6 +1762,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cosmic-theme"
|
name = "cosmic-theme"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
|
source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"almost",
|
"almost",
|
||||||
"cosmic-config",
|
"cosmic-config",
|
||||||
|
|
@ -3107,11 +3110,12 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced"
|
name = "iced"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
|
source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dnd",
|
"dnd",
|
||||||
"iced_accessibility",
|
"iced_accessibility",
|
||||||
"iced_core 0.14.0-dev",
|
"iced_core",
|
||||||
"iced_futures 0.14.0-dev",
|
"iced_futures",
|
||||||
"iced_renderer",
|
"iced_renderer",
|
||||||
"iced_widget",
|
"iced_widget",
|
||||||
"iced_winit",
|
"iced_winit",
|
||||||
|
|
@ -3124,6 +3128,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_accessibility"
|
name = "iced_accessibility"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
|
source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"accesskit",
|
"accesskit",
|
||||||
"accesskit_winit",
|
"accesskit_winit",
|
||||||
|
|
@ -3132,6 +3137,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_core"
|
name = "iced_core"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
|
source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.6.0",
|
"bitflags 2.6.0",
|
||||||
"bytes",
|
"bytes",
|
||||||
|
|
@ -3153,34 +3159,13 @@ dependencies = [
|
||||||
"window_clipboard",
|
"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]]
|
[[package]]
|
||||||
name = "iced_futures"
|
name = "iced_futures"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
|
source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"futures",
|
"futures",
|
||||||
"iced_core 0.14.0-dev",
|
"iced_core",
|
||||||
"log",
|
"log",
|
||||||
"rustc-hash 2.0.0",
|
"rustc-hash 2.0.0",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
|
@ -3188,19 +3173,6 @@ dependencies = [
|
||||||
"wasm-timer",
|
"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]]
|
[[package]]
|
||||||
name = "iced_glyphon"
|
name = "iced_glyphon"
|
||||||
version = "0.6.0"
|
version = "0.6.0"
|
||||||
|
|
@ -3216,13 +3188,14 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_graphics"
|
name = "iced_graphics"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
|
source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.6.0",
|
"bitflags 2.6.0",
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
"cosmic-text",
|
"cosmic-text",
|
||||||
"half",
|
"half",
|
||||||
"iced_core 0.14.0-dev",
|
"iced_core",
|
||||||
"iced_futures 0.14.0-dev",
|
"iced_futures",
|
||||||
"image 0.24.9",
|
"image 0.24.9",
|
||||||
"kamadak-exif",
|
"kamadak-exif",
|
||||||
"log",
|
"log",
|
||||||
|
|
@ -3237,6 +3210,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_renderer"
|
name = "iced_renderer"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
|
source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"iced_graphics",
|
"iced_graphics",
|
||||||
"iced_tiny_skia",
|
"iced_tiny_skia",
|
||||||
|
|
@ -3248,12 +3222,13 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_runtime"
|
name = "iced_runtime"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
|
source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"dnd",
|
"dnd",
|
||||||
"iced_accessibility",
|
"iced_accessibility",
|
||||||
"iced_core 0.14.0-dev",
|
"iced_core",
|
||||||
"iced_futures 0.14.0-dev",
|
"iced_futures",
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
"smithay-client-toolkit",
|
"smithay-client-toolkit",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
|
|
@ -3263,6 +3238,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_tiny_skia"
|
name = "iced_tiny_skia"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
|
source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
"cosmic-text",
|
"cosmic-text",
|
||||||
|
|
@ -3278,6 +3254,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_wgpu"
|
name = "iced_wgpu"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
|
source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"as-raw-xcb-connection",
|
"as-raw-xcb-connection",
|
||||||
"bitflags 2.6.0",
|
"bitflags 2.6.0",
|
||||||
|
|
@ -3308,6 +3285,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_widget"
|
name = "iced_widget"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
|
source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dnd",
|
"dnd",
|
||||||
"iced_accessibility",
|
"iced_accessibility",
|
||||||
|
|
@ -3326,10 +3304,11 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iced_winit"
|
name = "iced_winit"
|
||||||
version = "0.14.0-dev"
|
version = "0.14.0-dev"
|
||||||
|
source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dnd",
|
"dnd",
|
||||||
"iced_accessibility",
|
"iced_accessibility",
|
||||||
"iced_futures 0.14.0-dev",
|
"iced_futures",
|
||||||
"iced_graphics",
|
"iced_graphics",
|
||||||
"iced_runtime",
|
"iced_runtime",
|
||||||
"log",
|
"log",
|
||||||
|
|
@ -4297,6 +4276,7 @@ checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libcosmic"
|
name = "libcosmic"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
|
source = "git+https://github.com/pop-os/libcosmic#36b3cfa13aeac6e5cdf7e76ef826ed7d66aaebfe"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"apply",
|
"apply",
|
||||||
"ashpd 0.9.2",
|
"ashpd 0.9.2",
|
||||||
|
|
@ -4311,8 +4291,8 @@ dependencies = [
|
||||||
"freedesktop-icons",
|
"freedesktop-icons",
|
||||||
"iced",
|
"iced",
|
||||||
"iced_accessibility",
|
"iced_accessibility",
|
||||||
"iced_core 0.14.0-dev",
|
"iced_core",
|
||||||
"iced_futures 0.14.0-dev",
|
"iced_futures",
|
||||||
"iced_renderer",
|
"iced_renderer",
|
||||||
"iced_runtime",
|
"iced_runtime",
|
||||||
"iced_tiny_skia",
|
"iced_tiny_skia",
|
||||||
|
|
@ -7921,7 +7901,7 @@ version = "0.1.9"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
|
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-sys 0.59.0",
|
"windows-sys 0.48.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
|
||||||
|
|
@ -47,13 +47,13 @@ lto = "thin"
|
||||||
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "bd65e0f2d55429954839c9e6c7bc5b0d198b85f0" }
|
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "bd65e0f2d55429954839c9e6c7bc5b0d198b85f0" }
|
||||||
|
|
||||||
# For development and testing purposes
|
# 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" }
|
# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" }
|
||||||
# cosmic-config = { 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" }
|
# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" }
|
||||||
libcosmic = { path = "../libcosmic" }
|
# libcosmic = { path = "../libcosmic" }
|
||||||
cosmic-config = { path = "../libcosmic/cosmic-config" }
|
# cosmic-config = { path = "../libcosmic/cosmic-config" }
|
||||||
cosmic-theme = { path = "../libcosmic/cosmic-theme" }
|
# cosmic-theme = { path = "../libcosmic/cosmic-theme" }
|
||||||
|
|
||||||
# [patch.'https://github.com/pop-os/dbus-settings-bindings']
|
# [patch.'https://github.com/pop-os/dbus-settings-bindings']
|
||||||
# cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }
|
# cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue