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

Merge branch 'master_jammy' into split

Browse source
This commit is contained in:
Mattias Eriksson 2024-01-18 15:34:20 +01:00
commit 2eadaf5914
1 changed files with 162 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

227
Cargo.lock generated
View file

@ -660,6 +660,32 @@ dependencies = [
"vec_map", "vec_map",
] ]
[[package]]
name = "calloop"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298"
dependencies = [
"bitflags 2.4.2",
"log",
"polling 3.3.2",
"rustix 0.38.28",
"slab",
"thiserror",
]
[[package]]
name = "calloop-wayland-source"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02"
dependencies = [
"calloop 0.12.4",
"rustix 0.38.28",
"wayland-backend",
"wayland-client 0.31.1",
]
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.0.83" version = "1.0.83"
@ -706,21 +732,21 @@ dependencies = [
[[package]] [[package]]
name = "clipboard_wayland" name = "clipboard_wayland"
version = "0.2.0" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f6364a9f7a66f2ac1a1a098aa1c7f6b686f2496c6ac5e5c0d773445df912747" checksum = "8134163bd07c47ae3cc29babc42c255fdb315facc790950ae2d0e561ea6f2ec0"
dependencies = [ dependencies = [
"smithay-clipboard", "smithay-clipboard",
] ]
[[package]] [[package]]
name = "clipboard_x11" name = "clipboard_x11"
version = "0.4.0" version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "983a7010836ecd04dde2c6d27a0cb56ec5d21572177e782bdcb24a600124e921" checksum = "5cf45b436634fee64c6d3981639b46a87eeea3c64e422643273fcefd1baef56c"
dependencies = [ dependencies = [
"thiserror", "thiserror",
"x11rb 0.9.0", "x11rb 0.13.0",
] ]
[[package]] [[package]]
@ -840,7 +866,7 @@ 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.git#4e18199444aecbc60f25a12e8adb91926aa5e653" source = "git+https://github.com/pop-os/libcosmic.git#994e93d6d2f90f947d56376094eb19877d708063"
dependencies = [ dependencies = [
"atomicwrites", "atomicwrites",
"cosmic-config-derive", "cosmic-config-derive",
@ -855,7 +881,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.git#4e18199444aecbc60f25a12e8adb91926aa5e653" source = "git+https://github.com/pop-os/libcosmic.git#994e93d6d2f90f947d56376094eb19877d708063"
dependencies = [ dependencies = [
"quote", "quote",
"syn 1.0.109", "syn 1.0.109",
@ -885,7 +911,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-text" name = "cosmic-text"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/pop-os/cosmic-text.git#8457e68d984c465f7c5306424a73aa162aff32f2" source = "git+https://github.com/pop-os/cosmic-text.git#6aadfaddac7ae68c3f97c0b9b2fa75033374a650"
dependencies = [ dependencies = [
"bitflags 2.4.2", "bitflags 2.4.2",
"fontdb", "fontdb",
@ -907,7 +933,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.git#4e18199444aecbc60f25a12e8adb91926aa5e653" source = "git+https://github.com/pop-os/libcosmic.git#994e93d6d2f90f947d56376094eb19877d708063"
dependencies = [ dependencies = [
"almost", "almost",
"cosmic-config", "cosmic-config",
@ -1259,9 +1285,9 @@ dependencies = [
[[package]] [[package]]
name = "env_logger" name = "env_logger"
version = "0.10.1" version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
dependencies = [ dependencies = [
"humantime", "humantime",
"is-terminal", "is-terminal",
@ -1762,9 +1788,9 @@ dependencies = [
[[package]] [[package]]
name = "gethostname" name = "gethostname"
version = "0.2.3" 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 = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177"
dependencies = [ dependencies = [
"libc", "libc",
"winapi", "winapi",
@ -1772,12 +1798,12 @@ dependencies = [
[[package]] [[package]]
name = "gethostname" name = "gethostname"
version = "0.3.0" version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
dependencies = [ dependencies = [
"libc", "libc",
"winapi", "windows-targets 0.48.5",
] ]
[[package]] [[package]]
@ -2083,7 +2109,7 @@ dependencies = [
[[package]] [[package]]
name = "iced" name = "iced"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#4e18199444aecbc60f25a12e8adb91926aa5e653" source = "git+https://github.com/pop-os/libcosmic.git#994e93d6d2f90f947d56376094eb19877d708063"
dependencies = [ dependencies = [
"iced_accessibility", "iced_accessibility",
"iced_core", "iced_core",
@ -2098,7 +2124,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.git#4e18199444aecbc60f25a12e8adb91926aa5e653" source = "git+https://github.com/pop-os/libcosmic.git#994e93d6d2f90f947d56376094eb19877d708063"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_winit", "accesskit_winit",
@ -2107,7 +2133,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#4e18199444aecbc60f25a12e8adb91926aa5e653" source = "git+https://github.com/pop-os/libcosmic.git#994e93d6d2f90f947d56376094eb19877d708063"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"instant", "instant",
@ -2123,7 +2149,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#4e18199444aecbc60f25a12e8adb91926aa5e653" source = "git+https://github.com/pop-os/libcosmic.git#994e93d6d2f90f947d56376094eb19877d708063"
dependencies = [ dependencies = [
"futures", "futures",
"iced_core", "iced_core",
@ -2136,7 +2162,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#4e18199444aecbc60f25a12e8adb91926aa5e653" source = "git+https://github.com/pop-os/libcosmic.git#994e93d6d2f90f947d56376094eb19877d708063"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"bytemuck", "bytemuck",
@ -2159,7 +2185,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_renderer" name = "iced_renderer"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#4e18199444aecbc60f25a12e8adb91926aa5e653" source = "git+https://github.com/pop-os/libcosmic.git#994e93d6d2f90f947d56376094eb19877d708063"
dependencies = [ dependencies = [
"iced_graphics", "iced_graphics",
"iced_tiny_skia", "iced_tiny_skia",
@ -2172,7 +2198,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_runtime" name = "iced_runtime"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#4e18199444aecbc60f25a12e8adb91926aa5e653" source = "git+https://github.com/pop-os/libcosmic.git#994e93d6d2f90f947d56376094eb19877d708063"
dependencies = [ dependencies = [
"iced_core", "iced_core",
"iced_futures", "iced_futures",
@ -2182,7 +2208,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_style" name = "iced_style"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#4e18199444aecbc60f25a12e8adb91926aa5e653" source = "git+https://github.com/pop-os/libcosmic.git#994e93d6d2f90f947d56376094eb19877d708063"
dependencies = [ dependencies = [
"iced_core", "iced_core",
"once_cell", "once_cell",
@ -2192,7 +2218,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_tiny_skia" name = "iced_tiny_skia"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#4e18199444aecbc60f25a12e8adb91926aa5e653" source = "git+https://github.com/pop-os/libcosmic.git#994e93d6d2f90f947d56376094eb19877d708063"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cosmic-text", "cosmic-text",
@ -2210,7 +2236,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_wgpu" name = "iced_wgpu"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#4e18199444aecbc60f25a12e8adb91926aa5e653" source = "git+https://github.com/pop-os/libcosmic.git#994e93d6d2f90f947d56376094eb19877d708063"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"bytemuck", "bytemuck",
@ -2230,7 +2256,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_widget" name = "iced_widget"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#4e18199444aecbc60f25a12e8adb91926aa5e653" source = "git+https://github.com/pop-os/libcosmic.git#994e93d6d2f90f947d56376094eb19877d708063"
dependencies = [ dependencies = [
"iced_renderer", "iced_renderer",
"iced_runtime", "iced_runtime",
@ -2244,7 +2270,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_winit" name = "iced_winit"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#4e18199444aecbc60f25a12e8adb91926aa5e653" source = "git+https://github.com/pop-os/libcosmic.git#994e93d6d2f90f947d56376094eb19877d708063"
dependencies = [ dependencies = [
"iced_graphics", "iced_graphics",
"iced_runtime", "iced_runtime",
@ -2495,7 +2521,7 @@ source = "git+https://gitlab.redox-os.org/redox-os/liblibc.git?branch=redox_0.2.
[[package]] [[package]]
name = "libcosmic" name = "libcosmic"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic.git#4e18199444aecbc60f25a12e8adb91926aa5e653" source = "git+https://github.com/pop-os/libcosmic.git#994e93d6d2f90f947d56376094eb19877d708063"
dependencies = [ dependencies = [
"apply", "apply",
"ashpd", "ashpd",
@ -2847,19 +2873,6 @@ dependencies = [
"jni-sys", "jni-sys",
] ]
[[package]]
name = "nix"
version = "0.22.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf"
dependencies = [
"bitflags 1.3.2",
"cc",
"cfg-if",
"libc",
"memoffset 0.6.5",
]
[[package]] [[package]]
name = "nix" name = "nix"
version = "0.24.3" version = "0.24.3"
@ -3863,7 +3876,7 @@ dependencies = [
"ab_glyph", "ab_glyph",
"log", "log",
"memmap2 0.5.10", "memmap2 0.5.10",
"smithay-client-toolkit", "smithay-client-toolkit 0.16.1",
"tiny-skia 0.8.4", "tiny-skia 0.8.4",
] ]
@ -4014,7 +4027,7 @@ version = "0.16.1"
source = "git+https://github.com/pop-os/client-toolkit?branch=wayland-resize#515820fc86cf8cb3ac8d087dc6c87852767627ca" source = "git+https://github.com/pop-os/client-toolkit?branch=wayland-resize#515820fc86cf8cb3ac8d087dc6c87852767627ca"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"calloop", "calloop 0.10.6",
"dlib", "dlib",
"lazy_static", "lazy_static",
"log", "log",
@ -4022,18 +4035,44 @@ dependencies = [
"nix 0.24.3", "nix 0.24.3",
"pkg-config", "pkg-config",
"wayland-client 0.29.5", "wayland-client 0.29.5",
"wayland-cursor", "wayland-cursor 0.29.5",
"wayland-protocols", "wayland-protocols 0.29.5",
]
[[package]]
name = "smithay-client-toolkit"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f"
dependencies = [
"bitflags 2.4.2",
"calloop 0.12.4",
"calloop-wayland-source",
"cursor-icon",
"libc",
"log",
"memmap2 0.9.3",
"rustix 0.38.28",
"thiserror",
"wayland-backend",
"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",
"xkeysym",
] ]
[[package]] [[package]]
name = "smithay-clipboard" name = "smithay-clipboard"
version = "0.6.6" version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" checksum = "0bb62b280ce5a5cba847669933a0948d00904cf83845c944eae96a4738cea1a6"
dependencies = [ dependencies = [
"smithay-client-toolkit", "libc",
"wayland-client 0.29.5", "smithay-client-toolkit 0.18.0",
"wayland-backend",
] ]
[[package]] [[package]]
@ -4841,6 +4880,17 @@ dependencies = [
"wayland-sys 0.29.5", "wayland-sys 0.29.5",
] ]
[[package]]
name = "wayland-csd-frame"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
dependencies = [
"bitflags 2.4.2",
"cursor-icon",
"wayland-backend",
]
[[package]] [[package]]
name = "wayland-cursor" name = "wayland-cursor"
version = "0.29.5" version = "0.29.5"
@ -4852,6 +4902,17 @@ dependencies = [
"xcursor", "xcursor",
] ]
[[package]]
name = "wayland-cursor"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b"
dependencies = [
"nix 0.26.4",
"wayland-client 0.31.1",
"xcursor",
]
[[package]] [[package]]
name = "wayland-protocols" name = "wayland-protocols"
version = "0.29.5" version = "0.29.5"
@ -4864,6 +4925,31 @@ dependencies = [
"wayland-scanner 0.29.5", "wayland-scanner 0.29.5",
] ]
[[package]]
name = "wayland-protocols"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c"
dependencies = [
"bitflags 2.4.2",
"wayland-backend",
"wayland-client 0.31.1",
"wayland-scanner 0.31.0",
]
[[package]]
name = "wayland-protocols-wlr"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
dependencies = [
"bitflags 2.4.2",
"wayland-backend",
"wayland-client 0.31.1",
"wayland-protocols 0.31.0",
"wayland-scanner 0.31.0",
]
[[package]] [[package]]
name = "wayland-scanner" name = "wayland-scanner"
version = "0.29.5" version = "0.29.5"
@ -5360,11 +5446,11 @@ dependencies = [
"raw-window-handle", "raw-window-handle",
"redox_syscall 0.3.5", "redox_syscall 0.3.5",
"sctk-adwaita", "sctk-adwaita",
"smithay-client-toolkit", "smithay-client-toolkit 0.16.1",
"wasm-bindgen", "wasm-bindgen",
"wayland-client 0.29.5", "wayland-client 0.29.5",
"wayland-commons", "wayland-commons",
"wayland-protocols", "wayland-protocols 0.29.5",
"wayland-scanner 0.29.5", "wayland-scanner 0.29.5",
"web-sys", "web-sys",
"windows-sys 0.45.0", "windows-sys 0.45.0",
@ -5391,18 +5477,6 @@ dependencies = [
"pkg-config", "pkg-config",
] ]
[[package]]
name = "x11rb"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e99be55648b3ae2a52342f9a870c0e138709a3493261ce9b469afe6e4df6d8a"
dependencies = [
"gethostname 0.2.3",
"nix 0.22.3",
"winapi",
"winapi-wsapoll",
]
[[package]] [[package]]
name = "x11rb" name = "x11rb"
version = "0.12.0" version = "0.12.0"
@ -5417,7 +5491,18 @@ dependencies = [
"once_cell", "once_cell",
"winapi", "winapi",
"winapi-wsapoll", "winapi-wsapoll",
"x11rb-protocol", "x11rb-protocol 0.12.0",
]
[[package]]
name = "x11rb"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a"
dependencies = [
"gethostname 0.4.3",
"rustix 0.38.28",
"x11rb-protocol 0.13.0",
] ]
[[package]] [[package]]
@ -5429,6 +5514,12 @@ dependencies = [
"nix 0.26.4", "nix 0.26.4",
] ]
[[package]]
name = "x11rb-protocol"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34"
[[package]] [[package]]
name = "xcursor" name = "xcursor"
version = "0.3.5" version = "0.3.5"
@ -5451,6 +5542,12 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "xkeysym"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621"
[[package]] [[package]]
name = "xml-rs" name = "xml-rs"
version = "0.8.19" version = "0.8.19"