diff options
| author | Cody Russell <cody@jhu.edu> | 2020-01-28 15:02:30 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2020-01-28 15:02:30 +0300 |
| commit | 5a05db67cb14844eaafe8070eb425685df6aa9e4 (patch) | |
| tree | 8ff866cdf82ff5d76d22ba35879f5230803e106f | |
| parent | 9153814c5ec5943c600755c3d238f2d24321bb26 (diff) | |
Fix system font loading in Pango (#140)
In VSMac we currently can't display San Francisco fonts. This patch fixes it.
This fixes bug #1048838
| -rw-r--r-- | packages/pango.py | 4 | ||||
| -rw-r--r-- | packages/patches/pango-familyName.patch | 20 |
2 files changed, 23 insertions, 1 deletions
diff --git a/packages/pango.py b/packages/pango.py index 28020a4..00ba8c2 100644 --- a/packages/pango.py +++ b/packages/pango.py @@ -39,7 +39,9 @@ class PangoPackage (GnomeXzPackage): 'patches/pango-system-font-check-version.patch', # https://devdiv.visualstudio.com/DevDiv/_workitems/edit/573960 - 'patches/pango-get-shaper-for-ideographic-space.patch' + 'patches/pango-get-shaper-for-ideographic-space.patch', + + 'patches/pango-familyName.patch' ]) def prep(self): diff --git a/packages/patches/pango-familyName.patch b/packages/patches/pango-familyName.patch new file mode 100644 index 0000000..7382c02 --- /dev/null +++ b/packages/patches/pango-familyName.patch @@ -0,0 +1,20 @@ +commit a8bd6caefcbe5462547a277a4fb864989626ef6f +Author: Cody Russell <cody@jhu.edu> +Date: Mon Jan 27 10:44:06 2020 -0600 + + Try to get the family name from sysfont + +diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c +index 30605fe..7124db4 100644 +--- a/pango/pangocoretext-fontmap.c ++++ b/pango/pangocoretext-fontmap.c +@@ -1437,7 +1437,8 @@ pango_core_text_font_map_init (PangoCoreTextFontMap *ctfontmap) + if (major == 10 && minor >= 11) + { + NSFont *sysfont = [NSFont systemFontOfSize: 0.0]; +- NSString *name = [[NSFont fontWithName: [[sysfont fontDescriptor] postscriptName] size: 0.0] familyName]; ++ //NSString *name = [[NSFont fontWithName: [[sysfont fontDescriptor] postscriptName] size: 0.0] familyName]; ++ NSString *name = [sysfont familyName]; + + NSArray *fontfaces = [[NSFontManager sharedFontManager] availableMembersOfFontFamily: name]; + int num_faces = [fontfaces count]; |