leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix build on Windows/non-Unix

Browse source 
We'll need libcosmic to work on Windows and macOS if we want to use it
in the Keyboard Configurator.

`freedesktop-icons` doesn't seem to build on Windows, so only use it
on Unix systems. It does seem to build on macOS, so leave it as a
dependency there. A good solution for icon bundling on macOS/Windows will
need to be figured out at some point.
This commit is contained in:
Ian Douglas Scott 2023-04-24 18:15:35 -07:00 • committed by Jeremy Soller
parent 93ec06a34d
commit c878e24465
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Cargo.toml
View file

@ -18,8 +18,8 @@ winit = ["iced/winit", "iced_winit"]
applet = ["cosmic-panel-config", "sctk", "wayland"] applet = ["cosmic-panel-config", "sctk", "wayland"]
winit_softbuffer = ["winit", "softbuffer"] winit_softbuffer = ["winit", "softbuffer"]
winit_wgpu = ["winit", "wgpu"] winit_wgpu = ["winit", "wgpu"]
[dependencies] [dependencies]
freedesktop-icons = "0.2.2"
apply = "0.3.0" apply = "0.3.0"
derive_setters = "0.1.5" derive_setters = "0.1.5"
lazy_static = "1.4.0" lazy_static = "1.4.0"
@ -30,6 +30,9 @@ sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/c
slotmap = "1.0.6" slotmap = "1.0.6"
fraction = "0.13.0" fraction = "0.13.0"
[target.'cfg(unix)'.dependencies]
freedesktop-icons = "0.2.2"
[dependencies.cosmic-theme] [dependencies.cosmic-theme]
git = "https://github.com/pop-os/cosmic-theme.git" git = "https://github.com/pop-os/cosmic-theme.git"

4
src/widget/icon.rs
View file

@ -35,6 +35,7 @@ impl<'a> IconSource<'a> {
let icon: Option<&Path> = match self { let icon: Option<&Path> = match self {
IconSource::Handle(handle) => return handle.clone(), IconSource::Handle(handle) => return handle.clone(),
IconSource::Path(ref path) => Some(path), IconSource::Path(ref path) => Some(path),
#[cfg(unix)]
IconSource::Name(ref name) => { IconSource::Name(ref name) => {
let icon = crate::settings::DEFAULT_ICON_THEME.with(|default_theme| { let icon = crate::settings::DEFAULT_ICON_THEME.with(|default_theme| {
let default_theme: &str = &default_theme.borrow(); let default_theme: &str = &default_theme.borrow();
@ -56,6 +57,9 @@ impl<'a> IconSource<'a> {
name_path_buffer.as_deref() name_path_buffer.as_deref()
} }
// TODO: Icon loading mechanism for non-Unix systems
#[cfg(not(unix))]
IconSource::Name(_) => None,
}; };
let is_svg = svg let is_svg = svg