Imported Upstream version 5.14.0.87

Former-commit-id: c3343e9add11acc574a2fbf8a043908a2124b8f6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-05-19 08:39:49 +00:00
parent ee1763fb41
commit ac4ce81c31
37 changed files with 61 additions and 34 deletions

View File

@@ -36,7 +36,10 @@ class PangoPackage (GnomeXzPackage):
'patches/pango-coretext-fix-yosemite-crasher.patch',
'patches/pango-system-font-single.patch',
'patches/pango-system-font-check-version.patch'
'patches/pango-system-font-check-version.patch',
# https://devdiv.visualstudio.com/DevDiv/_workitems/edit/573960
'patches/pango-get-shaper-for-ideographic-space.patch'
])
def prep(self):

View File

@@ -0,0 +1,23 @@
diff --git a/pango/.libs/libpango-1.0.0.dylib b/pango/.libs/libpango-1.0.0.dylib
index 61cf31d..ac8ae15 100755
Binary files a/pango/.libs/libpango-1.0.0.dylib and b/pango/.libs/libpango-1.0.0.dylib differ
diff --git a/pango/.libs/pango-context.o b/pango/.libs/pango-context.o
index 0fa9fe2..039e046 100644
Binary files a/pango/.libs/pango-context.o and b/pango/.libs/pango-context.o differ
diff --git a/pango/pango-context.c b/pango/pango-context.c
index 8e96713..d66f8bd 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -1459,7 +1459,8 @@ itemize_state_process_run (ItemizeState *state)
*/
if (G_UNLIKELY (!g_unichar_isgraph (wc) &&
g_unichar_type (wc) != G_UNICODE_PRIVATE_USE &&
- g_unichar_type (wc) != G_UNICODE_UNASSIGNED))
+ g_unichar_type (wc) != G_UNICODE_UNASSIGNED) &&
+ wc != 0x3000)
{
shape_engine = NULL;
font = NULL;
diff --git a/tests/cxx-test b/tests/cxx-test
index 683868f..428d903 100755
Binary files a/tests/cxx-test and b/tests/cxx-test differ