mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 6.10.0.86

Browse Source 
Former-commit-id: 7f613da744ececb8fe964df5dfb6cba7b3adba67
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2020-02-25 08:40:42 +00:00
parent 9e939f7465
commit 8ffa12b47d
92 changed files with 470 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
external/bockbuild/packages/pango.py vendored
View File

@@ -41,7 +41,10 @@ class PangoPackage (GnomeXzPackage):
# https://devdiv.visualstudio.com/DevDiv/_workitems/edit/573960
'patches/pango-get-shaper-for-ideographic-space.patch',
'patches/pango-familyName.patch'
'patches/pango-familyName.patch',
# https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1069059
'patches/pango-ctfaces-nil-check.patch'
])
def prep(self):

28
external/bockbuild/packages/patches/pango-ctfaces-nil-check.patch vendored Normal file
View File

@@ -0,0 +1,28 @@
diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c
old mode 100644
new mode 100755
index 27132c4..5de6209
--- a/pango/pangocoretext-fontmap.c
+++ b/pango/pangocoretext-fontmap.c
@@ -573,8 +573,8 @@ pango_core_text_family_list_faces (PangoFontFamily *family,
CFArrayRef ctfaces;
CFArrayRef font_descriptors;
CFDictionaryRef attributes;
- CFIndex i, count;
-
+ CFIndex i;
+ CFIndex count = 0;
CFTypeRef keys[] = {
(CFTypeRef) kCTFontFamilyNameAttribute
};
@@ -605,7 +605,9 @@ pango_core_text_family_list_faces (PangoFontFamily *family,
italic_faces = g_hash_table_new (g_direct_hash, g_direct_equal);
- count = CFArrayGetCount (ctfaces);
+ if (ctfaces)
+ count = CFArrayGetCount (ctfaces);
+
for (i = 0; i < count; i++)
{
PangoCoreTextFace *face;