merge workspaces_dev

This commit is contained in:
Ashley Wulber 2022-07-05 10:31:40 -04:00
commit 74f6c2eca6
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
22 changed files with 1275 additions and 155 deletions

134
Cargo.lock generated
View file

@ -312,7 +312,7 @@ dependencies = [
"cosmic-panel-config",
"futures",
"futures-util",
"gio",
"gio 0.16.0",
"glib-build-tools",
"gsk4",
"gtk4",
@ -458,19 +458,23 @@ name = "cosmic-applet-workspaces"
version = "0.1.0"
dependencies = [
"anyhow",
"calloop",
"cascade",
"cosmic-panel-config",
"glib-build-tools",
"gio 0.15.12",
"gtk4",
"i18n-embed",
"i18n-embed-fl",
"log",
"nix 0.24.1",
"once_cell",
"pretty_env_logger",
"rust-embed",
"tokio",
"wayland-client",
"wayland-backend",
"wayland-client 0.30.0-beta.7",
"wayland-commons",
"wayland-scanner",
"wayland-scanner 0.30.0-beta.7",
]
[[package]]
@ -981,7 +985,7 @@ source = "git+https://github.com/gtk-rs/gtk-rs-core#57cc8f1d7ead0e0c1569d04485b4
dependencies = [
"bitflags",
"gdk-pixbuf-sys",
"gio",
"gio 0.16.0",
"glib 0.16.0",
"libc",
]
@ -991,7 +995,7 @@ name = "gdk-pixbuf-sys"
version = "0.16.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core#57cc8f1d7ead0e0c1569d04485b474450b02eb55"
dependencies = [
"gio-sys",
"gio-sys 0.16.0",
"glib-sys 0.16.0",
"gobject-sys 0.16.0",
"libc",
@ -1007,7 +1011,7 @@ dependencies = [
"cairo-rs",
"gdk-pixbuf",
"gdk4-sys",
"gio",
"gio 0.16.0",
"glib 0.16.0",
"libc",
"pango",
@ -1020,7 +1024,7 @@ source = "git+https://github.com/gtk-rs/gtk4-rs#92170a7a685c0336e53da58d85779635
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
"gio-sys",
"gio-sys 0.16.0",
"glib-sys 0.16.0",
"gobject-sys 0.16.0",
"libc",
@ -1036,7 +1040,7 @@ source = "git+https://github.com/gtk-rs/gtk4-rs#92170a7a685c0336e53da58d85779635
dependencies = [
"gdk4",
"gdk4-x11-sys",
"gio",
"gio 0.16.0",
"glib 0.16.0",
"libc",
"x11",
@ -1096,6 +1100,23 @@ dependencies = [
"temp-dir",
]
[[package]]
name = "gio"
version = "0.15.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b"
dependencies = [
"bitflags",
"futures-channel",
"futures-core",
"futures-io",
"gio-sys 0.15.10",
"glib 0.15.12",
"libc",
"once_cell",
"thiserror",
]
[[package]]
name = "gio"
version = "0.16.0"
@ -1106,13 +1127,26 @@ dependencies = [
"futures-core",
"futures-io",
"futures-util",
"gio-sys",
"gio-sys 0.16.0",
"glib 0.16.0",
"libc",
"once_cell",
"thiserror",
]
[[package]]
name = "gio-sys"
version = "0.15.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d"
dependencies = [
"glib-sys 0.15.10",
"gobject-sys 0.15.10",
"libc",
"system-deps",
"winapi",
]
[[package]]
name = "gio-sys"
version = "0.16.0"
@ -1312,7 +1346,7 @@ dependencies = [
"futures-channel",
"gdk-pixbuf",
"gdk4",
"gio",
"gio 0.16.0",
"glib 0.16.0",
"graphene-rs",
"gsk4",
@ -1345,7 +1379,7 @@ dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
"gdk4-sys",
"gio-sys",
"gio-sys 0.16.0",
"glib-sys 0.16.0",
"gobject-sys 0.16.0",
"graphene-sys",
@ -1555,7 +1589,7 @@ dependencies = [
"cascade",
"gdk4",
"gdk4-x11",
"gio",
"gio 0.16.0",
"gobject-sys 0.16.0",
"gtk4",
"libcosmic-widgets",
@ -2521,7 +2555,7 @@ dependencies = [
"wayland-commons",
"wayland-protocols",
"wayland-server",
"wayland-sys",
"wayland-sys 0.29.4",
"xkbcommon",
]
@ -2538,7 +2572,7 @@ dependencies = [
"memmap2",
"nix 0.22.3",
"pkg-config",
"wayland-client",
"wayland-client 0.29.4",
"wayland-cursor",
"wayland-protocols",
]
@ -2890,6 +2924,20 @@ version = "0.2.80"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
[[package]]
name = "wayland-backend"
version = "0.1.0-beta.7"
source = "git+https://github.com/smithay/wayland-rs.git#7f76abda948a5065951518e1af7c5046725dd6d1"
dependencies = [
"cc",
"downcast-rs",
"log",
"nix 0.24.1",
"scoped-tls",
"smallvec",
"wayland-sys 0.30.0-beta.7",
]
[[package]]
name = "wayland-client"
version = "0.29.4"
@ -2902,8 +2950,23 @@ dependencies = [
"nix 0.22.3",
"scoped-tls",
"wayland-commons",
"wayland-scanner",
"wayland-sys",
"wayland-scanner 0.29.4",
"wayland-sys 0.29.4",
]
[[package]]
name = "wayland-client"
version = "0.30.0-beta.7"
source = "git+https://github.com/smithay/wayland-rs.git#7f76abda948a5065951518e1af7c5046725dd6d1"
dependencies = [
"bitflags",
"futures-channel",
"futures-core",
"log",
"nix 0.24.1",
"thiserror",
"wayland-backend",
"wayland-scanner 0.30.0-beta.7",
]
[[package]]
@ -2915,7 +2978,7 @@ dependencies = [
"nix 0.22.3",
"once_cell",
"smallvec",
"wayland-sys",
"wayland-sys 0.29.4",
]
[[package]]
@ -2925,7 +2988,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c52758f13d5e7861fc83d942d3d99bf270c83269575e52ac29e5b73cb956a6bd"
dependencies = [
"nix 0.22.3",
"wayland-client",
"wayland-client 0.29.4",
"xcursor",
]
@ -2935,8 +2998,8 @@ version = "0.29.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83281d69ee162b59031c666385e93bde4039ec553b90c4191cdb128ceea29a3a"
dependencies = [
"wayland-client",
"wayland-sys",
"wayland-client 0.29.4",
"wayland-sys 0.29.4",
]
[[package]]
@ -2946,9 +3009,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60147ae23303402e41fe034f74fb2c35ad0780ee88a1c40ac09a3be1e7465741"
dependencies = [
"bitflags",
"wayland-client",
"wayland-client 0.29.4",
"wayland-commons",
"wayland-scanner",
"wayland-scanner 0.29.4",
"wayland-server",
]
@ -2963,6 +3026,17 @@ dependencies = [
"xml-rs",
]
[[package]]
name = "wayland-scanner"
version = "0.30.0-beta.7"
source = "git+https://github.com/smithay/wayland-rs.git#7f76abda948a5065951518e1af7c5046725dd6d1"
dependencies = [
"proc-macro2",
"quote",
"syn",
"xml-rs",
]
[[package]]
name = "wayland-server"
version = "0.29.4"
@ -2977,8 +3051,8 @@ dependencies = [
"parking_lot 0.11.2",
"scoped-tls",
"wayland-commons",
"wayland-scanner",
"wayland-sys",
"wayland-scanner 0.29.4",
"wayland-sys 0.29.4",
]
[[package]]
@ -2993,6 +3067,16 @@ dependencies = [
"pkg-config",
]
[[package]]
name = "wayland-sys"
version = "0.30.0-beta.7"
source = "git+https://github.com/smithay/wayland-rs.git#7f76abda948a5065951518e1af7c5046725dd6d1"
dependencies = [
"dlib",
"log",
"pkg-config",
]
[[package]]
name = "wepoll-ffi"
version = "0.1.2"