leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: patch sctk

Browse source
This commit is contained in:
Ashley Wulber 2024-11-01 11:41:20 -04:00 • committed by Michael Murphy
parent d9735c9b76
commit 1438f6944c
2 changed files with 27 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

103
Cargo.lock generated
View file

@ -245,9 +245,9 @@ dependencies = [
[[package]] [[package]]
name = "anstyle" name = "anstyle"
version = "1.0.9" version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
[[package]] [[package]]
name = "anstyle-parse" name = "anstyle-parse"
@ -279,9 +279,9 @@ dependencies = [
[[package]] [[package]]
name = "anyhow" name = "anyhow"
version = "1.0.91" version = "1.0.92"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13"
[[package]] [[package]]
name = "apply" name = "apply"
@ -857,7 +857,7 @@ dependencies = [
[[package]] [[package]]
name = "bluez-zbus" name = "bluez-zbus"
version = "0.1.0" 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 = [ dependencies = [
"futures-channel", "futures-channel",
"futures-util", "futures-util",
@ -1002,38 +1002,13 @@ dependencies = [
"thiserror", "thiserror",
] ]
[[package]]
name = "calloop"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1ead1e1514bce44c0f40e027899fbc595907fc112635bed21b3b5d975c0a5e7"
dependencies = [
"bitflags 2.6.0",
"polling 3.7.3",
"rustix 0.38.38",
"slab",
"tracing",
]
[[package]] [[package]]
name = "calloop-wayland-source" name = "calloop-wayland-source"
version = "0.3.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
dependencies = [ dependencies = [
"calloop 0.13.0", "calloop",
"rustix 0.38.38",
"wayland-backend",
"wayland-client",
]
[[package]]
name = "calloop-wayland-source"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "876a7a1dbbe026a55ef47a500b123af5a9a0914520f061d467914cf21be95daf"
dependencies = [
"calloop 0.14.1",
"rustix 0.38.38", "rustix 0.38.38",
"wayland-backend", "wayland-backend",
"wayland-client", "wayland-client",
@ -1480,7 +1455,7 @@ source = "git+https://github.com/pop-os/cosmic-protocols?rev=c8d3a1c#c8d3a1c3d40
dependencies = [ dependencies = [
"cosmic-protocols", "cosmic-protocols",
"libc", "libc",
"smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)", "smithay-client-toolkit",
"wayland-client", "wayland-client",
] ]
@ -1528,7 +1503,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-dbus-networkmanager" name = "cosmic-dbus-networkmanager"
version = "0.1.0" 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 = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"derive_builder", "derive_builder",
@ -1557,7 +1532,7 @@ dependencies = [
"cosmic-config", "cosmic-config",
"ron", "ron",
"serde", "serde",
"smithay-client-toolkit 0.19.2 (git+https://github.com/Smithay/client-toolkit)", "smithay-client-toolkit",
"tracing", "tracing",
"wayland-protocols-wlr", "wayland-protocols-wlr",
"xdg-shell-wrapper-config", "xdg-shell-wrapper-config",
@ -1687,7 +1662,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-settings-daemon" name = "cosmic-settings-daemon"
version = "0.1.0" 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 = [ dependencies = [
"zbus 4.4.0", "zbus 4.4.0",
] ]
@ -2146,7 +2121,7 @@ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"mime", "mime",
"raw-window-handle", "raw-window-handle",
"smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)", "smithay-client-toolkit",
"smithay-clipboard", "smithay-clipboard",
] ]
@ -3034,7 +3009,7 @@ checksum = "f558a64ac9af88b5ba400d99b579451af0d39c6d360980045b91aac966d705e2"
[[package]] [[package]]
name = "hostname1-zbus" name = "hostname1-zbus"
version = "0.1.0" 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 = [ dependencies = [
"zbus 4.4.0", "zbus 4.4.0",
] ]
@ -3177,7 +3152,7 @@ dependencies = [
"raw-window-handle", "raw-window-handle",
"rustc-hash 2.0.0", "rustc-hash 2.0.0",
"serde", "serde",
"smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)", "smithay-client-toolkit",
"smol_str", "smol_str",
"thiserror", "thiserror",
"web-time", "web-time",
@ -3255,7 +3230,7 @@ dependencies = [
"iced_core", "iced_core",
"iced_futures", "iced_futures",
"raw-window-handle", "raw-window-handle",
"smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)", "smithay-client-toolkit",
"thiserror", "thiserror",
"window_clipboard", "window_clipboard",
] ]
@ -3296,7 +3271,7 @@ dependencies = [
"resvg", "resvg",
"rustc-hash 2.0.0", "rustc-hash 2.0.0",
"rustix 0.38.38", "rustix 0.38.38",
"smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)", "smithay-client-toolkit",
"thiserror", "thiserror",
"tiny-xlib", "tiny-xlib",
"wayland-backend", "wayland-backend",
@ -3320,7 +3295,7 @@ dependencies = [
"once_cell", "once_cell",
"ouroboros", "ouroboros",
"rustc-hash 2.0.0", "rustc-hash 2.0.0",
"smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)", "smithay-client-toolkit",
"thiserror", "thiserror",
"unicode-segmentation", "unicode-segmentation",
"window_clipboard", "window_clipboard",
@ -3339,7 +3314,7 @@ dependencies = [
"log", "log",
"raw-window-handle", "raw-window-handle",
"rustc-hash 2.0.0", "rustc-hash 2.0.0",
"smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)", "smithay-client-toolkit",
"thiserror", "thiserror",
"tracing", "tracing",
"wasm-bindgen-futures", "wasm-bindgen-futures",
@ -6335,7 +6310,7 @@ dependencies = [
"ab_glyph", "ab_glyph",
"log", "log",
"memmap2 0.9.5", "memmap2 0.9.5",
"smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)", "smithay-client-toolkit",
"tiny-skia", "tiny-skia",
] ]
@ -6595,35 +6570,8 @@ checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"bytemuck", "bytemuck",
"calloop 0.13.0", "calloop",
"calloop-wayland-source 0.3.0", "calloop-wayland-source",
"cursor-icon",
"libc",
"log",
"memmap2 0.9.5",
"pkg-config",
"rustix 0.38.38",
"thiserror",
"wayland-backend",
"wayland-client",
"wayland-csd-frame",
"wayland-cursor",
"wayland-protocols",
"wayland-protocols-wlr",
"wayland-scanner",
"xkbcommon",
"xkeysym",
]
[[package]]
name = "smithay-client-toolkit"
version = "0.19.2"
source = "git+https://github.com/Smithay/client-toolkit#618a876400cb6c6b07a8ac5d3557f404602ec077"
dependencies = [
"bitflags 2.6.0",
"bytemuck",
"calloop 0.14.1",
"calloop-wayland-source 0.4.0",
"cursor-icon", "cursor-icon",
"libc", "libc",
"log", "log",
@ -6649,7 +6597,7 @@ source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007de
dependencies = [ dependencies = [
"libc", "libc",
"raw-window-handle", "raw-window-handle",
"smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)", "smithay-client-toolkit",
"wayland-backend", "wayland-backend",
] ]
@ -7044,7 +6992,7 @@ dependencies = [
[[package]] [[package]]
name = "timedate-zbus" name = "timedate-zbus"
version = "0.1.0" 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 = [ dependencies = [
"zbus 4.4.0", "zbus 4.4.0",
] ]
@ -7222,7 +7170,6 @@ version = "0.1.40"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
dependencies = [ dependencies = [
"log",
"pin-project-lite", "pin-project-lite",
"tracing-attributes", "tracing-attributes",
"tracing-core", "tracing-core",
@ -7441,7 +7388,7 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
[[package]] [[package]]
name = "upower_dbus" name = "upower_dbus"
version = "0.3.2" version = "0.3.2"
source = "git+https://github.com/pop-os/dbus-settings-bindings#931f5db558bf3fcb572ff4e18f7f1618a7430046" source = "git+https://github.com/pop-os/dbus-settings-bindings#62100129240d164e39fff16bda34faad520936de"
dependencies = [ dependencies = [
"serde", "serde",
"serde_repr", "serde_repr",
@ -8328,7 +8275,7 @@ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"block2", "block2",
"bytemuck", "bytemuck",
"calloop 0.13.0", "calloop",
"cfg_aliases 0.2.1", "cfg_aliases 0.2.1",
"concurrent-queue", "concurrent-queue",
"core-foundation", "core-foundation",
@ -8350,7 +8297,7 @@ dependencies = [
"redox_syscall 0.4.1", "redox_syscall 0.4.1",
"rustix 0.38.38", "rustix 0.38.38",
"sctk-adwaita", "sctk-adwaita",
"smithay-client-toolkit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)", "smithay-client-toolkit",
"smol_str", "smol_str",
"tracing", "tracing",
"unicode-segmentation", "unicode-segmentation",

2
Cargo.toml
View file

@ -58,3 +58,5 @@ cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev =
# [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" }
# upower_dbus = { path = "../dbus-settings-bindings/upower" } # upower_dbus = { path = "../dbus-settings-bindings/upower" }
[patch."https://github.com/smithay/client-toolkit.git"]
sctk = { package = "smithay-client-toolkit", version = "=0.19.2" }