Imported Upstream version 6.10.0.86

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

View File

@ -1 +1 @@
d83f9ae1d02c0602d12d35055b10b3027ba87428
c8a658ab716e2d3f8998b6450a345e67433cc56b

View File

@ -1 +1 @@
84c3a1492fa44a1f0233a50b4d51f9d03f481b18
3a21209d1e6ddfb3b4642b4872dac79f384a9b3a

File diff suppressed because it is too large Load Diff

View File

@ -10,7 +10,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
## Platform. ##
## --------- ##
hostname = az-ubuntu-general152b10
hostname = az-ubuntu-general560182
uname -m = x86_64
uname -r = 4.15.0-1071-azure
uname -s = Linux
@ -747,7 +747,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_COMMANDS =
$ ./config.status
on az-ubuntu-general152b10
on az-ubuntu-general560182
config.status:1238: creating Makefile
config.status:1238: creating bdw-gc.pc

View File

@ -1 +1 @@
e43cd8316817a1246b004233e0c811fcc73c0343
4be24286c71f4691b288e74e32b824f217c3ba8c

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):

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;

View File

@ -1 +1 @@
f2d4647141329cba87e26329444bf2ed1db85fad
a4da12f0d78b70951fab17d5ed145ef516d15445

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="Microsoft.Managed.Core.targets"/>

View File

@ -1 +1 @@
511a896016a29cc5ca8770b8dbc3422cf76291dd
8c529444fa7fbc7c42a420e6a5f887c95879f2f1

View File

@ -1 +1 @@
e5f02c53ca9096a5af80d1e2e7c979b8072217d6
2e31979058ae59854688c093ce2d7d0adf4fdc9b

View File

@ -1 +1 @@
dc155c6d8a5713b1214b95417096d9c67413dfc5
bd4bcd445e661872165f2ce93d202fce9787a0a3

View File

@ -1 +1 @@
c044e10d5be29b7737771a911611ba7d2e4ebee5
78195f8d04d3152e4d915af9ddaa89308334a56c

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
Common targets for managed compilers.

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="Microsoft.Managed.Core.targets"/>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />

Some files were not shown because too many files have changed in this diff Show More