From af8b87d6760801546744289ffaaa9e182960ae48 Mon Sep 17 00:00:00 2001 From: julian1 Date: Sun, 1 Jun 2025 19:25:53 +1000 Subject: [PATCH] Freecad: fix cursor.pcf font load crash update update update (cherry picked from commit f1c4f54fb0b744bb53d2136c24b366aad8f5ee94) --- .../0003-FreeCad-fix-font-load-crash.patch | 26 +++++++++++++++++++ pkgs/by-name/fr/freecad/package.nix | 3 +++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/by-name/fr/freecad/0003-FreeCad-fix-font-load-crash.patch diff --git a/pkgs/by-name/fr/freecad/0003-FreeCad-fix-font-load-crash.patch b/pkgs/by-name/fr/freecad/0003-FreeCad-fix-font-load-crash.patch new file mode 100644 index 0000000000000..aedb74361fd4d --- /dev/null +++ b/pkgs/by-name/fr/freecad/0003-FreeCad-fix-font-load-crash.patch @@ -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); + } + } diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index 844285ba5bbc0..8320ef1bb8f85 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -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=";