chore: Update sctk/cctk

This commit is contained in:
Victoria Brekenfeld 2023-11-06 16:45:56 +01:00 committed by Ashley Wulber
parent ff214197c7
commit e69396dac0
2 changed files with 66 additions and 10 deletions

70
Cargo.lock generated
View file

@ -934,10 +934,10 @@ dependencies = [
[[package]]
name = "cosmic-client-toolkit"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-protocols?rev=5c03417#5c03417a08ef04755ad7bc2285d07968d89d69f8"
source = "git+https://github.com/pop-os/cosmic-protocols?rev=5faec87#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41"
dependencies = [
"cosmic-protocols",
"smithay-client-toolkit 0.17.0",
"smithay-client-toolkit 0.18.0",
"wayland-client 0.31.1",
]
@ -1024,7 +1024,7 @@ dependencies = [
[[package]]
name = "cosmic-protocols"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-protocols?rev=5c03417#5c03417a08ef04755ad7bc2285d07968d89d69f8"
source = "git+https://github.com/pop-os/cosmic-protocols?rev=5faec87#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41"
dependencies = [
"bitflags 2.4.1",
"wayland-backend 0.3.2",
@ -1173,9 +1173,9 @@ dependencies = [
[[package]]
name = "cursor-icon"
version = "1.0.0"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "740bb192a8e2d1350119916954f4409ee7f62f149b536911eeb78ba5a20526bf"
checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
[[package]]
name = "custom_debug"
@ -3146,6 +3146,24 @@ dependencies = [
"libc",
]
[[package]]
name = "memmap2"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"
dependencies = [
"libc",
]
[[package]]
name = "memmap2"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375"
dependencies = [
"libc",
]
[[package]]
name = "memoffset"
version = "0.6.5"
@ -4477,7 +4495,7 @@ dependencies = [
[[package]]
name = "smithay-client-toolkit"
version = "0.17.0"
source = "git+https://github.com/smithay/client-toolkit//?rev=dc8c4a0#dc8c4a035128208af65141fe12142a1dbc4a32bb"
source = "git+https://github.com/smithay/client-toolkit?rev=dc8c4a0#dc8c4a035128208af65141fe12142a1dbc4a32bb"
dependencies = [
"bitflags 2.4.1",
"bytemuck",
@ -4497,7 +4515,34 @@ dependencies = [
"wayland-protocols 0.31.0",
"wayland-protocols-wlr",
"wayland-scanner 0.31.0",
"xkbcommon",
"xkbcommon 0.5.1",
"xkeysym",
]
[[package]]
name = "smithay-client-toolkit"
version = "0.18.0"
source = "git+https://github.com/smithay/client-toolkit//?rev=e63ab5f#e63ab5f01964bc48766fc4c3bf79cc05dc59874c"
dependencies = [
"bitflags 2.4.1",
"bytemuck",
"calloop",
"calloop-wayland-source",
"cursor-icon",
"libc",
"log",
"memmap2 0.9.0",
"pkg-config",
"rustix 0.38.21",
"thiserror",
"wayland-backend 0.3.2",
"wayland-client 0.31.1",
"wayland-csd-frame",
"wayland-cursor 0.31.0",
"wayland-protocols 0.31.0",
"wayland-protocols-wlr",
"wayland-scanner 0.31.0",
"xkbcommon 0.7.0",
"xkeysym",
]
@ -6026,6 +6071,17 @@ dependencies = [
"memmap2 0.7.1",
]
[[package]]
name = "xkbcommon"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e"
dependencies = [
"libc",
"memmap2 0.8.0",
"xkeysym",
]
[[package]]
name = "xkeysym"
version = "0.2.0"

View file

@ -19,10 +19,10 @@ members = [
resolver = "2"
[workspace.dependencies]
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "5c03417" }
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "5faec87" }
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [
"client",
], rev = "5c03417" }
], rev = "5faec87" }
cosmic-time = { git = "https://github.com/pop-os/cosmic-time", default-features = false, features = [
"libcosmic",
"once_cell",
@ -45,7 +45,7 @@ lto = "thin"
# libcosmic = { path = "../libcosmic" }
# cosmic-config = { path = "../libcosmic/cosmic-config" }
[patch."https://github.com/Smithay/client-toolkit"]
sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "dc8c4a0" }
sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "e63ab5f" }
[patch."https://github.com/pop-os/dbus-settings-bindings"]
zbus ="3.14"