Skip to content

chore(deps): update fontconfig to 0.11 (incompatible) #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robertwidfen merged 1 commit into from
Jul 31, 2026
Merged

chore(deps): update fontconfig to 0.11 (incompatible) #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ libloading = "0.9"
epoxy = "0.1.0"
glow = "0.17.0"
resource = "0.6.1" # font emedding
fontconfig = "0.10.2" # font loading
fontconfig = "0.11.0" # font loading
keycode = "1.0.0"

[dependencies.relm4-icons]
Expand Down
9 changes: 6 additions & 3 deletions src/femtovg_area/imp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,13 @@ impl FemtoVGArea {
let fontconfig = Fontconfig::new();

let mut load_font = |family: &str, style: Option<&str>| -> Result<FontId> {
let font = fontconfig
let fc = fontconfig
.as_ref()
.and_then(|fc| fc.find(family, style))
.ok_or_else(|| anyhow::anyhow!("Font family '{}' not found", family))?;
.ok_or(anyhow::anyhow!("Could not initialize Fontconfig"))?;

let font = fc
.find(family, style)
.map_err(|e| anyhow::anyhow!("Font family '{}' not found: {}", family, e))?;

let face_index = font.index.unwrap_or(0).max(0) as u32;

Expand Down
Loading