Imported Upstream version 6.10.0.65

Former-commit-id: e5cb7a4ca4dde494baae4251cd9d7d852457fec8
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2020-02-05 08:39:55 +00:00
parent 1263e4b035
commit e0a10bca36
59 changed files with 593 additions and 522 deletions

View File

@@ -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):

View File

@@ -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];