Skip to content

Commit 9928a58

Browse files
committed
chore: upgrade all dependencies
1 parent 9ebad94 commit 9928a58

File tree

10 files changed

+359
-275
lines changed

10 files changed

+359
-275
lines changed

Cargo.lock

Lines changed: 307 additions & 217 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ rust-version = "1.80.0"
88

99
[workspace.dependencies]
1010
cosmic-randr = { git = "https://github.com/pop-os/cosmic-randr" }
11-
tokio = { version = "1.40.0", features = ["macros"] }
11+
tokio = { version = "1.43.0", features = ["macros"] }
1212

1313
[workspace.dependencies.libcosmic]
1414
features = ["multi-window", "winit", "tokio"]
@@ -48,9 +48,9 @@ lto = "thin"
4848
# [patch.'https://github.com/smithay/client-toolkit/']
4949
# smithay-client-toolkit = { git = "https://github.com/smithay/client-toolkit//", rev = "c583de8" }
5050

51-
[patch.'https://github.com/pop-os/cosmic-protocols']
52-
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d218c76" }
53-
cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d218c76" }
51+
# [patch.'https://github.com/pop-os/cosmic-protocols']
52+
# cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d218c76" }
53+
# cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d218c76" }
5454

5555
# For development and testing purposes
5656
# [patch.'https://github.com/pop-os/libcosmic']
@@ -64,5 +64,6 @@ cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//",
6464
# [patch.'https://github.com/pop-os/dbus-settings-bindings']
6565
# cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }
6666
# upower_dbus = { path = "../dbus-settings-bindings/upower" }
67+
6768
[patch."https://github.com/smithay/client-toolkit.git"]
6869
sctk = { package = "smithay-client-toolkit", version = "=0.19.2" }

cosmic-settings/Cargo.toml

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ ashpd = { version = "0.9", default-features = false, features = [
1212
"tokio",
1313
], optional = true }
1414
async-channel = "2.3.1"
15-
chrono = "0.4.38"
16-
clap = { version = "4.5.17", features = ["derive"] }
15+
chrono = "0.4.39"
16+
clap = { version = "4.5.29", features = ["derive"] }
1717
color-eyre = "0.6.3"
1818
cosmic-bg-config.workspace = true
1919
cosmic-comp-config = { workspace = true, optional = true }
@@ -32,25 +32,31 @@ derive_setters = "0.1.6"
3232
dirs = "5.0.1"
3333
downcast-rs = "1.2.1"
3434
eyre = "0.6.12"
35-
freedesktop-desktop-entry = "0.7.5"
36-
futures = "0.3.30"
35+
freedesktop-desktop-entry = "0.7.7"
36+
futures = "0.3.31"
3737
hostname-validator = "1.1.1"
3838
hostname1-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
39-
i18n-embed-fl = "0.9.1"
40-
image = { version = "0.25", default-features = false, features = ["jpeg", "png", "rayon", "webp", "hdr"] }
41-
indexmap = "2.5.0"
39+
i18n-embed-fl = "0.9.3"
40+
image = { version = "0.25", default-features = false, features = [
41+
"jpeg",
42+
"png",
43+
"rayon",
44+
"webp",
45+
"hdr",
46+
] }
47+
indexmap = "2.7.1"
4248
itertools = "0.13.0"
43-
itoa = "1.0.11"
49+
itoa = "1.0.14"
4450
libcosmic.workspace = true
4551
locale1 = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
4652
mime-apps = { package = "cosmic-mime-apps", git = "https://github.com/pop-os/cosmic-mime-apps", optional = true }
4753
notify = "6.1.1"
48-
once_cell = "1.19.0"
49-
regex = "1.10.6"
54+
once_cell = "1.20.3"
55+
regex = "1.11.1"
5056
ron = "0.8"
5157
rust-embed = "8.5.0"
5258
secure-string = "0.3.0"
53-
serde = { version = "1.0.210", features = ["derive"] }
59+
serde = { version = "1.0.217", features = ["derive"] }
5460
slab = "0.4.9"
5561
slotmap = "1.0.7"
5662
static_init = "1.0.3"
@@ -59,18 +65,20 @@ tachyonix = "0.3.1"
5965
timedate-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
6066
tokio = { workspace = true, features = ["fs", "io-util", "sync"] }
6167
tracing = "0.1.41"
62-
tracing-subscriber = "0.3.18"
63-
udev = { version = "0.9.0", optional = true }
68+
tracing-subscriber = "0.3.19"
69+
udev = { version = "0.9.3", optional = true }
6470
upower_dbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
6571
bluez-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
66-
url = "2.5.2"
72+
url = "2.5.4"
6773
xkb-data = "0.2.1"
68-
zbus = { version = "4.4.0", features = ["tokio"], optional = true }
74+
zbus = { version = "4.4.0", default-features = false, features = [
75+
"tokio",
76+
], optional = true }
6977
zbus_polkit = { version = "4.0.0" }
7078
fontdb = "0.16.2"
7179
fixed_decimal = "0.5.6"
7280
mime = "0.3.17"
73-
rustix = "0.38.41"
81+
rustix = "0.38.44"
7482
gettext-rs = { version = "0.7.2", features = [
7583
"gettext-system",
7684
], optional = true }
@@ -87,7 +95,7 @@ version = "1.5.0"
8795
features = ["experimental", "compiled_data", "icu_datetime_experimental"]
8896

8997
[dependencies.i18n-embed]
90-
version = "0.15.0"
98+
version = "0.15.3"
9199
features = ["fluent-system", "desktop-requester"]
92100

93101
# Contains region-handling logic for Linux

cosmic-settings/src/main.rs

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,6 @@ use ron::error::SpannedError;
2828
use serde::{Deserialize, Serialize};
2929
use tracing_subscriber::prelude::*;
3030

31-
/// Access glibc malloc tunables.
32-
#[cfg(target_env = "gnu")]
33-
mod malloc {
34-
use std::os::raw::c_int;
35-
36-
const M_MMAP_THRESHOLD: c_int = -3;
37-
38-
extern "C" {
39-
fn mallopt(param: c_int, value: c_int) -> c_int;
40-
}
41-
42-
/// Prevents glibc from hoarding memory via memory fragmentation.
43-
pub fn limit_mmap_threshold() {
44-
unsafe {
45-
mallopt(M_MMAP_THRESHOLD, 65536);
46-
}
47-
}
48-
}
49-
5031
#[derive(Parser, Debug, Serialize, Deserialize, Clone)]
5132
#[command(author, version, about, long_about = None)]
5233
#[command(propagate_version = true)]
@@ -159,9 +140,6 @@ impl CosmicFlags for Args {
159140
///
160141
/// Returns error if iced fails to run the application.
161142
pub fn main() -> color_eyre::Result<()> {
162-
#[cfg(target_env = "gnu")]
163-
malloc::limit_mmap_threshold();
164-
165143
color_eyre::install()?;
166144

167145
if std::env::var("RUST_SPANTRACE").is_err() {

cosmic-settings/src/pages/bluetooth/backend.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ impl PartialEq for Adapter {
158158

159159
impl Eq for Adapter {}
160160

161-
const default_device_icon: &str = "bluetooth-symbolic";
161+
const DEFAULT_DEVICE_ICON: &str = "bluetooth-symbolic";
162162

163163
fn device_type_to_icon(device_type: &str) -> &'static str {
164164
match device_type {
@@ -175,7 +175,7 @@ fn device_type_to_icon(device_type: &str) -> &'static str {
175175
"input-mouse" => "input-mouse-symbolic",
176176
"printer" => "printer-network-symbolic",
177177
"camera-photo" => "camera-photo-symbolic",
178-
_ => default_device_icon,
178+
_ => DEFAULT_DEVICE_ICON,
179179
}
180180
}
181181

@@ -269,7 +269,7 @@ impl Device {
269269
}
270270
#[must_use]
271271
pub fn is_known_device_type(&self) -> bool {
272-
self.icon != default_device_icon
272+
self.icon != DEFAULT_DEVICE_ICON
273273
}
274274
#[must_use]
275275
pub fn alias_or_addr(&self) -> &str {

cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,10 @@ fn localize_action(action: &Action) -> String {
674674
SystemAction::WorkspaceOverview => fl!("system-shortcut", "workspace-overview"),
675675
},
676676

677+
Action::ZoomIn => fl!("zoom-in"),
678+
679+
Action::ZoomOut => fl!("zoom-out"),
680+
677681
Action::Spawn(task) => task.clone(),
678682
}
679683
}

i18n/en/cosmic_settings.ftl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,9 @@ window-tiling = Window tiling
653653
replace-shortcut-dialog = Replace Shortcut?
654654
.desc = { $shortcut } is used by { $name }. If you replace it, { $name } will be disabled.
655655
656+
zoom-in = Zoom In
657+
zoom-out = Zoom Out
658+
656659
## Input: Mouse
657660

658661
mouse = Mouse

page/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ edition = "2021"
55

66
[dependencies]
77
derive_setters = "0.1.6"
8-
regex = "1.10.6"
8+
regex = "1.11.1"
99
slotmap = "1.0.7"
1010
libcosmic = { workspace = true }
1111
downcast-rs = "1.2.1"
12-
once_cell = "1.19.0"
12+
once_cell = "1.20.3"
1313
tokio.workspace = true
14-
url = "2.5.2"
14+
url = "2.5.4"
1515
slab = "0.4.9"

pages/system/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ license = "GPL-3.0-only"
77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
10-
byte-unit = "5.1.4"
11-
const_format = "0.2.33"
10+
byte-unit = "5.1.6"
11+
const_format = "0.2.34"
1212
concat-in-place = "1.1.0"
1313
sysinfo = "0.31.4"
1414
memchr = "2.7.4"
1515

1616
[dependencies.bumpalo]
17-
version = "3.16.0"
17+
version = "3.17.0"
1818
features = ["collections"]

pages/wallpapers/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ fast_image_resize = { git = "https://github.com/jackpot51/fast_image_resize.git"
1616
"image",
1717
] }
1818
freedesktop-icons = { package = "cosmic-freedesktop-icons", git = "https://github.com/pop-os/freedesktop-icons" }
19-
futures-lite = "2.3.0"
20-
futures-util = "0.3.30"
21-
image = "0.25.2"
19+
futures-lite = "2.6.0"
20+
futures-util = "0.3.31"
21+
image = "0.25.5"
2222
infer = "0.16.0"
23-
jxl-oxide = "0.9.0"
24-
tokio = { version = "1.40.0", features = ["sync"] }
25-
tracing = "0.1.40"
23+
jxl-oxide = "0.11.1"
24+
tokio = { version = "1.43.0", features = ["sync"] }
25+
tracing = "0.1.41"

0 commit comments

Comments
 (0)