From eaeee04f1ea65f53ffa164cd6dbc9f66d2849014 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Tue, 16 Jul 2024 18:22:01 -0400 Subject: [PATCH] update deps --- Cargo.lock | 194 ++++++++++++++++---------------- Cargo.toml | 42 +++---- cosmic-app-list/src/app.rs | 8 +- cosmic-panel-button/Cargo.toml | 4 +- cosmic-panel-button/src/main.rs | 26 +++-- 5 files changed, 132 insertions(+), 142 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eed3fc70..a2913454 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -212,9 +212,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", @@ -349,7 +349,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -384,7 +384,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -544,9 +544,9 @@ dependencies = [ [[package]] name = "bluer" -version = "0.17.2" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "204d6580f8238447c5d4d6a338f82b573375dae7bf992fec7347a44240a7e6d8" +checksum = "e9ef6a5cd82c14b67cb3ac18d6dc6d76e1a48e40afe7e4263a9e3a19a7ed4ffb" dependencies = [ "custom_debug", "dbus", @@ -600,7 +600,7 @@ checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -611,9 +611,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" [[package]] name = "calendrical_calculations" @@ -653,9 +653,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.0" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaff6f8ce506b9773fa786672d63fc7a191ffea1be33f72bbd4aeacefca9ffc8" +checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" [[package]] name = "cfg-if" @@ -1177,7 +1177,7 @@ source = "git+https://github.com/pop-os/cosmic-protocols?rev=c8d3a1c#c8d3a1c3d40 dependencies = [ "cosmic-protocols", "libc", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit", "wayland-client", ] @@ -1194,6 +1194,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#2dd55f2f20cc0a5bd09f834779dd6cf1dcb23bcf" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1215,6 +1216,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#2dd55f2f20cc0a5bd09f834779dd6cf1dcb23bcf" dependencies = [ "quote", "syn 1.0.109", @@ -1237,7 +1239,7 @@ dependencies = [ [[package]] name = "cosmic-notifications-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-notifications#34f44eb013e5b3a94f7b14336bf244b33622369d" +source = "git+https://github.com/pop-os/cosmic-notifications#2caf2fb640e3601fac4dee1ae5c0121f75adcb51" dependencies = [ "cosmic-config", "serde", @@ -1246,7 +1248,7 @@ dependencies = [ [[package]] name = "cosmic-notifications-util" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-notifications#34f44eb013e5b3a94f7b14336bf244b33622369d" +source = "git+https://github.com/pop-os/cosmic-notifications#2caf2fb640e3601fac4dee1ae5c0121f75adcb51" dependencies = [ "bytemuck", "fast_image_resize", @@ -1261,7 +1263,7 @@ name = "cosmic-panel-button" version = "0.1.0" dependencies = [ "cosmic-config", - "freedesktop-desktop-entry 0.5.2", + "freedesktop-desktop-entry 0.6.2", "libcosmic", "serde", "tracing", @@ -1272,13 +1274,13 @@ dependencies = [ [[package]] name = "cosmic-panel-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-panel#4496788f8c1f842863b2ffd1bf027af6d5b12f48" +source = "git+https://github.com/pop-os/cosmic-panel#05420b20035cdb9f2fa52517e9c5abce9e0f0bb5" dependencies = [ "anyhow", "cosmic-config", "ron", "serde", - "smithay-client-toolkit 0.18.0", + "smithay-client-toolkit", "tracing", "wayland-protocols-wlr 0.2.0", "xdg-shell-wrapper-config", @@ -1309,6 +1311,7 @@ dependencies = [ [[package]] name = "cosmic-settings-subscriptions" version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-settings-subscriptions#c19240ad2c9f11ef5cec8ed8c70255c3dc9ae8d4" dependencies = [ "futures", "iced_futures", @@ -1324,7 +1327,7 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.12.0" -source = "git+https://github.com/pop-os/cosmic-text.git#a03ec6b75f0ea8fd6264d6cd05afcec3c2213f8f" +source = "git+https://github.com/pop-os/cosmic-text.git#0e2d050a8d87c2e97e94ae205c9beda5858123b6" dependencies = [ "bitflags 2.6.0", "fontdb", @@ -1346,6 +1349,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#2dd55f2f20cc0a5bd09f834779dd6cf1dcb23bcf" dependencies = [ "almost", "cosmic-config", @@ -1362,6 +1366,7 @@ dependencies = [ [[package]] name = "cosmic-time" version = "0.4.0" +source = "git+https://github.com/pop-os/cosmic-time#dd973b3ced4b6cf784c78a1c36f1526dfbfbfa19" dependencies = [ "float-cmp", "libcosmic", @@ -1483,7 +1488,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", "synstructure", ] @@ -1542,7 +1547,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -1564,7 +1569,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -1679,7 +1684,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -1747,7 +1752,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -1776,7 +1781,7 @@ dependencies = [ "bitflags 2.6.0", "mime 0.1.0", "raw-window-handle", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit", "smithay-clipboard", ] @@ -1866,7 +1871,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -2170,7 +2175,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -2334,7 +2339,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -2707,7 +2712,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.70", + "syn 2.0.71", "unic-langid", ] @@ -2728,7 +2733,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.70", + "syn 2.0.71", "unic-langid", ] @@ -2742,7 +2747,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -2771,6 +2776,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#2dd55f2f20cc0a5bd09f834779dd6cf1dcb23bcf" dependencies = [ "dnd", "iced_accessibility", @@ -2788,6 +2794,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#2dd55f2f20cc0a5bd09f834779dd6cf1dcb23bcf" dependencies = [ "accesskit", "accesskit_unix", @@ -2796,6 +2803,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#2dd55f2f20cc0a5bd09f834779dd6cf1dcb23bcf" dependencies = [ "bitflags 2.6.0", "dnd", @@ -2806,7 +2814,7 @@ dependencies = [ "palette", "raw-window-handle", "serde", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit", "smol_str", "thiserror", "web-time", @@ -2817,6 +2825,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#2dd55f2f20cc0a5bd09f834779dd6cf1dcb23bcf" dependencies = [ "futures", "iced_core", @@ -2829,6 +2838,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#2dd55f2f20cc0a5bd09f834779dd6cf1dcb23bcf" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -2852,6 +2862,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#2dd55f2f20cc0a5bd09f834779dd6cf1dcb23bcf" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2863,12 +2874,13 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#2dd55f2f20cc0a5bd09f834779dd6cf1dcb23bcf" dependencies = [ "dnd", "iced_accessibility", "iced_core", "iced_futures", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit", "thiserror", "window_clipboard", ] @@ -2876,6 +2888,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#2dd55f2f20cc0a5bd09f834779dd6cf1dcb23bcf" dependencies = [ "enum-repr", "float-cmp", @@ -2887,7 +2900,7 @@ dependencies = [ "itertools 0.12.1", "lazy_static", "raw-window-handle", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit", "thiserror", "tracing", "wayland-backend", @@ -2901,6 +2914,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#2dd55f2f20cc0a5bd09f834779dd6cf1dcb23bcf" dependencies = [ "iced_core", "once_cell", @@ -2910,6 +2924,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#2dd55f2f20cc0a5bd09f834779dd6cf1dcb23bcf" dependencies = [ "bytemuck", "cosmic-text", @@ -2926,7 +2941,9 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#2dd55f2f20cc0a5bd09f834779dd6cf1dcb23bcf" dependencies = [ + "as-raw-xcb-connection", "bitflags 2.6.0", "bytemuck", "futures", @@ -2940,17 +2957,20 @@ dependencies = [ "raw-window-handle", "resvg", "rustix 0.38.34", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit", + "tiny-xlib", "wayland-backend", "wayland-client", "wayland-protocols 0.32.2", "wayland-sys", "wgpu", + "x11rb", ] [[package]] name = "iced_widget" version = "0.12.0" +source = "git+https://github.com/pop-os/libcosmic#2dd55f2f20cc0a5bd09f834779dd6cf1dcb23bcf" dependencies = [ "dnd", "iced_renderer", @@ -2958,7 +2978,7 @@ dependencies = [ "iced_style", "num-traits", "ouroboros", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit", "thiserror", "unicode-segmentation", "window_clipboard", @@ -3312,7 +3332,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -3631,6 +3651,7 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libcosmic" version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#2dd55f2f20cc0a5bd09f834779dd6cf1dcb23bcf" dependencies = [ "apply", "ashpd", @@ -4158,7 +4179,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -4313,7 +4334,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -4344,7 +4365,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -4396,7 +4417,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.2", + "redox_syscall 0.5.3", "smallvec", "windows-targets 0.52.6", ] @@ -4443,7 +4464,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -4478,7 +4499,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -4790,9 +4811,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ "bitflags 2.6.0", ] @@ -4909,9 +4930,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.44" +version = "0.8.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aee83dc281d5a3200d37b299acd13b81066ea126a7f16f0eae70fc9aed241d9" +checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523" dependencies = [ "bytemuck", ] @@ -4965,7 +4986,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils 7.8.1", - "syn 2.0.70", + "syn 2.0.71", "walkdir", ] @@ -4978,7 +4999,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils 8.5.0", - "syn 2.0.70", + "syn 2.0.71", "walkdir", ] @@ -5171,7 +5192,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -5194,7 +5215,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -5309,36 +5330,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay-client-toolkit" -version = "0.18.0" -source = "git+https://github.com/smithay/client-toolkit//?rev=3bed072#3bed072b966022f5f929d12f3aff089b1ace980b" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "calloop", - "calloop-wayland-source", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.4", - "pkg-config", - "rustix 0.38.34", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols 0.31.2", - "wayland-protocols-wlr 0.2.0", - "wayland-scanner", - "xkbcommon", - "xkeysym", -] - -[[package]] -name = "smithay-client-toolkit" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "837d3067369e24aeda699a5d9fc5aa14ca14a84dd70aeed7156bfa04a5605b32" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -5369,7 +5363,7 @@ source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#d099e82a dependencies = [ "libc", "raw-window-handle", - "smithay-client-toolkit 0.19.1", + "smithay-client-toolkit", "wayland-backend", ] @@ -5502,7 +5496,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -5553,9 +5547,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.70" +version = "2.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" dependencies = [ "proc-macro2", "quote", @@ -5570,7 +5564,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -5628,22 +5622,22 @@ checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b" [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -5798,7 +5792,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -5896,7 +5890,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -6259,7 +6253,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", "wasm-bindgen-shared", ] @@ -6293,7 +6287,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6968,7 +6962,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", "synstructure", ] @@ -7070,7 +7064,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", "zvariant_utils 2.0.0", ] @@ -7119,7 +7113,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -7139,7 +7133,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", "synstructure", ] @@ -7173,7 +7167,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] [[package]] @@ -7235,7 +7229,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", "zvariant_utils 2.0.0", ] @@ -7258,5 +7252,5 @@ checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.71", ] diff --git a/Cargo.toml b/Cargo.toml index 8a61577d..ebebb584 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,13 +26,8 @@ cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-c cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [ "client", ], rev = "c8d3a1c" } -# cosmic-settings-subscriptions = { git = "https://github.com/pop-os/cosmic-settings-subscriptions" } -cosmic-settings-subscriptions = { path = "../cosmic-settings-subscriptions" } -# cosmic-time = { git = "https://github.com/pop-os/cosmic-time", default-features = false, features = [ -# "libcosmic", -# "once_cell", -# ] } -cosmic-time = { path = "../cosmic-time", default-features = false, features = [ +cosmic-settings-subscriptions = { git = "https://github.com/pop-os/cosmic-settings-subscriptions" } +cosmic-time = { git = "https://github.com/pop-os/cosmic-time", default-features = false, features = [ "libcosmic", "once_cell", ] } @@ -45,7 +40,7 @@ i18n-embed = { version = "0.14.1", features = [ "desktop-requester", ] } i18n-embed-fl = "0.8" -libcosmic = { path = "../libcosmic", features = [ +libcosmic = { git = "https://github.com/pop-os/libcosmic", features = [ "applet", "applet-token", "tokio", @@ -75,16 +70,21 @@ ignored = ["libcosmic"] # libcosmic = { git = "https://github.com/pop-os/libcosmic//" } [patch."https://github.com/Smithay/client-toolkit"] -sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "3bed072" } -[patch.'https://github.com/pop-os/libcosmic'] -# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-export-gtk" } -# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-export-gtk" } -# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-export-gtk" } -libcosmic = { path = "../libcosmic" } -cosmic-config = { path = "../libcosmic/cosmic-config" } -cosmic-theme = { path = "../libcosmic/cosmic-theme" } -iced = { path = "../libcosmic/iced" } -cosmic-time = { path = "../cosmic-time", default-features = false, features = [ - "libcosmic", - "once_cell", -] } +sctk = { package = "smithay-client-toolkit", version = "0.19.2" } +# [patch.'https://github.com/pop-os/libcosmic'] +# libcosmic = { git = "https://github.com/pop-os/libcosmic//" } +# cosmic-config = { git = "https://github.com/pop-os/libcosmic//" } +# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//" } +# cosmic-time = { git = "https://github.com/pop-os/cosmic-time", default-features = false, features = [ +# "libcosmic", +# "once_cell", +# ] } +# iced_futures = { git = "https://github.com/pop-os/libcosmic//" } +# libcosmic = { path = "../libcosmic" } +# cosmic-config = { path = "../libcosmic/cosmic-config" } +# cosmic-theme = { path = "../libcosmic/cosmic-theme" } +# iced = { path = "../libcosmic/iced" } +# cosmic-time = { path = "../cosmic-time", default-features = false, features = [ +# "libcosmic", +# "once_cell", +# ] } diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs index a5bbf1f1..9eec23b7 100755 --- a/cosmic-app-list/src/app.rs +++ b/cosmic-app-list/src/app.rs @@ -2084,13 +2084,7 @@ impl CosmicAppList { } else { favorite_index = (btn_count as usize).min(favorite_active_cnt).max(2); } - // tracing::error!( - // "{}, {}, {}, {}", - // btn_count, - // button_total_size, - // favorite_active_cnt, - // favorite_index - // ); + // calculation of active_index based on favorite_index if there is still not enough space let active_index_max = (btn_count as i32) - (self.pinned_list.len() as i32).saturating_sub(favorite_index as i32); diff --git a/cosmic-panel-button/Cargo.toml b/cosmic-panel-button/Cargo.toml index 4e1cb399..4e759b48 100644 --- a/cosmic-panel-button/Cargo.toml +++ b/cosmic-panel-button/Cargo.toml @@ -5,10 +5,10 @@ edition = "2021" license = "GPL-3.0" [dependencies] -freedesktop-desktop-entry = "0.5.1" +freedesktop-desktop-entry = "0.6.2" libcosmic.workspace = true tracing-log.workspace = true tracing-subscriber.workspace = true tracing.workspace = true cosmic-config.workspace = true -serde.workspace = true \ No newline at end of file +serde.workspace = true diff --git a/cosmic-panel-button/src/main.rs b/cosmic-panel-button/src/main.rs index 429ce005..bd5b9ed7 100644 --- a/cosmic-panel-button/src/main.rs +++ b/cosmic-panel-button/src/main.rs @@ -16,7 +16,7 @@ use cosmic::{ widget::vertical_space, }; use cosmic_config::{Config, CosmicConfigEntry}; -use freedesktop_desktop_entry::DesktopEntry; +use freedesktop_desktop_entry::{get_languages_from_env, DesktopEntry}; use std::{env, fs, process::Command}; mod config; @@ -153,20 +153,22 @@ pub fn main() -> iced::Result { .expect("Requires desktop file id as argument."); let filename = format!("{id}.desktop"); let mut desktop = None; + let locales = get_languages_from_env(); for mut path in freedesktop_desktop_entry::default_paths() { path.push(&filename); if let Ok(bytes) = fs::read_to_string(&path) { - if let Ok(entry) = DesktopEntry::decode(&path, &bytes) { - desktop = - Some(Desktop { - name: entry.name(None).map(|x| x.to_string()).unwrap_or_else(|| { - panic!("Desktop file '{filename}' doesn't have `Name`") - }), - icon: entry.icon().map(|x| x.to_string()), - exec: entry.exec().map(|x| x.to_string()).unwrap_or_else(|| { - panic!("Desktop file '{filename}' doesn't have `Exec`") - }), - }); + if let Ok(entry) = DesktopEntry::from_str(&path, &bytes, &locales) { + desktop = Some(Desktop { + name: entry + .name(&locales) + .map(|x| x.to_string()) + .unwrap_or_else(|| panic!("Desktop file '{filename}' doesn't have `Name`")), + icon: entry.icon().map(|x| x.to_string()), + exec: entry + .exec() + .map(|x| x.to_string()) + .unwrap_or_else(|| panic!("Desktop file '{filename}' doesn't have `Exec`")), + }); break; } }