Imported Upstream version 5.20.0.244

Former-commit-id: 072cb2ad8e168458108970d47c6dafefb04475eb
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-03-08 08:37:50 +00:00
parent 4b878ebc4f
commit f4a99b8ed9
56 changed files with 90 additions and 58 deletions

View File

@ -207,9 +207,12 @@
/* Define to 1 if you have the <android/versioning.h> header file. */ /* Define to 1 if you have the <android/versioning.h> header file. */
#undef HAVE_ANDROID_VERSIONING_H #undef HAVE_ANDROID_VERSIONING_H
/* arc4random */ /* Define to 1 if you have the `arc4random' function. */
#undef HAVE_ARC4RANDOM #undef HAVE_ARC4RANDOM
/* arc4random_buf */
#undef HAVE_ARC4RANDOM_BUF
/* ARM v5 */ /* ARM v5 */
#undef HAVE_ARMV5 #undef HAVE_ARMV5
@ -416,7 +419,7 @@
/* Have getaddrinfo */ /* Have getaddrinfo */
#undef HAVE_GETADDRINFO #undef HAVE_GETADDRINFO
/* getdomainname */ /* Define to 1 if you have the `getdomainname' function. */
#undef HAVE_GETDOMAINNAME #undef HAVE_GETDOMAINNAME
/* getdomainname with size_t namelen */ /* getdomainname with size_t namelen */
@ -662,7 +665,7 @@
/* Define to 1 if you have the `mkstemp' function. */ /* Define to 1 if you have the `mkstemp' function. */
#undef HAVE_MKSTEMP #undef HAVE_MKSTEMP
/* mkstemps */ /* Define to 1 if you have the `mkstemps' function. */
#undef HAVE_MKSTEMPS #undef HAVE_MKSTEMPS
/* Define to 1 if you have the `mlock' function. */ /* Define to 1 if you have the `mlock' function. */
@ -1197,6 +1200,9 @@
/* TCPSTATE enum in netinet/tcp.h */ /* TCPSTATE enum in netinet/tcp.h */
#undef HAVE_TCP_H_TCPSTATE_ENUM #undef HAVE_TCP_H_TCPSTATE_ENUM
/* TCP_KEEPALIVE */
#undef HAVE_TCP_H_TCP_KEEPALIVE
/* tcp/var.h */ /* tcp/var.h */
#undef HAVE_TCP_VAR_H #undef HAVE_TCP_VAR_H

View File

@ -1 +1 @@
5228a1da8efc7aaed09a4a3036471e7c69fffa5f 3ab6439bcdaeabde82376b5cde817edd21cbc682

View File

@ -1 +1 @@
d2ad58b28924b4dc876e8f97809bacb33f4dfaa6 8f404430210b8b2f99418e9c032f20ebe855acbd

View File

@ -218,7 +218,8 @@ class GtkPackage (GitHubPackage):
# https://devdiv.visualstudio.com/DevDiv/_workitems/edit/737323 # https://devdiv.visualstudio.com/DevDiv/_workitems/edit/737323
'patches/gtk/gtk-nsview-subview-focus-fixes.patch', 'patches/gtk/gtk-nsview-subview-focus-fixes.patch',
'patches/gtk/gtk-nsview-focus-tabbing.patch', 'patches/gtk/gtk-nsview-focus-tabbing.patch',
'patches/gtk/popup-combo-box-with-arrows.patch' 'patches/gtk/popup-combo-box-with-arrows.patch',
'patches/gtk/0001-prevent-gdk-quartz-window-delegate-replacement.patch'
]) ])
def prep(self): def prep(self):

View File

@ -0,0 +1,21 @@
diff --git a/gdk/quartz/GdkQuartzWindow.c b/gdk/quartz/GdkQuartzWindow.c
index e8e0de5c7..435c856be 100644
--- a/gdk/quartz/GdkQuartzWindow.c
+++ b/gdk/quartz/GdkQuartzWindow.c
@@ -259,6 +259,16 @@
return [super makeFirstResponder:responder];
}
+-(void)setDelegate:(id<NSWindowDelegate>)delegate
+{
+ if ([super delegate] == nil) {
+ [super setDelegate:delegate];
+ } else {
+ // If we allow the window delegate to be replaced, everything breaks.
+ g_critical ("Setting a delegate on GdkQuartzWindow is forbidden, because everything will break.");
+ }
+}
+
-(id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask backing:(NSBackingStoreType)backingType defer:(BOOL)flag screen:(NSScreen *)screen
{
self = [super initWithContentRect:contentRect

View File

@ -1 +1 @@
6ec2f0592c236ff76bf4b842d2e474d66d404185 dcae524a90cf5d8c112d239b29cb5e51600b4c91

View File

@ -1 +1 @@
2d7cda29ae1cba433df347e812db76054aa0b76e 7b831d87e9e45be50033bde243dafbbcc0a4cccc

View File

@ -1 +1 @@
ddf36cd167aad0806d6ae8067fceacabb72e0bed fa75cdec1fec7dc7716f29edf7a8c0fb9cf10465

View File

@ -1 +1 @@
9ec1a21c14ca0c4070eff4c8360a0238991809d0 3db7fa5f078177f417ec7f6e1413fdd6d9303409

View File

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

View File

@ -177,12 +177,17 @@ namespace MonoTests.System.Threading
[Test] [Test]
public void GetAvailableThreads () public void GetAvailableThreads ()
{ {
int cpuCount = Environment.ProcessorCount;
if (cpuCount > 16)
Assert.Inconclusive ("This test doesn't work well with a high number of processor cores.");
ManualResetEvent mre = new ManualResetEvent (false); ManualResetEvent mre = new ManualResetEvent (false);
var sw = Stopwatch.StartNew (); var sw = Stopwatch.StartNew ();
int i, workerThreads, completionPortThreads; int i, workerThreads, completionPortThreads;
try { try {
Assert.IsTrue (ThreadPool.SetMaxThreads (Environment.ProcessorCount, Environment.ProcessorCount)); Assert.IsTrue (ThreadPool.SetMaxThreads (cpuCount, cpuCount));
while (true) { while (true) {
ThreadPool.GetAvailableThreads (out workerThreads, out completionPortThreads); ThreadPool.GetAvailableThreads (out workerThreads, out completionPortThreads);

View File

@ -1 +1 @@
73949fb6408ba10f6a062dc356186fdefdd161d6 8f9dc17751a7c9a0dd47f7fdd9ab31ed6f4e38ca

View File

@ -1 +1 @@
fe29d992cf41104328b74fbf8e73c87b4b3b83af a82cedb70b75a761439c891e0e6bad183298d08f

View File

@ -1 +1 @@
293242222f0e48a0c0ab519e6d67f5fe9dcc1c42 6d90d159ed9b630181811a347779b64f218ead32

View File

@ -1 +1 @@
dffdf72f972fa58a13c7358f2e264e9ca7eac517 cbfeefb8ddd2bf45f2ac594aa333b5cabd94b62d

View File

@ -1 +1 @@
54bd86729415191b5aebb9366b0643ff156ded7d e6c3414dce4054d5c82102d1b5eca7db6470c3ee

View File

@ -1 +1 @@
df342b8d72746493f49cd3d6480c64314b459394 aef79ed1d016f6e3edcc5f6516ddf924043ecf71

View File

@ -1 +1 @@
73bccf40a2839e368acecb0ba3fdc4d8293f1494 f1dab501ed7c5cd937732c0a853d8a562751124d

View File

@ -1 +1 @@
73949fb6408ba10f6a062dc356186fdefdd161d6 8f9dc17751a7c9a0dd47f7fdd9ab31ed6f4e38ca

View File

@ -1 +1 @@
fe29d992cf41104328b74fbf8e73c87b4b3b83af a82cedb70b75a761439c891e0e6bad183298d08f

View File

@ -1 +1 @@
293242222f0e48a0c0ab519e6d67f5fe9dcc1c42 6d90d159ed9b630181811a347779b64f218ead32

View File

@ -1 +1 @@
dffdf72f972fa58a13c7358f2e264e9ca7eac517 cbfeefb8ddd2bf45f2ac594aa333b5cabd94b62d

View File

@ -1 +1 @@
54bd86729415191b5aebb9366b0643ff156ded7d e6c3414dce4054d5c82102d1b5eca7db6470c3ee

View File

@ -1 +1 @@
df342b8d72746493f49cd3d6480c64314b459394 aef79ed1d016f6e3edcc5f6516ddf924043ecf71

View File

@ -1 +1 @@
73bccf40a2839e368acecb0ba3fdc4d8293f1494 f1dab501ed7c5cd937732c0a853d8a562751124d

View File

@ -1 +1 @@
73949fb6408ba10f6a062dc356186fdefdd161d6 8f9dc17751a7c9a0dd47f7fdd9ab31ed6f4e38ca

View File

@ -1 +1 @@
fe29d992cf41104328b74fbf8e73c87b4b3b83af a82cedb70b75a761439c891e0e6bad183298d08f

View File

@ -1 +1 @@
293242222f0e48a0c0ab519e6d67f5fe9dcc1c42 6d90d159ed9b630181811a347779b64f218ead32

View File

@ -1 +1 @@
dffdf72f972fa58a13c7358f2e264e9ca7eac517 cbfeefb8ddd2bf45f2ac594aa333b5cabd94b62d

View File

@ -1 +1 @@
54bd86729415191b5aebb9366b0643ff156ded7d e6c3414dce4054d5c82102d1b5eca7db6470c3ee

View File

@ -1 +1 @@
df342b8d72746493f49cd3d6480c64314b459394 aef79ed1d016f6e3edcc5f6516ddf924043ecf71

View File

@ -1 +1 @@
73bccf40a2839e368acecb0ba3fdc4d8293f1494 f1dab501ed7c5cd937732c0a853d8a562751124d

View File

@ -1 +1 @@
73949fb6408ba10f6a062dc356186fdefdd161d6 8f9dc17751a7c9a0dd47f7fdd9ab31ed6f4e38ca

View File

@ -1 +1 @@
fe29d992cf41104328b74fbf8e73c87b4b3b83af a82cedb70b75a761439c891e0e6bad183298d08f

View File

@ -1 +1 @@
293242222f0e48a0c0ab519e6d67f5fe9dcc1c42 6d90d159ed9b630181811a347779b64f218ead32

View File

@ -1 +1 @@
dffdf72f972fa58a13c7358f2e264e9ca7eac517 cbfeefb8ddd2bf45f2ac594aa333b5cabd94b62d

View File

@ -1 +1 @@
54bd86729415191b5aebb9366b0643ff156ded7d e6c3414dce4054d5c82102d1b5eca7db6470c3ee

View File

@ -1 +1 @@
df342b8d72746493f49cd3d6480c64314b459394 aef79ed1d016f6e3edcc5f6516ddf924043ecf71

View File

@ -1 +1 @@
73bccf40a2839e368acecb0ba3fdc4d8293f1494 f1dab501ed7c5cd937732c0a853d8a562751124d

View File

@ -1 +1 @@
e3a110d89210ded88847f16c8aabfa0ba821eb0a 85a2be3dec199a40b0abc69c713ecc464f9cb5c3

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/a76ca3c" #define FULL_VERSION "explicit/204d95c"

View File

@ -6,10 +6,3 @@
#undef HAVE_CLOCK_MONOTONIC #undef HAVE_CLOCK_MONOTONIC
#undef HAVE_CLOCK_MONOTONIC_COARSE #undef HAVE_CLOCK_MONOTONIC_COARSE
#endif #endif
#ifdef TARGET_ANDROID
/* arc4random_buf() is not available even when configure seems to find it */
#undef HAVE_ARC4RANDOM_BUF
/* sendfile() is not available for what seems like x86+older API levels */
#undef HAVE_SENDFILE_4
#endif

Binary file not shown.

View File

@ -1 +1 @@
a500c9ba74b03cd688149996069eb3fe3fe7a6b8 25c651bd1ec3fe3eafeb2fd47aeff0734d5cc89b

Binary file not shown.

View File

@ -1 +1 @@
6f30a22a871f073e7056ec52ddf425ff8bd429b5 e707a18aaf9eafa8065bf0c3eed731f32b42af68

Binary file not shown.

View File

@ -1 +1 @@
ac2dfcdaf0bd1cb04526e95c8f24c8d1390123c7 c88c9efe5a065e2a16accbc9c3a2c4f59303c9ec

View File

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

Binary file not shown.

View File

@ -1 +1 @@
05840c7b989008673515a0abde8d9bd90bca7d86 525b6f1c8d0e139dc5ace39fe016583e15e5ea14

View File

@ -180,7 +180,9 @@ is_always_match (int type)
#include <mono/sgen/sgen-protocol-def.h> #include <mono/sgen/sgen-protocol-def.h>
default: assert (0); default:
assert (0);
return FALSE;
} }
} }
@ -502,7 +504,9 @@ match_index (mword ptr, int type, void *data)
#include <mono/sgen/sgen-protocol-def.h> #include <mono/sgen/sgen-protocol-def.h>
default: assert (0); default:
assert (0);
return 0;
} }
} }
@ -565,7 +569,9 @@ is_vtable_match (mword ptr, int type, void *data)
#include <mono/sgen/sgen-protocol-def.h> #include <mono/sgen/sgen-protocol-def.h>
default: assert (0); default:
assert (0);
return FALSE;
} }
} }