Imported Upstream version 6.4.0.186

Former-commit-id: 710edcfe8c8328382163d2ff94143b3f789a6309
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-08-30 08:39:49 +00:00
parent d213358eb3
commit 4730215017
59 changed files with 176 additions and 175 deletions

View File

@ -1 +1 @@
d6866b4fe80b76dd0fa8631abac09a4f0549ee02
91ebc48069c47a6e5fbee11f910ee6ce6bedf4fe

View File

@ -1 +1 @@
50d0ad797b45a24feb0dd058be601add40f35588
f6cc60f550b124af1f6e690d99260b1b0610771c

View File

@ -44,10 +44,11 @@ class Package:
# fat binary parameters. On a 64-bit Darwin profile (m64 = True)
# each package must decide if it will a) perform a multi-arch (64/32) build
# b) request two builds that are lipoed at the end or c) request a 32-bit
# build only.
# build only or d) request a 64-bit build only.
self.needs_lipo = False
self.m32_only = False
self.m64_only = False
self.build_dependency = False
self.dont_clean = False
self.needs_build = None
@ -514,6 +515,8 @@ class Package:
stagedir_x32, package_stage, 'bin', '32', '64')
elif arch == 'toolchain':
package_stage = self.do_build('darwin-64')
elif self.m64_only:
package_stage = self.do_build('darwin-64')
elif self.m32_only:
package_stage = self.do_build('darwin-32')
else:

View File

@ -1,13 +0,0 @@
class GtkQuartzEnginePackage (Package):
def __init__(self):
Package.__init__(self, 'gtk-quartz-engine',
sources=[
'git://github.com/mono/gtk-quartz-engine.git'],
override_properties={
'configure': './autogen.sh --prefix=%{package_prefix}',
'needs_lipo': True
},
revision='9555a08f0c9c98d02153c9d77b54a2dd83ce5d6f')
GtkQuartzEnginePackage()

View File

@ -7,7 +7,18 @@ class LibTiffPackage (Package):
sources=[
'http://download.osgeo.org/libtiff/tiff-%{version}.tar.gz',
])
self.sources.extend([
'patches/tiff/patch-tiffconf.diff',
'patches/tiff/patch-tif_config.diff'
])
self.needs_lipo = True
def build(self):
if Package.profile.name == 'darwin':
Package.configure(self)
for p in range(1, len(self.local_sources)):
self.sh('patch -p0 < "%{local_sources[' + str(p) + ']}"')
Package.make(self)
else:
Package.build(self)
LibTiffPackage()

View File

@ -0,0 +1,81 @@
--- libtiff/tif_config.h.orig 2019-08-29 15:36:35.000000000 +0200
+++ libtiff/tif_config.h 2019-08-29 15:08:43.000000000 +0200
@@ -255,7 +255,11 @@
#define SIZEOF_SIGNED_INT 4
/* The size of `signed long', as computed by sizeof. */
+#ifdef __LP64__
#define SIZEOF_SIGNED_LONG 8
+#else
+#define SIZEOF_SIGNED_LONG 4
+#endif
/* The size of `signed long long', as computed by sizeof. */
#define SIZEOF_SIGNED_LONG_LONG 8
@@ -264,16 +268,28 @@
#define SIZEOF_SIGNED_SHORT 2
/* The size of `size_t', as computed by sizeof. */
+#ifdef __LP64__
#define SIZEOF_SIZE_T 8
+#else
+#define SIZEOF_SIZE_T 4
+#endif
/* The size of `unsigned char *', as computed by sizeof. */
+#ifdef __LP64__
#define SIZEOF_UNSIGNED_CHAR_P 8
+#else
+#define SIZEOF_UNSIGNED_CHAR_P 4
+#endif
/* The size of `unsigned int', as computed by sizeof. */
#define SIZEOF_UNSIGNED_INT 4
/* The size of `unsigned long', as computed by sizeof. */
+#ifdef __LP64__
#define SIZEOF_UNSIGNED_LONG 8
+#else
+#define SIZEOF_UNSIGNED_LONG 4
+#endif
/* The size of `unsigned long long', as computed by sizeof. */
#define SIZEOF_UNSIGNED_LONG_LONG 8
@@ -307,10 +323,18 @@
#define TIFF_INT32_T signed int
/* Signed 64-bit type formatter */
+#ifdef __LP64__
#define TIFF_INT64_FORMAT "%ld"
+#else
+#define TIFF_INT64_FORMAT "%lld"
+#endif
/* Signed 64-bit type */
+#ifdef __LP64__
#define TIFF_INT64_T signed long
+#else
+#define TIFF_INT64_T signed long long
+#endif
/* Signed 8-bit type */
#define TIFF_INT8_T signed char
@@ -343,10 +367,18 @@
#define TIFF_UINT32_T unsigned int
/* Unsigned 64-bit type formatter */
+#ifdef __LP64__
#define TIFF_UINT64_FORMAT "%lu"
+#else
+#define TIFF_UINT64_FORMAT "%llu"
+#endif
/* Unsigned 64-bit type */
+#ifdef __LP64__
#define TIFF_UINT64_T unsigned long
+#else
+#define TIFF_UINT64_T unsigned long long
+#endif
/* Unsigned 8-bit type */
#define TIFF_UINT8_T unsigned char

View File

@ -0,0 +1,26 @@
--- libtiff/tiffconf.h.orig 2019-08-29 15:37:19.000000000 +0200
+++ libtiff/tiffconf.h 2019-08-29 15:38:25.000000000 +0200
@@ -15,7 +15,11 @@
#define TIFF_INT32_T signed int
/* Signed 64-bit type */
+#ifdef __LP64__
#define TIFF_INT64_T signed long
+#else
+#define TIFF_INT64_T signed long long
+#endif
/* Signed 8-bit type */
#define TIFF_INT8_T signed char
@@ -27,7 +31,11 @@
#define TIFF_UINT32_T unsigned int
/* Unsigned 64-bit type */
+#ifdef __LP64__
#define TIFF_UINT64_T unsigned long
+#else
+#define TIFF_UINT64_T unsigned long long
+#endif
/* Unsigned 8-bit type */
#define TIFF_UINT8_T unsigned char

View File

@ -1,4 +1,5 @@
package = FreeDesktopPackage('%{name}', 'pkg-config', '0.27',
configure_flags=["--with-internal-glib"])
package.needs_lipo = True
if package.profile.name == 'darwin':
package.m64_only = True

View File

@ -41,7 +41,7 @@ static partial class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "6.4.0.183";
public const string MonoVersion = "6.4.0.186";
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

@ -140,7 +140,7 @@ namespace System.IO.Compression
internal ValueTask<int> ReadAsyncMemory (Memory<byte> destination, CancellationToken cancellationToken)
{
throw new NotImplementedException ();
return base.ReadAsync(destination, cancellationToken);
}
internal int ReadCore (Span<byte> destination)
@ -180,7 +180,7 @@ namespace System.IO.Compression
internal ValueTask WriteAsyncMemory (ReadOnlyMemory<byte> source, CancellationToken cancellationToken)
{
throw new NotImplementedException ();
return base.WriteAsync(source, cancellationToken);
}
internal void WriteCore (ReadOnlySpan<byte> source)

View File

@ -1,75 +0,0 @@
//
// System.IO.FileSystemEventArgs.cs
//
// Author:
// Tim Coleman (tim@timcoleman.com)
//
// Copyright (C) Tim Coleman, 2002
//
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
namespace System.IO {
public class FileSystemEventArgs : EventArgs {
#region Fields
WatcherChangeTypes changeType;
string directory;
string name;
#endregion // Fields
#region Constructors
public FileSystemEventArgs (WatcherChangeTypes changeType, string directory, string name)
{
this.changeType = changeType;
this.directory = directory;
this.name = name;
}
internal void SetName (string name)
{
this.name = name;
}
#endregion // Constructors
#region Properties
public WatcherChangeTypes ChangeType {
get { return changeType; }
}
public string FullPath {
get { return Path.Combine (directory, name); }
}
public string Name {
get { return name; }
}
#endregion // Properties
}
}

View File

@ -1,33 +0,0 @@
//
// System.IO.FileSystemEventHandler.cs
//
// Author:
// Tim Coleman (tim@timcoleman.com)
//
// Copyright (C) Tim Coleman, 2002
// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
namespace System.IO {
public delegate void FileSystemEventHandler (object sender, FileSystemEventArgs e);
}

View File

@ -29,8 +29,6 @@ System.IO.Compression/DeflateStream.cs
System.IO/ErrorEventArgs.cs
System.IO/ErrorEventHandler.cs
System.IO/FileSystemEventArgs.cs
System.IO/FileSystemEventHandler.cs
System.IO/InternalBufferOverflowException.cs
System.IO/InvalidDataException.cs
System.IO/IODescriptionAttribute.cs
@ -873,13 +871,15 @@ ReferenceSources/Win32Exception.cs
../../../external/corefx/src/System.Private.Uri/src/System/UriBuilder.cs
../../../external/corefx/src/System.Runtime.Extensions/src/System/CodeDom/Compiler/IndentedTextWriter.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemEventArgs.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemEventHandler.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/WaitForChangedResult.cs
../../../external/corefx/src/System.Runtime.InteropServices/src/System/Security/SecureStringMarshal.cs
../../../external/corefx/src/System.Runtime.Extensions/src/System/StringNormalizationExtensions.cs
../../../external/corefx/src/System.Diagnostics.StackTrace/src/System/Diagnostics/StackFrameExtensions.cs
../../../external/corefx/src/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.cs
# Everything except compiled
../../../external/corefx/src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Capture.cs

View File

@ -1 +1 @@
84b8b0e1bb44b14cbd30e6ac7b01d378ed4cf0cb
2a0838370259ebf96142331b10ac563b1103adc2

View File

@ -1 +1 @@
af8c7fac9d6aa5eb7b51ce98009453d3ab969d10
1f4cc2768f13d9875b13350c001dcbee20740ddc

View File

@ -1 +1 @@
43d9590e4365814ccc62474eee87bc3c1878bb93
9f0fc2a560ae0b2ef6c2614982dde04e85c01a4a

View File

@ -1 +1 @@
402b55a12e64b2ce4670d243f09114f9c52ef06c
587bd1f18657bd271b42e055e7ff0018a45c4274

View File

@ -1 +1 @@
dc9e0b9629e134ea423a418933f6c18238a213a7
d011a963a7c2363851175bdd399a1c1bc970b982

View File

@ -1 +1 @@
57293eefbd5a400e20b81deae90100ea5244c985
d53b8d57ef7eb035aa068ffa64d681042acd284a

View File

@ -1 +1 @@
385139326ccb9f0dd46448e0d1f3b71c5bdd0e4f
63f3ec809c3e4f793839933dbf4615982466e0a4

View File

@ -1 +1 @@
0746ab14270c79f16e1394e71ab25048001370be
efd82eaedda668b7dad0c82fd6097d695a7349bd

View File

@ -1 +1 @@
84b8b0e1bb44b14cbd30e6ac7b01d378ed4cf0cb
2a0838370259ebf96142331b10ac563b1103adc2

View File

@ -1 +1 @@
af8c7fac9d6aa5eb7b51ce98009453d3ab969d10
1f4cc2768f13d9875b13350c001dcbee20740ddc

View File

@ -1 +1 @@
43d9590e4365814ccc62474eee87bc3c1878bb93
9f0fc2a560ae0b2ef6c2614982dde04e85c01a4a

View File

@ -1 +1 @@
402b55a12e64b2ce4670d243f09114f9c52ef06c
587bd1f18657bd271b42e055e7ff0018a45c4274

View File

@ -1 +1 @@
dc9e0b9629e134ea423a418933f6c18238a213a7
d011a963a7c2363851175bdd399a1c1bc970b982

View File

@ -1 +1 @@
57293eefbd5a400e20b81deae90100ea5244c985
d53b8d57ef7eb035aa068ffa64d681042acd284a

View File

@ -1 +1 @@
385139326ccb9f0dd46448e0d1f3b71c5bdd0e4f
63f3ec809c3e4f793839933dbf4615982466e0a4

View File

@ -1 +1 @@
7da81eeed2ece50e3fd34954f3fb044896f74fa8
9fb87367c7c8e951f6ad881ec516ad4b49564834

View File

@ -1 +1 @@
0746ab14270c79f16e1394e71ab25048001370be
efd82eaedda668b7dad0c82fd6097d695a7349bd

View File

@ -1 +1 @@
84b8b0e1bb44b14cbd30e6ac7b01d378ed4cf0cb
2a0838370259ebf96142331b10ac563b1103adc2

View File

@ -1 +1 @@
af8c7fac9d6aa5eb7b51ce98009453d3ab969d10
1f4cc2768f13d9875b13350c001dcbee20740ddc

View File

@ -1 +1 @@
43d9590e4365814ccc62474eee87bc3c1878bb93
9f0fc2a560ae0b2ef6c2614982dde04e85c01a4a

View File

@ -1 +1 @@
402b55a12e64b2ce4670d243f09114f9c52ef06c
587bd1f18657bd271b42e055e7ff0018a45c4274

View File

@ -1 +1 @@
dc9e0b9629e134ea423a418933f6c18238a213a7
d011a963a7c2363851175bdd399a1c1bc970b982

View File

@ -1 +1 @@
57293eefbd5a400e20b81deae90100ea5244c985
d53b8d57ef7eb035aa068ffa64d681042acd284a

View File

@ -1 +1 @@
385139326ccb9f0dd46448e0d1f3b71c5bdd0e4f
63f3ec809c3e4f793839933dbf4615982466e0a4

View File

@ -1 +1 @@
7da81eeed2ece50e3fd34954f3fb044896f74fa8
9fb87367c7c8e951f6ad881ec516ad4b49564834

View File

@ -1 +1 @@
0746ab14270c79f16e1394e71ab25048001370be
efd82eaedda668b7dad0c82fd6097d695a7349bd

View File

@ -1 +1 @@
84b8b0e1bb44b14cbd30e6ac7b01d378ed4cf0cb
2a0838370259ebf96142331b10ac563b1103adc2

View File

@ -1 +1 @@
af8c7fac9d6aa5eb7b51ce98009453d3ab969d10
1f4cc2768f13d9875b13350c001dcbee20740ddc

View File

@ -1 +1 @@
aa4c2c8265d8d01011f0558dd14cb16a21777386
ae618deceecb9ed6e2d386e8837bc70c13afe28c

View File

@ -1 +1 @@
402b55a12e64b2ce4670d243f09114f9c52ef06c
587bd1f18657bd271b42e055e7ff0018a45c4274

View File

@ -1 +1 @@
dc9e0b9629e134ea423a418933f6c18238a213a7
d011a963a7c2363851175bdd399a1c1bc970b982

View File

@ -1 +1 @@
57293eefbd5a400e20b81deae90100ea5244c985
d53b8d57ef7eb035aa068ffa64d681042acd284a

View File

@ -1 +1 @@
385139326ccb9f0dd46448e0d1f3b71c5bdd0e4f
63f3ec809c3e4f793839933dbf4615982466e0a4

View File

@ -1 +1 @@
7da81eeed2ece50e3fd34954f3fb044896f74fa8
9fb87367c7c8e951f6ad881ec516ad4b49564834

View File

@ -1 +1 @@
2c761638c86c118e9ccd78929305b445efad5c44
d5d6c792c0807c09182e600b7def5369e6df846a

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/99c1602"
#define FULL_VERSION "explicit/7ef99c0"

View File

@ -520,8 +520,8 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
@ENABLE_MSVC_FALSE@install-exec-local:
@ENABLE_MSVC_FALSE@clean-local:
@ENABLE_MSVC_FALSE@install-exec-local:
clean: clean-am
clean-am: clean-generic clean-libtool clean-local mostlyclean-am

Binary file not shown.

View File

@ -1 +1 @@
be6bcadeef714883f6a68fa5366f7f7d0086366a
bf8b08a3b660338eeb69091d4ebda95a72b55fe1

Binary file not shown.

View File

@ -1 +1 @@
05c1c4419fa47d42db19fd0a25825d22816e6e76
8131f9b1508b4cb4d71c4c3d2420cee3b03a9f23

Binary file not shown.

View File

@ -1 +1 @@
43f766c6317bc4f30549c711e913abac7faf18ce
9a71555571ad7964c6a0547935ac552f9b55a9f9

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 6.4.0.183\n"
"Project-Id-Version: mono 6.4.0.186\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-08-28 08:09+0000\n"
"POT-Creation-Date: 2019-08-30 08:07+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 @@
487dc22721460a1be3b65fee9b880f2797a4febf
5de2d18bf9edad21019faee5dcd5aec84b4a0219