Skip to content

Freecad: fix cursor.pcf font load crash #412903

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
Aleksanaa merged 1 commit into from
Jun 18, 2025
Merged

Freecad: fix cursor.pcf font load crash #412903

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
26 changes: 26 additions & 0 deletions pkgs/by-name/fr/freecad/0003-FreeCad-fix-font-load-crash.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff --git a/src/Gui/PreferencePages/DlgSettingsEditor.cpp b/src/Gui/PreferencePages/DlgSettingsEditor.cpp
index 0dda987..01568f1 100755
--- a/src/Gui/PreferencePages/DlgSettingsEditor.cpp
+++ b/src/Gui/PreferencePages/DlgSettingsEditor.cpp
@@ -288,7 +288,9 @@ void DlgSettingsEditor::loadSettings()
QStringList fixedFamilyNames;
for (const auto& name : familyNames) {
if (QFontDatabase().isFixedPitch(name)) {
- if (name.compare(QLatin1String("8514oem"), Qt::CaseInsensitive) != 0) {
+ if (name.compare(QLatin1String("8514oem"), Qt::CaseInsensitive) != 0
+ && name.compare(QLatin1String("cursor.pcf"), Qt::CaseInsensitive) != 0)
+ {
fixedFamilyNames.append(name);
}
}
@@ -298,7 +300,9 @@ void DlgSettingsEditor::loadSettings()
QStringList fixedFamilyNames;
for (const auto& name : familyNames) {
if (QFontDatabase::isFixedPitch(name)) {
- if (name.compare(QLatin1String("8514oem"), Qt::CaseInsensitive) != 0) {
+ if (name.compare(QLatin1String("8514oem"), Qt::CaseInsensitive) != 0
+ && name.compare(QLatin1String("cursor.pcf"), Qt::CaseInsensitive) != 0)
+ {
fixedFamilyNames.append(name);
}
}
3 changes: 3 additions & 0 deletions pkgs/by-name/fr/freecad/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@ freecad-utils.makeCustomizable (
patches = [
./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
./0002-FreeCad-OndselSolver-pkgconfig.patch

# https://github.com/FreeCAD/FreeCAD/pull/21710
./0003-FreeCad-fix-font-load-crash.patch
(fetchpatch {
url = "https://github.com/FreeCAD/FreeCAD/commit/8e04c0a3dd9435df0c2dec813b17d02f7b723b19.patch?full_index=1";
hash = "sha256-H6WbJFTY5/IqEdoi5N+7D4A6pVAmZR4D+SqDglwS18c=";
Expand Down