Skip to content

Commit

Permalink
chore: upgrade all dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
mmstick committed Feb 14, 2025
1 parent 9ebad94 commit 9928a58
Show file tree
Hide file tree
Showing 10 changed files with 359 additions and 275 deletions.
524 changes: 307 additions & 217 deletions Cargo.lock

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ rust-version = "1.80.0"

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

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

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

# For development and testing purposes
# [patch.'https://github.com/pop-os/libcosmic']
Expand All @@ -64,5 +64,6 @@ cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//",
# [patch.'https://github.com/pop-os/dbus-settings-bindings']
# cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }
# upower_dbus = { path = "../dbus-settings-bindings/upower" }

[patch."https://github.com/smithay/client-toolkit.git"]
sctk = { package = "smithay-client-toolkit", version = "=0.19.2" }
42 changes: 25 additions & 17 deletions cosmic-settings/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ ashpd = { version = "0.9", default-features = false, features = [
"tokio",
], optional = true }
async-channel = "2.3.1"
chrono = "0.4.38"
clap = { version = "4.5.17", features = ["derive"] }
chrono = "0.4.39"
clap = { version = "4.5.29", features = ["derive"] }
color-eyre = "0.6.3"
cosmic-bg-config.workspace = true
cosmic-comp-config = { workspace = true, optional = true }
Expand All @@ -32,25 +32,31 @@ derive_setters = "0.1.6"
dirs = "5.0.1"
downcast-rs = "1.2.1"
eyre = "0.6.12"
freedesktop-desktop-entry = "0.7.5"
futures = "0.3.30"
freedesktop-desktop-entry = "0.7.7"
futures = "0.3.31"
hostname-validator = "1.1.1"
hostname1-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
i18n-embed-fl = "0.9.1"
image = { version = "0.25", default-features = false, features = ["jpeg", "png", "rayon", "webp", "hdr"] }
indexmap = "2.5.0"
i18n-embed-fl = "0.9.3"
image = { version = "0.25", default-features = false, features = [
"jpeg",
"png",
"rayon",
"webp",
"hdr",
] }
indexmap = "2.7.1"
itertools = "0.13.0"
itoa = "1.0.11"
itoa = "1.0.14"
libcosmic.workspace = true
locale1 = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
mime-apps = { package = "cosmic-mime-apps", git = "https://github.com/pop-os/cosmic-mime-apps", optional = true }
notify = "6.1.1"
once_cell = "1.19.0"
regex = "1.10.6"
once_cell = "1.20.3"
regex = "1.11.1"
ron = "0.8"
rust-embed = "8.5.0"
secure-string = "0.3.0"
serde = { version = "1.0.210", features = ["derive"] }
serde = { version = "1.0.217", features = ["derive"] }
slab = "0.4.9"
slotmap = "1.0.7"
static_init = "1.0.3"
Expand All @@ -59,18 +65,20 @@ tachyonix = "0.3.1"
timedate-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
tokio = { workspace = true, features = ["fs", "io-util", "sync"] }
tracing = "0.1.41"
tracing-subscriber = "0.3.18"
udev = { version = "0.9.0", optional = true }
tracing-subscriber = "0.3.19"
udev = { version = "0.9.3", optional = true }
upower_dbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
bluez-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
url = "2.5.2"
url = "2.5.4"
xkb-data = "0.2.1"
zbus = { version = "4.4.0", features = ["tokio"], optional = true }
zbus = { version = "4.4.0", default-features = false, features = [
"tokio",
], optional = true }
zbus_polkit = { version = "4.0.0" }
fontdb = "0.16.2"
fixed_decimal = "0.5.6"
mime = "0.3.17"
rustix = "0.38.41"
rustix = "0.38.44"
gettext-rs = { version = "0.7.2", features = [
"gettext-system",
], optional = true }
Expand All @@ -87,7 +95,7 @@ version = "1.5.0"
features = ["experimental", "compiled_data", "icu_datetime_experimental"]

[dependencies.i18n-embed]
version = "0.15.0"
version = "0.15.3"
features = ["fluent-system", "desktop-requester"]

# Contains region-handling logic for Linux
Expand Down
22 changes: 0 additions & 22 deletions cosmic-settings/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,6 @@ use ron::error::SpannedError;
use serde::{Deserialize, Serialize};
use tracing_subscriber::prelude::*;

/// Access glibc malloc tunables.
#[cfg(target_env = "gnu")]
mod malloc {
use std::os::raw::c_int;

const M_MMAP_THRESHOLD: c_int = -3;

extern "C" {
fn mallopt(param: c_int, value: c_int) -> c_int;
}

/// Prevents glibc from hoarding memory via memory fragmentation.
pub fn limit_mmap_threshold() {
unsafe {
mallopt(M_MMAP_THRESHOLD, 65536);
}
}
}

#[derive(Parser, Debug, Serialize, Deserialize, Clone)]
#[command(author, version, about, long_about = None)]
#[command(propagate_version = true)]
Expand Down Expand Up @@ -159,9 +140,6 @@ impl CosmicFlags for Args {
///
/// Returns error if iced fails to run the application.
pub fn main() -> color_eyre::Result<()> {
#[cfg(target_env = "gnu")]
malloc::limit_mmap_threshold();

color_eyre::install()?;

if std::env::var("RUST_SPANTRACE").is_err() {
Expand Down
6 changes: 3 additions & 3 deletions cosmic-settings/src/pages/bluetooth/backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ impl PartialEq for Adapter {

impl Eq for Adapter {}

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

fn device_type_to_icon(device_type: &str) -> &'static str {
match device_type {
Expand All @@ -175,7 +175,7 @@ fn device_type_to_icon(device_type: &str) -> &'static str {
"input-mouse" => "input-mouse-symbolic",
"printer" => "printer-network-symbolic",
"camera-photo" => "camera-photo-symbolic",
_ => default_device_icon,
_ => DEFAULT_DEVICE_ICON,
}
}

Expand Down Expand Up @@ -269,7 +269,7 @@ impl Device {
}
#[must_use]
pub fn is_known_device_type(&self) -> bool {
self.icon != default_device_icon
self.icon != DEFAULT_DEVICE_ICON
}
#[must_use]
pub fn alias_or_addr(&self) -> &str {
Expand Down
4 changes: 4 additions & 0 deletions cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -674,6 +674,10 @@ fn localize_action(action: &Action) -> String {
SystemAction::WorkspaceOverview => fl!("system-shortcut", "workspace-overview"),
},

Action::ZoomIn => fl!("zoom-in"),

Action::ZoomOut => fl!("zoom-out"),

Action::Spawn(task) => task.clone(),
}
}
Expand Down
3 changes: 3 additions & 0 deletions i18n/en/cosmic_settings.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,9 @@ window-tiling = Window tiling
replace-shortcut-dialog = Replace Shortcut?
.desc = { $shortcut } is used by { $name }. If you replace it, { $name } will be disabled.
zoom-in = Zoom In
zoom-out = Zoom Out
## Input: Mouse

mouse = Mouse
Expand Down
6 changes: 3 additions & 3 deletions page/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ edition = "2021"

[dependencies]
derive_setters = "0.1.6"
regex = "1.10.6"
regex = "1.11.1"
slotmap = "1.0.7"
libcosmic = { workspace = true }
downcast-rs = "1.2.1"
once_cell = "1.19.0"
once_cell = "1.20.3"
tokio.workspace = true
url = "2.5.2"
url = "2.5.4"
slab = "0.4.9"
6 changes: 3 additions & 3 deletions pages/system/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ license = "GPL-3.0-only"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
byte-unit = "5.1.4"
const_format = "0.2.33"
byte-unit = "5.1.6"
const_format = "0.2.34"
concat-in-place = "1.1.0"
sysinfo = "0.31.4"
memchr = "2.7.4"

[dependencies.bumpalo]
version = "3.16.0"
version = "3.17.0"
features = ["collections"]
12 changes: 6 additions & 6 deletions pages/wallpapers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ fast_image_resize = { git = "https://github.com/jackpot51/fast_image_resize.git"
"image",
] }
freedesktop-icons = { package = "cosmic-freedesktop-icons", git = "https://github.com/pop-os/freedesktop-icons" }
futures-lite = "2.3.0"
futures-util = "0.3.30"
image = "0.25.2"
futures-lite = "2.6.0"
futures-util = "0.3.31"
image = "0.25.5"
infer = "0.16.0"
jxl-oxide = "0.9.0"
tokio = { version = "1.40.0", features = ["sync"] }
tracing = "0.1.40"
jxl-oxide = "0.11.1"
tokio = { version = "1.43.0", features = ["sync"] }
tracing = "0.1.41"

0 comments on commit 9928a58

Please sign in to comment.