Imported Upstream version 5.20.0.244
Former-commit-id: 072cb2ad8e168458108970d47c6dafefb04475eb
This commit is contained in:
parent
4b878ebc4f
commit
f4a99b8ed9
12
config.h.in
12
config.h.in
@ -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
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
5228a1da8efc7aaed09a4a3036471e7c69fffa5f
|
3ab6439bcdaeabde82376b5cde817edd21cbc682
|
@ -1 +1 @@
|
|||||||
d2ad58b28924b4dc876e8f97809bacb33f4dfaa6
|
8f404430210b8b2f99418e9c032f20ebe855acbd
|
3
external/bockbuild/packages/gtk+.py
vendored
3
external/bockbuild/packages/gtk+.py
vendored
@ -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):
|
||||||
|
@ -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
|
@ -1 +1 @@
|
|||||||
6ec2f0592c236ff76bf4b842d2e474d66d404185
|
dcae524a90cf5d8c112d239b29cb5e51600b4c91
|
@ -1 +1 @@
|
|||||||
2d7cda29ae1cba433df347e812db76054aa0b76e
|
7b831d87e9e45be50033bde243dafbbcc0a4cccc
|
@ -1 +1 @@
|
|||||||
ddf36cd167aad0806d6ae8067fceacabb72e0bed
|
fa75cdec1fec7dc7716f29edf7a8c0fb9cf10465
|
@ -1 +1 @@
|
|||||||
9ec1a21c14ca0c4070eff4c8360a0238991809d0
|
3db7fa5f078177f417ec7f6e1413fdd6d9303409
|
@ -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";
|
||||||
|
@ -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);
|
||||||
|
@ -1 +1 @@
|
|||||||
73949fb6408ba10f6a062dc356186fdefdd161d6
|
8f9dc17751a7c9a0dd47f7fdd9ab31ed6f4e38ca
|
@ -1 +1 @@
|
|||||||
fe29d992cf41104328b74fbf8e73c87b4b3b83af
|
a82cedb70b75a761439c891e0e6bad183298d08f
|
@ -1 +1 @@
|
|||||||
293242222f0e48a0c0ab519e6d67f5fe9dcc1c42
|
6d90d159ed9b630181811a347779b64f218ead32
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
dffdf72f972fa58a13c7358f2e264e9ca7eac517
|
cbfeefb8ddd2bf45f2ac594aa333b5cabd94b62d
|
@ -1 +1 @@
|
|||||||
54bd86729415191b5aebb9366b0643ff156ded7d
|
e6c3414dce4054d5c82102d1b5eca7db6470c3ee
|
@ -1 +1 @@
|
|||||||
df342b8d72746493f49cd3d6480c64314b459394
|
aef79ed1d016f6e3edcc5f6516ddf924043ecf71
|
@ -1 +1 @@
|
|||||||
73bccf40a2839e368acecb0ba3fdc4d8293f1494
|
f1dab501ed7c5cd937732c0a853d8a562751124d
|
@ -1 +1 @@
|
|||||||
73949fb6408ba10f6a062dc356186fdefdd161d6
|
8f9dc17751a7c9a0dd47f7fdd9ab31ed6f4e38ca
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user