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

Merge pull request #188 from pop-os/update-deps_jammy

Browse source 
Update dependencies
This commit is contained in:
Victoria Brekenfeld 2023-10-04 18:24:10 +02:00 • committed by GitHub
commit 148a3163e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 204 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

320
Cargo.lock generated
View file

@ -18,6 +18,16 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
[[package]]
name = "accesskit"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8"
dependencies = [
"enumn",
"serde",
]
[[package]] [[package]]
name = "addr2line" name = "addr2line"
version = "0.21.0" version = "0.21.0"
@ -52,6 +62,7 @@ checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"once_cell", "once_cell",
"serde",
"version_check", "version_check",
] ]
@ -187,12 +198,6 @@ version = "4.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921"
[[package]]
name = "atomic_refcell"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76f2bfe491d41d45507b8431da8274f7feeca64a49e86d980eed2937ec2ff020"
[[package]] [[package]]
name = "atomicwrites" name = "atomicwrites"
version = "0.4.1" version = "0.4.1"
@ -523,7 +528,8 @@ dependencies = [
"cosmic-protocols", "cosmic-protocols",
"edid-rs", "edid-rs",
"egui", "egui",
"glow 0.11.2", "egui_plot",
"glow",
"i18n-embed", "i18n-embed",
"i18n-embed-fl", "i18n-embed-fl",
"iced_tiny_skia", "iced_tiny_skia",
@ -537,11 +543,11 @@ dependencies = [
"once_cell", "once_cell",
"ordered-float", "ordered-float",
"png", "png",
"puffin 0.14.3", "puffin",
"puffin_egui", "puffin_egui",
"regex", "regex",
"renderdoc", "renderdoc",
"ron 0.7.1", "ron",
"rust-embed", "rust-embed",
"sendfd", "sendfd",
"serde", "serde",
@ -557,7 +563,7 @@ dependencies = [
"wayland-scanner 0.31.0", "wayland-scanner 0.31.0",
"xcursor", "xcursor",
"xdg", "xdg",
"xkbcommon", "xkbcommon 0.7.0",
] ]
[[package]] [[package]]
@ -579,7 +585,7 @@ dependencies = [
"dirs 5.0.1", "dirs 5.0.1",
"iced_futures", "iced_futures",
"notify", "notify",
"ron 0.8.1", "ron",
"serde", "serde",
] ]
@ -634,7 +640,7 @@ dependencies = [
"csscolorparser", "csscolorparser",
"lazy_static", "lazy_static",
"palette", "palette",
"ron 0.8.1", "ron",
"serde", "serde",
] ]
@ -941,11 +947,12 @@ checksum = "3a4f1c0468062a56cd5705f1e3b5409eb286d5596a2028ec8e947595d7e715ae"
[[package]] [[package]]
name = "ecolor" name = "ecolor"
version = "0.22.0" version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e479a7fa3f23d4e794f8b2f8b3568dd4e47886ad1b12c9c095e141cb591eb63" checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"serde",
] ]
[[package]] [[package]]
@ -956,22 +963,27 @@ checksum = "2ab5fa33485cd85ac354df485819a63360fefa312fe04cffe65e6f175be1522c"
[[package]] [[package]]
name = "egui" name = "egui"
version = "0.22.0" version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3aef8ec3ae1b772f340170c65bf27d5b8c28f543a0116c844d2ac08d01123e7" checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7"
dependencies = [ dependencies = [
"accesskit",
"ahash 0.8.3", "ahash 0.8.3",
"epaint", "epaint",
"nohash-hasher", "nohash-hasher",
"serde",
] ]
[[package]] [[package]]
name = "egui_extras" name = "egui_extras"
version = "0.22.0" version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9278f4337b526f0d57e5375e5a7340a311fa6ee8f9fcc75721ac50af13face02" checksum = "68ffe3fe5c00295f91c2a61a74ee271c32f74049c94ba0b1cea8f26eb478bc07"
dependencies = [ dependencies = [
"egui", "egui",
"enum-map",
"log",
"mime_guess",
"resvg 0.28.0", "resvg 0.28.0",
"serde", "serde",
"tiny-skia 0.8.4", "tiny-skia 0.8.4",
@ -980,19 +992,28 @@ dependencies = [
[[package]] [[package]]
name = "egui_glow" name = "egui_glow"
version = "0.22.0" version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f8c2752cdf1b0ef5fcda59a898cacabad974d4f5880e92a420b2c917022da64" checksum = "ce6726c08798822280038bbad2e32f4fc3cbed800cd51c6e34e99cd2d60cc1bc"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"egui", "egui",
"glow 0.12.3", "glow",
"log", "log",
"memoffset 0.6.5", "memoffset 0.6.5",
"wasm-bindgen", "wasm-bindgen",
"web-sys", "web-sys",
] ]
[[package]]
name = "egui_plot"
version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7f33a00fe8eb1ba56535b3dbacdecc7a1365a328908a97c5f3c81bb466be72b"
dependencies = [
"egui",
]
[[package]] [[package]]
name = "either" name = "either"
version = "1.9.0" version = "1.9.0"
@ -1001,11 +1022,12 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]] [[package]]
name = "emath" name = "emath"
version = "0.22.0" version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3857d743a6e0741cdd60b622a74c7a36ea75f5f8f11b793b41d905d2c9721a4b" checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"serde",
] ]
[[package]] [[package]]
@ -1073,19 +1095,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
[[package]] [[package]]
name = "epaint" name = "enum-map"
version = "0.22.0" version = "2.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09333964d4d57f40a85338ba3ca5ed4716070ab184dcfed966b35491c5c64f3b" checksum = "c188012f8542dee7b3996e44dd89461d64aa471b0a7c71a1ae2f595d259e96e5"
dependencies = [
"enum-map-derive",
"serde",
]
[[package]]
name = "enum-map-derive"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
]
[[package]]
name = "enumn"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
]
[[package]]
name = "epaint"
version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e"
dependencies = [ dependencies = [
"ab_glyph", "ab_glyph",
"ahash 0.8.3", "ahash 0.8.3",
"atomic_refcell",
"bytemuck", "bytemuck",
"ecolor", "ecolor",
"emath", "emath",
"nohash-hasher", "nohash-hasher",
"parking_lot 0.12.1", "parking_lot 0.12.1",
"serde",
] ]
[[package]] [[package]]
@ -1211,20 +1265,14 @@ dependencies = [
"miniz_oxide", "miniz_oxide",
] ]
[[package]]
name = "float-cmp"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4"
dependencies = [
"num-traits",
]
[[package]] [[package]]
name = "float-cmp" name = "float-cmp"
version = "0.9.0" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
dependencies = [
"num-traits",
]
[[package]] [[package]]
name = "float_next_after" name = "float_next_after"
@ -1567,18 +1615,6 @@ version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
[[package]]
name = "glow"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919"
dependencies = [
"js-sys",
"slotmap",
"wasm-bindgen",
"web-sys",
]
[[package]] [[package]]
name = "glow" name = "glow"
version = "0.12.3" version = "0.12.3"
@ -1752,15 +1788,15 @@ dependencies = [
"serde", "serde",
"serde_derive", "serde_derive",
"thiserror", "thiserror",
"toml 0.8.1", "toml 0.8.2",
"unic-langid", "unic-langid",
] ]
[[package]] [[package]]
name = "i18n-embed" name = "i18n-embed"
version = "0.13.9" version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92a86226a7a16632de6723449ee5fe70bac5af718bc642ee9ca2f0f6e14fa1fa" checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c"
dependencies = [ dependencies = [
"arc-swap", "arc-swap",
"fluent", "fluent",
@ -1780,9 +1816,9 @@ dependencies = [
[[package]] [[package]]
name = "i18n-embed-fl" name = "i18n-embed-fl"
version = "0.6.7" 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 = "d26a3d3569737dfaac7fc1c4078e6af07471c3060b8e570bcd83cdd5f4685395" checksum = "9fc1f8715195dffc4caddcf1cf3128da15fe5d8a137606ea8856c9300047d5a2"
dependencies = [ dependencies = [
"dashmap", "dashmap",
"find-crate", "find-crate",
@ -2331,14 +2367,14 @@ dependencies = [
[[package]] [[package]]
name = "libsystemd" name = "libsystemd"
version = "0.5.0" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8144587c71c16756b1055d3dcb0c75cb605a10ecd6523cc33702d5f90902bf6d" checksum = "88b9597a67aa1c81a6624603e6bd0bcefb9e0f94c9c54970ec53771082104b4e"
dependencies = [ dependencies = [
"hmac", "hmac",
"libc", "libc",
"log", "log",
"nix 0.23.2", "nix 0.26.4",
"nom", "nom",
"once_cell", "once_cell",
"serde", "serde",
@ -2471,9 +2507,9 @@ dependencies = [
[[package]] [[package]]
name = "lz4_flex" name = "lz4_flex"
version = "0.10.0" version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b8c72594ac26bfd34f2d99dfced2edfaddfe8a476e3ff2ca0eb293d925c4f83" checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8"
[[package]] [[package]]
name = "malloc_buf" name = "malloc_buf"
@ -2526,6 +2562,15 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "memmap2"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"
dependencies = [
"libc",
]
[[package]] [[package]]
name = "memoffset" name = "memoffset"
version = "0.6.5" version = "0.6.5"
@ -2567,6 +2612,22 @@ dependencies = [
"objc", "objc",
] ]
[[package]]
name = "mime"
version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "mime_guess"
version = "2.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
dependencies = [
"mime",
"unicase",
]
[[package]] [[package]]
name = "minimal-lexical" name = "minimal-lexical"
version = "0.2.1" version = "0.2.1"
@ -2671,19 +2732,6 @@ dependencies = [
"jni-sys", "jni-sys",
] ]
[[package]]
name = "nix"
version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
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"
@ -3005,9 +3053,9 @@ dependencies = [
[[package]] [[package]]
name = "ordered-float" name = "ordered-float"
version = "3.9.1" version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" checksum = "e3a540f3e3b3d7929c884e46d093d344e4e5bdeed54d08bf007df50c93cc85d5"
dependencies = [ dependencies = [
"num-traits", "num-traits",
] ]
@ -3322,26 +3370,14 @@ dependencies = [
[[package]] [[package]]
name = "puffin" name = "puffin"
version = "0.14.3" version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7b2c7a01f569fb03e2ff1f5376537f294001447bd23ce75ca51054fcd223fe4" checksum = "39009d69b9d547c3ffa974a20648fa02f447c05bd0a664012b1ba5a5b06fb14e"
dependencies = [
"byteorder",
"instant",
"once_cell",
]
[[package]]
name = "puffin"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76425abd4e1a0ad4bd6995dd974b52f414fca9974171df8e3708b3e660d05a21"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bincode", "bincode",
"byteorder", "byteorder",
"cfg-if", "cfg-if",
"instant",
"lz4_flex", "lz4_flex",
"once_cell", "once_cell",
"parking_lot 0.12.1", "parking_lot 0.12.1",
@ -3350,18 +3386,18 @@ dependencies = [
[[package]] [[package]]
name = "puffin_egui" name = "puffin_egui"
version = "0.22.0" version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00f0ef87ac588ec9a979ea4952042134ff047407436aa6859ba9e061f55ca55d" checksum = "c5af236782d21bdd5a6eb2f8cc9a91f8d601c073b7f7d568c95c26604cc12b87"
dependencies = [ dependencies = [
"egui", "egui",
"indexmap 1.9.3", "indexmap 1.9.3",
"instant",
"natord", "natord",
"once_cell", "once_cell",
"puffin 0.16.0", "puffin",
"time", "time",
"vec1", "vec1",
"web-time",
] ]
[[package]] [[package]]
@ -3549,25 +3585,19 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
[[package]] [[package]]
name = "renderdoc" name = "renderdoc"
version = "0.10.1" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b42e14087d51efd3b42eb341e37b6f320af2b0750519ea849cb68bb7289643ed" checksum = "272da9ec1e28b0ef17df4dcefad820b13f098ebe9c82697111fc57ccff621e12"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"float-cmp 0.8.0", "float-cmp",
"libloading 0.7.4", "libloading 0.7.4",
"once_cell", "once_cell",
"renderdoc-sys 0.7.1", "renderdoc-sys",
"winapi", "winapi",
"wio", "wio",
] ]
[[package]]
name = "renderdoc-sys"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157"
[[package]] [[package]]
name = "renderdoc-sys" name = "renderdoc-sys"
version = "1.0.0" version = "1.0.0"
@ -3614,17 +3644,6 @@ dependencies = [
"bytemuck", "bytemuck",
] ]
[[package]]
name = "ron"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a"
dependencies = [
"base64 0.13.1",
"bitflags 1.3.2",
"serde",
]
[[package]] [[package]]
name = "ron" name = "ron"
version = "0.8.1" version = "0.8.1"
@ -3657,9 +3676,9 @@ dependencies = [
[[package]] [[package]]
name = "rust-embed" name = "rust-embed"
version = "6.8.1" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40"
dependencies = [ dependencies = [
"rust-embed-impl", "rust-embed-impl",
"rust-embed-utils", "rust-embed-utils",
@ -3668,9 +3687,9 @@ dependencies = [
[[package]] [[package]]
name = "rust-embed-impl" name = "rust-embed-impl"
version = "6.8.1" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3681,9 +3700,9 @@ dependencies = [
[[package]] [[package]]
name = "rust-embed-utils" name = "rust-embed-utils"
version = "7.8.1" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada"
dependencies = [ dependencies = [
"sha2", "sha2",
"walkdir", "walkdir",
@ -3942,7 +3961,7 @@ dependencies = [
"encoding", "encoding",
"gbm", "gbm",
"gl_generator", "gl_generator",
"glow 0.12.3", "glow",
"indexmap 2.0.2", "indexmap 2.0.2",
"input", "input",
"lazy_static", "lazy_static",
@ -3970,7 +3989,7 @@ dependencies = [
"wayland-sys 0.31.1", "wayland-sys 0.31.1",
"winit", "winit",
"x11rb 0.12.0", "x11rb 0.12.0",
"xkbcommon", "xkbcommon 0.6.0",
] ]
[[package]] [[package]]
@ -3995,7 +4014,7 @@ dependencies = [
[[package]] [[package]]
name = "smithay-egui" name = "smithay-egui"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/Smithay/smithay-egui.git?rev=114d8db6#114d8db655094f89a3e9821dcc74bd8eb2e26406" source = "git+https://github.com/Smithay/smithay-egui.git?rev=cdc652e0#cdc652e0d4823b16a5bd9badd288e38512789dc5"
dependencies = [ dependencies = [
"cgmath", "cgmath",
"egui", "egui",
@ -4005,7 +4024,7 @@ dependencies = [
"log", "log",
"memoffset 0.9.0", "memoffset 0.9.0",
"smithay", "smithay",
"xkbcommon", "xkbcommon 0.7.0",
] ]
[[package]] [[package]]
@ -4072,7 +4091,7 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
dependencies = [ dependencies = [
"float-cmp 0.9.0", "float-cmp",
] ]
[[package]] [[package]]
@ -4156,7 +4175,7 @@ dependencies = [
[[package]] [[package]]
name = "taffy" name = "taffy"
version = "0.3.11" version = "0.3.11"
source = "git+https://github.com/DioxusLabs/taffy#65bedf128ec8cef40c1a21b6f141f2c771842cca" source = "git+https://github.com/DioxusLabs/taffy#120bb7a2e501822b324fd48de955450ebbba1c1a"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"grid", "grid",
@ -4308,9 +4327,9 @@ dependencies = [
[[package]] [[package]]
name = "tinystr" name = "tinystr"
version = "0.7.3" version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b07bb54ef1f8ff27564b08b861144d3b8d40263efe07684f64987f4c0d044e3e" checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219"
dependencies = [ dependencies = [
"displaydoc", "displaydoc",
] ]
@ -4341,14 +4360,14 @@ dependencies = [
[[package]] [[package]]
name = "toml" name = "toml"
version = "0.8.1" version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bc1433177506450fe920e46a4f9812d0c211f5dd556da10e731a0a3dfa151f0" checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
dependencies = [ dependencies = [
"serde", "serde",
"serde_spanned", "serde_spanned",
"toml_datetime", "toml_datetime",
"toml_edit 0.20.1", "toml_edit 0.20.2",
] ]
[[package]] [[package]]
@ -4373,9 +4392,9 @@ dependencies = [
[[package]] [[package]]
name = "toml_edit" name = "toml_edit"
version = "0.20.1" version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca676d9ba1a322c1b64eb8045a5ec5c0cfb0c9d08e15e9ff622589ad5221c8fe" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
dependencies = [ dependencies = [
"indexmap 2.0.2", "indexmap 2.0.2",
"serde", "serde",
@ -4537,6 +4556,15 @@ dependencies = [
"tinystr", "tinystr",
] ]
[[package]]
name = "unicase"
version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
dependencies = [
"version_check",
]
[[package]] [[package]]
name = "unicode-bidi" name = "unicode-bidi"
version = "0.3.13" version = "0.3.13"
@ -4706,9 +4734,9 @@ dependencies = [
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "0.8.2" version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
dependencies = [ dependencies = [
"serde", "serde",
] ]
@ -5067,6 +5095,17 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "web-time"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19353897b48e2c4d849a2d73cb0aeb16dc2be4e00c565abfc11eb65a806e47de"
dependencies = [
"js-sys",
"once_cell",
"wasm-bindgen",
]
[[package]] [[package]]
name = "weezl" name = "weezl"
version = "0.1.7" version = "0.1.7"
@ -5135,7 +5174,7 @@ dependencies = [
"core-graphics-types", "core-graphics-types",
"d3d12", "d3d12",
"foreign-types", "foreign-types",
"glow 0.12.3", "glow",
"gpu-alloc", "gpu-alloc",
"gpu-allocator", "gpu-allocator",
"gpu-descriptor", "gpu-descriptor",
@ -5152,7 +5191,7 @@ dependencies = [
"profiling", "profiling",
"range-alloc", "range-alloc",
"raw-window-handle", "raw-window-handle",
"renderdoc-sys 1.0.0", "renderdoc-sys",
"rustc-hash", "rustc-hash",
"smallvec", "smallvec",
"thiserror", "thiserror",
@ -5511,6 +5550,17 @@ dependencies = [
"xkeysym", "xkeysym",
] ]
[[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]] [[package]]
name = "xkeysym" name = "xkeysym"
version = "0.2.0" version = "0.2.0"

29
Cargo.toml
View file

@ -18,8 +18,9 @@ calloop = { version = "0.12.2", features = ["executor"] }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_json = "1" serde_json = "1"
sendfd = "0.4.1" sendfd = "0.4.1"
egui = { version = "0.22.0", optional = true } egui = { version = "0.23.0", optional = true }
renderdoc = { version = "0.10.1", optional = true } egui_plot = { version = "0.23.0", optional = true }
renderdoc = { version = "0.11.0", optional = true }
edid-rs = { version = "0.1" } edid-rs = { version = "0.1" }
png = "0.17.5" png = "0.17.5"
lazy_static = "1.4.0" lazy_static = "1.4.0"
@ -27,11 +28,11 @@ log-panics = { version = "2", features = ["with-backtrace"] }
thiserror = "1.0.26" thiserror = "1.0.26"
regex = "1" regex = "1"
xcursor = "0.3.3" xcursor = "0.3.3"
xkbcommon = "0.6" xkbcommon = "0.7"
indexmap = "2.0" indexmap = "2.0"
xdg = "^2.1" xdg = "^2.1"
ron = "0.7" ron = "0.8"
libsystemd = { version = "0.5", optional = true } libsystemd = { version = "0.6", optional = true }
wayland-backend = "0.3.0" wayland-backend = "0.3.0"
wayland-scanner = "0.31.0" wayland-scanner = "0.31.0"
cosmic-comp-config = { path = "cosmic-comp-config" } cosmic-comp-config = { path = "cosmic-comp-config" }
@ -40,18 +41,18 @@ cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", branch
libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "f91287d", default-features = false } libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "f91287d", default-features = false }
iced_tiny_skia = { git = "https://github.com/pop-os/libcosmic/", rev = "f91287d" } iced_tiny_skia = { git = "https://github.com/pop-os/libcosmic/", rev = "f91287d" }
tiny-skia = "0.10" tiny-skia = "0.10"
ordered-float = "3.0" ordered-float = "4.0"
glow = "0.11.2" glow = "0.12.0"
tracing-subscriber = { version = "0.3.16", features = ["env-filter", "tracing-log"] } tracing-subscriber = { version = "0.3.16", features = ["env-filter", "tracing-log"] }
tracing-journald = "0.3.0" tracing-journald = "0.3.0"
tracing = { version = "0.1.37", features = ["max_level_debug", "release_max_level_info"] } tracing = { version = "0.1.37", features = ["max_level_debug", "release_max_level_info"] }
puffin = { version = "0.14.3", optional = true } puffin = { version = "0.17.0", optional = true }
puffin_egui = { version = "0.22.0", optional = true } puffin_egui = { version = "0.23.0", optional = true }
keyframe = "1.1.1" keyframe = "1.1.1"
once_cell = "1.18.0" once_cell = "1.18.0"
i18n-embed = { version = "0.13", features = ["fluent-system", "desktop-requester"] } i18n-embed = { version = "0.14", features = ["fluent-system", "desktop-requester"] }
i18n-embed-fl = "0.6" i18n-embed-fl = "0.7"
rust-embed = "6.6" rust-embed = "8.0"
[dependencies.id_tree] [dependencies.id_tree]
git = "https://github.com/Drakulix/id-tree.git" git = "https://github.com/Drakulix/id-tree.git"
@ -66,14 +67,14 @@ features = ["backend_drm", "backend_gbm", "backend_egl", "backend_libinput", "ba
[dependencies.smithay-egui] [dependencies.smithay-egui]
git = "https://github.com/Smithay/smithay-egui.git" git = "https://github.com/Smithay/smithay-egui.git"
rev = "114d8db6" rev = "cdc652e0"
features = ["svg"] features = ["svg"]
optional = true optional = true
[features] [features]
default = ["systemd"] default = ["systemd"]
systemd = ["libsystemd"] systemd = ["libsystemd"]
debug = ["egui", "smithay-egui", "renderdoc", "puffin", "puffin_egui", "anyhow/backtrace"] debug = ["egui", "egui_plot", "smithay-egui", "renderdoc", "puffin", "puffin_egui", "anyhow/backtrace"]
[profile.dev] [profile.dev]
lto = "thin" lto = "thin"

6
src/debug.rs
View file

@ -9,7 +9,7 @@ use crate::{
}, },
state::{Common, Fps}, state::{Common, Fps},
}; };
use egui::{Color32, Vec2}; use egui::{load::SizedTexture, Color32, Vec2};
use smithay::{ use smithay::{
backend::{ backend::{
drm::DrmNode, drm::DrmNode,
@ -62,7 +62,7 @@ pub fn fps_ui(
area: Rectangle<i32, Logical>, area: Rectangle<i32, Logical>,
scale: f64, scale: f64,
) -> Result<TextureRenderElement<GlesTexture>, GlesError> { ) -> Result<TextureRenderElement<GlesTexture>, GlesError> {
use egui::widgets::plot::{Bar, BarChart, Legend, Plot}; use egui_plot::{Bar, BarChart, Legend, Plot};
let (max, min, avg, avg_fps) = ( let (max, min, avg, avg_fps) = (
fps.max_frametime().as_secs_f64(), fps.max_frametime().as_secs_f64(),
@ -176,7 +176,7 @@ pub fn fps_ui(
{ {
let factor = resp.rect.height() / size.y; let factor = resp.rect.height() / size.y;
size = Vec2::from([size.x * factor, resp.rect.height()]); size = Vec2::from([size.x * factor, resp.rect.height()]);
ui.image(*texture_id, size); ui.image(SizedTexture::new(*texture_id, size));
} }
} }
}); });

2
src/shell/element/mod.rs
View file

@ -65,7 +65,7 @@ pub mod stack_hover;
pub mod swap_indicator; pub mod swap_indicator;
#[cfg(feature = "debug")] #[cfg(feature = "debug")]
use egui::plot::{Corner, Legend, Plot, PlotPoints, Polygon}; use egui_plot::{Corner, Legend, Plot, PlotPoints, Polygon};
#[cfg(feature = "debug")] #[cfg(feature = "debug")]
use smithay::backend::renderer::{element::texture::TextureRenderElement, gles::GlesTexture}; use smithay::backend::renderer::{element::texture::TextureRenderElement, gles::GlesTexture};
#[cfg(feature = "debug")] #[cfg(feature = "debug")]