You've already forked linux-packaging-mono
Merge branch 'upstream'
Former-commit-id: b43ad9fc3e4259236da49507f2e142742b653dff
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
@@ -1 +1 @@
|
||||
d0b3446cd9ad574ce1f998600a59eead1f2f6e89
|
||||
57151bd040b7d72a70d75fc7b3935fb3ece1abc3
|
||||
@@ -1 +1 @@
|
||||
cdfb12bde51949750ff0317ade09fee2a39d9087
|
||||
d9eb465c39764c44d304b411dd7a31baa2d4bcc9
|
||||
688
external/bdwgc/autom4te.cache/requests
vendored
688
external/bdwgc/autom4te.cache/requests
vendored
File diff suppressed because it is too large
Load Diff
4
external/bdwgc/config.log
vendored
4
external/bdwgc/config.log
vendored
@@ -10,7 +10,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
|
||||
## Platform. ##
|
||||
## --------- ##
|
||||
|
||||
hostname = az-ubuntu-general1a4400
|
||||
hostname = az-ubuntu-generala37872
|
||||
uname -m = x86_64
|
||||
uname -r = 4.15.0-1082-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-general1a4400
|
||||
on az-ubuntu-generala37872
|
||||
|
||||
config.status:1238: creating Makefile
|
||||
config.status:1238: creating bdw-gc.pc
|
||||
|
||||
2
external/bdwgc/libtool.REMOVED.git-id
vendored
2
external/bdwgc/libtool.REMOVED.git-id
vendored
@@ -1 +1 @@
|
||||
9a8b0c875e476a1255a9e03fb7c47a1daca8853b
|
||||
c2c3f46f950f38965c2709deeb9dfbc7bf047010
|
||||
3
external/bockbuild/packages/gtk+.py
vendored
3
external/bockbuild/packages/gtk+.py
vendored
@@ -230,7 +230,8 @@ class GtkPackage (GitHubPackage):
|
||||
|
||||
# https://devdiv.visualstudio.com/DevDiv/_workitems/edit/993471
|
||||
'patches/gtk/gtk-pboard-types.patch',
|
||||
'patches/gtk/define-NSPasteboardTypeURL.patch'
|
||||
'patches/gtk/define-NSPasteboardTypeURL.patch',
|
||||
'patches/gtk/Fix-1080409-StackOverflow-exception-opening-Gtk-host.patch'
|
||||
])
|
||||
|
||||
def prep(self):
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
From 588cba301ee3c43bdaebd41922b7bb60eb85c2ce Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?David=20Karlas=CC=8C?= <david.karlas@gmail.com>
|
||||
Date: Thu, 14 May 2020 15:13:56 +0200
|
||||
Subject: [PATCH] Fix 1080409: StackOverflow exception opening Gtk hosted
|
||||
NSView
|
||||
|
||||
Problem was that if `r.origin.x`/`r.origin.y` were 0, same value was looped until stackoverflow.
|
||||
Whole logic of method assumes that it will loop over children hence recursive but in fact it kept passing same NSView over and over again...
|
||||
---
|
||||
gdk/quartz/gdkevents-quartz.c | 9 ++++-----
|
||||
1 file changed, 4 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
|
||||
index a12597d0f9..1734762e5c 100644
|
||||
--- a/gdk/quartz/gdkevents-quartz.c
|
||||
+++ b/gdk/quartz/gdkevents-quartz.c
|
||||
@@ -729,9 +729,8 @@ _gdk_quartz_events_send_map_event (GdkWindow *window)
|
||||
}
|
||||
|
||||
static NSView *
|
||||
-find_nsview_at_pos (GdkWindowImplQuartz *impl, gint x, gint y)
|
||||
+find_nsview_at_pos (NSView *view, NSView *layer_view, gint x, gint y)
|
||||
{
|
||||
- NSView *view = impl->view;
|
||||
guint n_subviews;
|
||||
guint i;
|
||||
|
||||
@@ -742,14 +741,14 @@ find_nsview_at_pos (GdkWindowImplQuartz *impl, gint x, gint y)
|
||||
NSView* sv = [[view subviews] objectAtIndex:i];
|
||||
NSRect r = [sv frame];
|
||||
|
||||
- if (sv == impl->layer_view)
|
||||
+ if (sv == layer_view)
|
||||
continue;
|
||||
|
||||
if (![sv isHidden] &&
|
||||
r.origin.x <= x && r.origin.x + r.size.width >= x &&
|
||||
r.origin.y <= y && r.origin.y + r.size.height >= y)
|
||||
{
|
||||
- NSView* child = find_nsview_at_pos (impl, x - r.origin.x, y - r.origin.y);
|
||||
+ NSView* child = find_nsview_at_pos (sv, layer_view, x - r.origin.x, y - r.origin.y);
|
||||
if (child != NULL)
|
||||
return child;
|
||||
else
|
||||
@@ -933,7 +932,7 @@ find_window_for_ns_event (NSEvent *nsevent,
|
||||
toplevel_private = (GdkWindowObject *)toplevel;
|
||||
toplevel_impl = (GdkWindowImplQuartz *)toplevel_private->impl;
|
||||
|
||||
- subview = find_nsview_at_pos (toplevel_impl, x_tmp, y_tmp);
|
||||
+ subview = find_nsview_at_pos (toplevel_impl->view, toplevel_impl->layer_view, x_tmp, y_tmp);
|
||||
if (subview != NULL && ![subview isKindOfClass:[GdkQuartzView class]]) {
|
||||
g_signal_emit_by_name (toplevel, "native-child-event",
|
||||
subview, nsevent);
|
||||
--
|
||||
2.21.1 (Apple Git-122.3)
|
||||
|
||||
@@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.10.0.104";
|
||||
public const string MonoVersion = "6.10.0.105";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@@ -1 +1 @@
|
||||
1fb46b3c637661d189fad947ba6927714ef2479a
|
||||
7128bc65a59fcbd323c7662e5ceaae0d28a9190a
|
||||
@@ -1 +1 @@
|
||||
f63a365c90a7da7b53ddf3cbb7cac6c4d8f31d8f
|
||||
e2e5ec080960efc8690caa140885c15592af3a56
|
||||
@@ -1 +1 @@
|
||||
4f0c7b1c14b4d2e730374b42ae3ad7dd6bc9659f
|
||||
f0c64b250f44d8852e36b65c565dd9067e8886b9
|
||||
@@ -1 +1 @@
|
||||
ea11d0f50d0ce10a0573c49245a964d31238a59a
|
||||
475b23b25c1fe53edec488eaaa11480f61d3ee46
|
||||
@@ -1 +1 @@
|
||||
4db1120fd1375e9a91a08c245793cc5865dac892
|
||||
3e7de8702ebde4d5b3224ef99c33f1fe1ff84c71
|
||||
@@ -1 +1 @@
|
||||
cd235baffc7c8f75a59aeb59b85bf63537f38f29
|
||||
c0695eb7b56b76b4a4a8a034653bb27826875392
|
||||
@@ -1 +1 @@
|
||||
da9e362e6d9092e57765d1c6e26e58f1ec92ed2c
|
||||
de7a80f4929080b0968a8a32848392f2ebb42556
|
||||
@@ -1 +1 @@
|
||||
3f1c448d5b0b7aaa3c4765336fd397f6b61c1023
|
||||
32a410bfdb56508dafd81168d303fff7e0b66740
|
||||
@@ -1 +1 @@
|
||||
1fb46b3c637661d189fad947ba6927714ef2479a
|
||||
7128bc65a59fcbd323c7662e5ceaae0d28a9190a
|
||||
@@ -1 +1 @@
|
||||
f63a365c90a7da7b53ddf3cbb7cac6c4d8f31d8f
|
||||
e2e5ec080960efc8690caa140885c15592af3a56
|
||||
@@ -1 +1 @@
|
||||
4f0c7b1c14b4d2e730374b42ae3ad7dd6bc9659f
|
||||
f0c64b250f44d8852e36b65c565dd9067e8886b9
|
||||
@@ -1 +1 @@
|
||||
ea11d0f50d0ce10a0573c49245a964d31238a59a
|
||||
475b23b25c1fe53edec488eaaa11480f61d3ee46
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user