Imported Upstream version 6.10.0.86

Former-commit-id: 7f613da744ececb8fe964df5dfb6cba7b3adba67
2020-02-25 08:40:42 +00:00
parent 9e939f7465
commit 8ffa12b47d
92 changed files with 470 additions and 431 deletions
--- a/external/bockbuild/packages/patches/pango-ctfaces-nil-check.patch
+++ b/external/bockbuild/packages/patches/pango-ctfaces-nil-check.patch
@@ -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;