From c84f4746afdb9018145ce323ea295069e4319e4b Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Fri, 12 Jul 2019 08:58:20 +0000 Subject: [PATCH] Imported Upstream version 6.0.0.313 Former-commit-id: 2f44e662b05220cea3620904af57c61b4be97a61 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- ...k-quartz-window-delegate-replacement.patch | 41 ++++++++++++++++-- mcs/build/common/Consts.cs | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- msvc/Makefile.in | 2 +- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 4 +- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 47 files changed, 77 insertions(+), 42 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 9f28cf3cad..83dbae418c 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -084195687ddc7dd4048f9b2c604bb03a37c620ed \ No newline at end of file +e01cc2bb9e61cf2533ccbd873e22f71e768156f9 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 8f138dc30d..0148053cfd 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -2d00c0223998ca8b8589ca54b3d207eb5fcd9df8 \ No newline at end of file +08b1b5c5cb881e8662aada9959378c6c4b2b4ecf \ No newline at end of file diff --git a/external/bockbuild/packages/patches/gtk/0001-prevent-gdk-quartz-window-delegate-replacement.patch b/external/bockbuild/packages/patches/gtk/0001-prevent-gdk-quartz-window-delegate-replacement.patch index 46ae2dc5bb..2cefd1b06a 100644 --- a/external/bockbuild/packages/patches/gtk/0001-prevent-gdk-quartz-window-delegate-replacement.patch +++ b/external/bockbuild/packages/patches/gtk/0001-prevent-gdk-quartz-window-delegate-replacement.patch @@ -1,14 +1,28 @@ diff --git a/gdk/quartz/GdkQuartzWindow.c b/gdk/quartz/GdkQuartzWindow.c -index e8e0de5c7..435c856be 100644 +index e8e0de5c7..d0c6e84ec 100644 --- a/gdk/quartz/GdkQuartzWindow.c +++ b/gdk/quartz/GdkQuartzWindow.c -@@ -259,6 +259,16 @@ +@@ -24,6 +24,13 @@ + + @implementation GdkQuartzWindow + ++-(void)dealloc ++{ ++ // During deallocation, Cocoa resets the delegate to nil ++ // We need to track that so that we don't throw an error ++ _allowDelegateToBeSetToNil = YES; ++} ++ + -(BOOL)windowShouldClose:(id)sender + { + GdkWindow *window = [[self contentView] gdkWindow]; +@@ -259,6 +266,16 @@ return [super makeFirstResponder:responder]; } +-(void)setDelegate:(id)delegate +{ -+ if ([super delegate] == nil) { ++ if ([super delegate] == nil || (_allowDelegateToBeSetToNil && delegate == nil)) { + [super setDelegate:delegate]; + } else { + // If we allow the window delegate to be replaced, everything breaks. @@ -19,3 +33,24 @@ index e8e0de5c7..435c856be 100644 -(id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask backing:(NSBackingStoreType)backingType defer:(BOOL)flag screen:(NSScreen *)screen { self = [super initWithContentRect:contentRect +@@ -271,6 +288,7 @@ + [self setDelegate:self]; + [self setReleasedWhenClosed:YES]; + ++ _allowDelegateToBeSetToNil = NO; + return self; + } + +diff --git a/gdk/quartz/GdkQuartzWindow.h b/gdk/quartz/GdkQuartzWindow.h +index 928f9617e..23cde0037 100644 +--- a/gdk/quartz/GdkQuartzWindow.h ++++ b/gdk/quartz/GdkQuartzWindow.h +@@ -34,6 +34,8 @@ + NSPoint initialMoveLocation; + NSPoint initialResizeLocation; + NSRect initialResizeFrame; ++ ++ BOOL _allowDelegateToBeSetToNil; + } + + -(BOOL)isInMove; diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index fc71284095..299de3da8f 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -41,7 +41,7 @@ static partial class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "6.0.0.311"; + public const string MonoVersion = "6.0.0.313"; public const string MonoCompany = "Mono development team"; public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoCopyright = "(c) Various Mono authors"; diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index dc9beefe2d..896c5cdd64 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -80e579fd992ef82df5e59d94a2d778fb731082fb \ No newline at end of file +9d771de1e37e20223e1515ceef3c51a607dd9676 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index 00509ebb6e..68188cb3d3 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -fcdae2f4574bf8b726570d38ca6e929941e4bdf9 \ No newline at end of file +24c5db848db083a50471562a8dccdfe73d378e89 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 420f81f0a9..5b3c8bfcab 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -4086e7ec5e22612eeceeec7c20769bd55770118d \ No newline at end of file +136b6eadba8d83e14a6350119be4f54efba244a0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index d2f068134f4a4aaeb2741a4e61fda5d3e526f671..5652719d1b50d6e5439d1e2d405ac679f3ba5c55 100644 GIT binary patch delta 58 zcmZqZU~A}Lo6y11)*W)Fv1e-!qYjTiX!?cD-*z$H-7Noe_caQ*Y(K%nxP^_`m_cj$ Of?7tc?JI>D!wUeii55Bl delta 58 zcmV-A0LA}+hz5X&29SsZNAw1XfsD0`0W1s<76GRE88{kEwkhv^cBqa6x5x|uv<3q) Q04kTDeE}-BsS^QLaCrO_!TD!wUeii55Bl delta 58 zcmV-A0LA}+hz5X&29SsZNAw1XfsD0`0W1s<76GRE88{kEwkhv^cBqa6x5x|uv<3q) Q04kTDeE}-BsS^QLaCrO_!TD!wUeii55Bl delta 58 zcmV-A0LA}+hz5X&29SsZNAw1XfsD0`0W1s<76GRE88{kEwkhv^cBqa6x5x|uv<3q) Q04kTDeE}-BsS^QLaCrO_!TD!wUeii55Bl delta 58 zcmV-A0LA}+hz5X&29SsZNAw1XfsD0`0W1s<76GRE88{kEwkhv^cBqa6x5x|uv<3q) Q04kTDeE}-BsS^QLaCrO_!T\n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 6ab9f9e8b1a184a632c6d32f07bc0139cafc1308..64c8a018d038840a8b42eb1525ced7d2f2e37e45 100644 GIT binary patch delta 23 fcmaF1gXP%{mJP8}ISh>y3@oe+O*W@aWo!okbw3EM delta 23 fcmaF1gXP%{mJP8}ISh;x3@oe+jW?%GWo!okbu0+1 diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index c8f3e590c0..dfa4895419 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -8f1af855a9769e26fcb298b8a8f35556250e4fb1 \ No newline at end of file +cb9a929c98d33d57aa976405ee989d01d4502ffa \ No newline at end of file