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

@ -1 +1 @@
140ec3920dca207f77ab9142ac89bc455003ef76
9651e72614847fae454c51d34b2ddc5272121cd4

View File

@ -1 +1 @@
003a94bb3fbe2c4593a6c218379c80858e571b8f
73c9caf1d32f275732fb0af91e0c45664cae4093

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

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.14.0.84";
public const string MonoVersion = "5.14.0.87";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -14,8 +14,9 @@ namespace MonoTests.System.Threading.Tasks
[Test]
public void PrincipalFlowsToAsyncTask ()
{
var t = _PrincipalFlowsToAsyncTask();
t.GetAwaiter().GetResult();
/* run in different thread to work around problems on platforms
* where SynchronizationContext is set (e.g. Xamarin.iOS) */
Assert.IsTrue (Task.Run (async () => await _PrincipalFlowsToAsyncTask ()).Wait (5000));
}
public async Task _PrincipalFlowsToAsyncTask ()

View File

@ -1 +1 @@
839f103c74c88a2801043484a09e75202ae8a629
3853b623d686bab166a238cad03215c3d771883f

View File

@ -1 +1 @@
8739aeb1983d811097942dd8fb6f8a674a22aac2
0c36226976d1a6da72bb558563c29596dea8391b

View File

@ -1 +1 @@
6ecc97919483a7056c7d9a1ab1cf8e1b93cf3a74
f43addc57be73e4acbc9b556460ed07dc921fdab

View File

@ -1 +1 @@
7a661b2772a14658cc6e7d56c202f37cb6186b3c
429decf9c93800adf78af52c9a11ea1669f8ea61

View File

@ -1 +1 @@
da054b18cf6764ce57924ba093e1a85453cdcc22
98c003ba9b5b20ad62ef5146cfe25902900bd6ae

View File

@ -1 +1 @@
f129ce3303c180773a392cc1e2d50244de2d5119
9564f29a5c020b2804643f20c76df78d2b2790ef

View File

@ -1 +1 @@
6a9ab2371c41b004ae342b7145a67a2583c21672
8fffb09248c7a0c187464bfac6aad30fec5be792

View File

@ -1 +1 @@
839f103c74c88a2801043484a09e75202ae8a629
3853b623d686bab166a238cad03215c3d771883f

View File

@ -1 +1 @@
8739aeb1983d811097942dd8fb6f8a674a22aac2
0c36226976d1a6da72bb558563c29596dea8391b

View File

@ -1 +1 @@
6ecc97919483a7056c7d9a1ab1cf8e1b93cf3a74
f43addc57be73e4acbc9b556460ed07dc921fdab

View File

@ -1 +1 @@
7a661b2772a14658cc6e7d56c202f37cb6186b3c
429decf9c93800adf78af52c9a11ea1669f8ea61

View File

@ -1 +1 @@
da054b18cf6764ce57924ba093e1a85453cdcc22
98c003ba9b5b20ad62ef5146cfe25902900bd6ae

View File

@ -1 +1 @@
f129ce3303c180773a392cc1e2d50244de2d5119
9564f29a5c020b2804643f20c76df78d2b2790ef

View File

@ -1 +1 @@
6a9ab2371c41b004ae342b7145a67a2583c21672
8fffb09248c7a0c187464bfac6aad30fec5be792

View File

@ -1 +1 @@
839f103c74c88a2801043484a09e75202ae8a629
3853b623d686bab166a238cad03215c3d771883f

View File

@ -1 +1 @@
8739aeb1983d811097942dd8fb6f8a674a22aac2
0c36226976d1a6da72bb558563c29596dea8391b

View File

@ -1 +1 @@
6ecc97919483a7056c7d9a1ab1cf8e1b93cf3a74
f43addc57be73e4acbc9b556460ed07dc921fdab

View File

@ -1 +1 @@
7a661b2772a14658cc6e7d56c202f37cb6186b3c
429decf9c93800adf78af52c9a11ea1669f8ea61

View File

@ -1 +1 @@
da054b18cf6764ce57924ba093e1a85453cdcc22
98c003ba9b5b20ad62ef5146cfe25902900bd6ae

View File

@ -1 +1 @@
f129ce3303c180773a392cc1e2d50244de2d5119
9564f29a5c020b2804643f20c76df78d2b2790ef

View File

@ -1 +1 @@
6a9ab2371c41b004ae342b7145a67a2583c21672
8fffb09248c7a0c187464bfac6aad30fec5be792

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/ef73a49"
#define FULL_VERSION "explicit/32ae8ad"

Binary file not shown.

View File

@ -1 +1 @@
ef959d144578423707ca4759fd983126329c1825
4c9830bc6a74d7cd3ce4f46b992fc2cdd5c3f370

Binary file not shown.

View File

@ -1 +1 @@
cd29947cabf89d5fc078b042bd5aec5c03dbfe7d
dae1feabe6d3a40716cab41a1dfb5643c372bf83

Binary file not shown.

View File

@ -1 +1 @@
b6b7fff5dfaa2b225d6ad637b312d2dcabebb1a8
e76bd7bab711503558c5479ffcc5870147a893ff

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.14.0.84\n"
"Project-Id-Version: mono 5.14.0.87\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-05-16 08:17+0000\n"
"POT-Creation-Date: 2018-05-19 08:16+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

Binary file not shown.

View File

@ -1 +1 @@
716bc7bb4d29c455ce1af5b07a810f685cacf2da
21960890344582b02df817bc0ce9e2bce91f7d61