Imported Upstream version 6.6.0.99

Former-commit-id: eb75b80fa303a4e4686cde0550bb1327e50c0770
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-09-26 09:00:42 +00:00
parent 15bdb7a527
commit b74751f3e5
48 changed files with 301 additions and 46 deletions

View File

@ -9,6 +9,5 @@ class GtkSharp212ReleasePackage (Package):
'configure': './bootstrap-2.12 --prefix=%{package_prefix}',
}
)
self.make = 'make CSC=mcs'
GtkSharp212ReleasePackage()

View File

@ -427,7 +427,7 @@ index bcbb173..4234bf1 100644
fontset = g_hash_table_lookup (ctfontmap->fontset_hash, &key);
if (G_LIKELY (fontset))
@@ -1450,6 +1430,53 @@ pango_core_text_font_map_init (PangoCoreTextFontMap *ctfontmap)
@@ -1450,6 +1430,52 @@ pango_core_text_font_map_init (PangoCoreTextFontMap *ctfontmap)
CFRelease (dict);
}
@ -438,7 +438,6 @@ index bcbb173..4234bf1 100644
+
+ NSArray *fontfaces = [[NSFontManager sharedFontManager] availableMembersOfFontFamily: name];
+ int num_faces = [fontfaces count];
+ CFRelease (name);
+
+ for (int faceindex = 0; faceindex < num_faces; faceindex++)
+ {