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

chore: update libcosmic with mmap threshold fix

Browse source
This commit is contained in:
Michael Aaron Murphy 2025-02-12 19:38:40 +01:00 • committed by Michael Murphy
parent c133152b87
commit 69fd2b62df
5 changed files with 428 additions and 356 deletions
Download patch file Download diff file Expand all files Collapse all files

768
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

6
cosmic-app-list/src/app.rs
View file

@ -129,7 +129,7 @@ struct DockItem {
id: u32, id: u32,
toplevels: Vec<(ZcosmicToplevelHandleV1, ToplevelInfo, Option<WaylandImage>)>, toplevels: Vec<(ZcosmicToplevelHandleV1, ToplevelInfo, Option<WaylandImage>)>,
// Information found in the .desktop file // Information found in the .desktop file
desktop_info: DesktopEntry<'static>, desktop_info: DesktopEntry,
// We must use this because the id in `DesktopEntry` is an estimation. // We must use this because the id in `DesktopEntry` is an estimation.
// Thus, if we unpin an item, we want to be sure to use the real id // Thus, if we unpin an item, we want to be sure to use the real id
original_app_id: String, original_app_id: String,
@ -556,7 +556,7 @@ fn app_list_icon_style(selected: bool) -> cosmic::theme::Button {
} }
} }
fn load_desktop_entries_from_app_ids<I, L>(ids: &[I], locales: &[L]) -> Vec<DesktopEntry<'static>> fn load_desktop_entries_from_app_ids<I, L>(ids: &[I], locales: &[L]) -> Vec<DesktopEntry>
where where
I: AsRef<str>, I: AsRef<str>,
L: AsRef<str>, L: AsRef<str>,
@ -568,7 +568,7 @@ where
ids.iter() ids.iter()
.map(|id| { .map(|id| {
fde::matching::find_entry_from_appid(entries.iter(), id.as_ref()) fde::matching::find_entry_from_appid(entries.iter(), id.as_ref())
.unwrap_or(&fde::DesktopEntry::from_appid(id.as_ref())) .unwrap_or(&fde::DesktopEntry::from_appid(id.as_ref().to_owned()))
.to_owned() .to_owned()
}) })
.collect_vec() .collect_vec()

2
cosmic-applet-bluetooth/src/app.rs
View file

@ -528,7 +528,7 @@ impl cosmic::Application for CosmicBluetoothApplet {
.request_confirmation .request_confirmation
.as_ref() .as_ref()
.map_or(false, |(dev, _, _)| d.address == dev.address) .map_or(false, |(dev, _, _)| d.address == dev.address)
&& (d.has_name() || d.is_known_device_type()) && (d.has_name() || d.is_known_device_type())
}) { }) {
let row = row![ let row = row![
icon::from_name(dev.icon.as_str()).size(16).symbolic(true), icon::from_name(dev.icon.as_str()).size(16).symbolic(true),

1
cosmic-applets/Cargo.toml
View file

@ -20,7 +20,6 @@ cosmic-applet-time = { path = "../cosmic-applet-time" }
cosmic-applet-workspaces = { path = "../cosmic-applet-workspaces" } cosmic-applet-workspaces = { path = "../cosmic-applet-workspaces" }
cosmic-applet-input-sources = { path = "../cosmic-applet-input-sources" } cosmic-applet-input-sources = { path = "../cosmic-applet-input-sources" }
cosmic-panel-button = { path = "../cosmic-panel-button" } cosmic-panel-button = { path = "../cosmic-panel-button" }
libc = "0.2"
libcosmic.workspace = true libcosmic.workspace = true
tracing.workspace = true tracing.workspace = true
tracing-subscriber.workspace = true tracing-subscriber.workspace = true

7
cosmic-applets/src/main.rs
View file

@ -4,13 +4,6 @@
const VERSION: &str = env!("CARGO_PKG_VERSION"); const VERSION: &str = env!("CARGO_PKG_VERSION");
fn main() -> cosmic::iced::Result { fn main() -> cosmic::iced::Result {
// Prevents glibc from hoarding memory, such as cosmic-applet-minimize
// consuming 100s of megabytes on restoring a minimized window.
#[cfg(target_env = "gnu")]
unsafe {
libc::mallopt(libc::M_MMAP_THRESHOLD, 65536);
}
tracing_subscriber::fmt().with_env_filter("warn").init(); tracing_subscriber::fmt().with_env_filter("warn").init();
let _ = tracing_log::LogTracer::init(); let _ = tracing_log::LogTracer::init();