Imported Upstream version 5.20.1.18

Former-commit-id: 841c488b7b46cc6188172d4d2a1339e0be0b91e6
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-04-09 08:25:21 +00:00
parent 5c452d1cda
commit ce3dab1ccf
49 changed files with 131 additions and 40 deletions

View File

@ -1 +1 @@
f9c9b3a412fac3a2eade8c2a784e6d1463a6184c
fece540d20954b00004fe19c2d661518068cf5dc

View File

@ -1 +1 @@
f18cc25ac85a689f076e76f6a848acb21601d93f
d29f872d4cf2e9fe0a88525bdc4303fd8550fdd0

View File

@ -224,6 +224,7 @@ class GtkPackage (GitHubPackage):
# https://devdiv.visualstudio.com/DevDiv/_workitems/edit/821841
'patches/gtk/nsview-embedding-skip-hidden-subviews.patch',
'patches/gtk/0001-gtk-combo-box-native-menu-hook.patch'
])
def prep(self):

View File

@ -0,0 +1,89 @@
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index bd83a1e11..c2078b32e 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -227,6 +227,8 @@ enum {
MOVE_ACTIVE,
POPUP,
POPDOWN,
+ SHOW_POPUP,
+ HIDE_POPUP,
LAST_SIGNAL
};
@@ -627,6 +629,15 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+
+ combo_box_signals[SHOW_POPUP] =
+ g_signal_new (I_("xamarin-private-show-native-menu"),
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE,
+ 0, _gtk_boolean_handled_accumulator, NULL,
+ _gtk_marshal_BOOLEAN__VOID,
+ G_TYPE_BOOLEAN, 0);
+
/**
* GtkComboBox::popdown:
* @button: the object which received the signal
@@ -648,6 +659,14 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
_gtk_marshal_BOOLEAN__VOID,
G_TYPE_BOOLEAN, 0);
+ combo_box_signals[HIDE_POPUP] =
+ g_signal_new (I_("xamarin-private-hide-native"),
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE,
+ 0, _gtk_boolean_handled_accumulator, NULL,
+ _gtk_marshal_BOOLEAN__VOID,
+ G_TYPE_BOOLEAN, 0);
+
/* key bindings */
binding_set = gtk_binding_set_by_class (widget_class);
@@ -2007,6 +2026,20 @@ update_menu_sensitivity (GtkComboBox *combo_box,
g_list_free (children);
}
+/* Offer the client a chance to handle menu popups themselves
+ For example, if a native menu was to be used instead of Gtk
+
+ If the client connects to the xamrin-private-show-menu signal
+ they should return TRUE if the native menu was shown
+*/
+static gboolean
+maybe_popup_native_menu (GtkComboBox *combo_box)
+{
+ gboolean retval = FALSE;
+ g_signal_emit (combo_box, combo_box_signals[SHOW_POPUP], 0, &retval);
+ return retval;
+}
+
static void
gtk_combo_box_menu_popup (GtkComboBox *combo_box,
guint button,
@@ -2018,6 +2051,11 @@ gtk_combo_box_menu_popup (GtkComboBox *combo_box,
GtkRequisition requisition;
gint width;
+ if (maybe_popup_native_menu (combo_box))
+ {
+ return;
+ }
+
update_menu_sensitivity (combo_box, priv->popup_widget);
active_item = -1;
@@ -2118,6 +2156,11 @@ gtk_combo_box_real_popup (GtkComboBox *combo_box)
if (!gtk_widget_get_realized (GTK_WIDGET (combo_box)))
return;
+ if (maybe_popup_native_menu (combo_box))
+ {
+ return;
+ }
+
if (gtk_widget_get_mapped (priv->popup_widget))
return;

View File

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

@ -119,7 +119,6 @@
../../../external/corefx/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/SSPI/SecResult.cs
../../../external/corefx/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/SSPI/SecurityHandle.cs
../../../external/corefx/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/SSPI/SecurityInteger.cs
../../../external/corefx/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/SSPI/SecurityWrapper.cs
../../../external/corefx/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/SSPI/SSPIContext.Unix.cs
../../../external/corefx/src/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/SSPI/SSPIResponse.cs

View File

@ -1 +1 @@
256432bee74f3671b895c68c9a554a9c7c645758
19afd750b56e8823e579cf22b9dda05a235283ef

View File

@ -1 +1 @@
c6b1e10a49b6606b92e962cbead17c1135c5f3e5
cae7dd32de6ba52b26366bde908f8342cb564ac4

View File

@ -1 +1 @@
441a722c2664495a368e1a1b3799c07f877269d6
66b2fbcd15e6a39b306b46f0887a25415463cf70

View File

@ -1 +1 @@
56b3f562a378b405606e687414433dba8797f9eb
f13478914dc48a2d200c7ff36c062943fdab81dc

View File

@ -1 +1 @@
94dd95147356498efe30226a29c5f11eb52f1475
27ba3fcc06585492b6222b62b6747a9bf24e9d30

View File

@ -1 +1 @@
b6ece8972f41516569335fb1a3b169814883fdb8
3d65f1c84ce49428b714a22f45f720f7d51b3918

View File

@ -1 +1 @@
aabe25ec6f948269abffa827a524ce4957fc8982
eaa15cf7e4a87bb869355d8641cdab0fc011d2b9

View File

@ -1 +1 @@
256432bee74f3671b895c68c9a554a9c7c645758
19afd750b56e8823e579cf22b9dda05a235283ef

View File

@ -1 +1 @@
c6b1e10a49b6606b92e962cbead17c1135c5f3e5
cae7dd32de6ba52b26366bde908f8342cb564ac4

View File

@ -1 +1 @@
441a722c2664495a368e1a1b3799c07f877269d6
66b2fbcd15e6a39b306b46f0887a25415463cf70

View File

@ -1 +1 @@
56b3f562a378b405606e687414433dba8797f9eb
f13478914dc48a2d200c7ff36c062943fdab81dc

View File

@ -1 +1 @@
94dd95147356498efe30226a29c5f11eb52f1475
27ba3fcc06585492b6222b62b6747a9bf24e9d30

View File

@ -1 +1 @@
b6ece8972f41516569335fb1a3b169814883fdb8
3d65f1c84ce49428b714a22f45f720f7d51b3918

View File

@ -1 +1 @@
aabe25ec6f948269abffa827a524ce4957fc8982
eaa15cf7e4a87bb869355d8641cdab0fc011d2b9

View File

@ -1 +1 @@
256432bee74f3671b895c68c9a554a9c7c645758
19afd750b56e8823e579cf22b9dda05a235283ef

View File

@ -1 +1 @@
c6b1e10a49b6606b92e962cbead17c1135c5f3e5
cae7dd32de6ba52b26366bde908f8342cb564ac4

View File

@ -1 +1 @@
441a722c2664495a368e1a1b3799c07f877269d6
66b2fbcd15e6a39b306b46f0887a25415463cf70

View File

@ -1 +1 @@
56b3f562a378b405606e687414433dba8797f9eb
f13478914dc48a2d200c7ff36c062943fdab81dc

View File

@ -1 +1 @@
94dd95147356498efe30226a29c5f11eb52f1475
27ba3fcc06585492b6222b62b6747a9bf24e9d30

View File

@ -1 +1 @@
b6ece8972f41516569335fb1a3b169814883fdb8
3d65f1c84ce49428b714a22f45f720f7d51b3918

View File

@ -1 +1 @@
aabe25ec6f948269abffa827a524ce4957fc8982
eaa15cf7e4a87bb869355d8641cdab0fc011d2b9

View File

@ -1 +1 @@
256432bee74f3671b895c68c9a554a9c7c645758
19afd750b56e8823e579cf22b9dda05a235283ef

View File

@ -1 +1 @@
c6b1e10a49b6606b92e962cbead17c1135c5f3e5
cae7dd32de6ba52b26366bde908f8342cb564ac4

View File

@ -1 +1 @@
441a722c2664495a368e1a1b3799c07f877269d6
66b2fbcd15e6a39b306b46f0887a25415463cf70

View File

@ -1 +1 @@
56b3f562a378b405606e687414433dba8797f9eb
f13478914dc48a2d200c7ff36c062943fdab81dc

View File

@ -1 +1 @@
94dd95147356498efe30226a29c5f11eb52f1475
27ba3fcc06585492b6222b62b6747a9bf24e9d30

View File

@ -1 +1 @@
b6ece8972f41516569335fb1a3b169814883fdb8
3d65f1c84ce49428b714a22f45f720f7d51b3918

View File

@ -1 +1 @@
aabe25ec6f948269abffa827a524ce4957fc8982
eaa15cf7e4a87bb869355d8641cdab0fc011d2b9

View File

@ -337,7 +337,9 @@ mono_de_add_pending_breakpoints (MonoMethod *method, MonoJitInfo *ji)
}
}
g_assert (seq_points);
if (!seq_points)
/* Could be AOT code, or above "search_all_backends" call could have failed */
continue;
insert_breakpoint (seq_points, domain, ji, bp, NULL);
}

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/2458d2d"
#define FULL_VERSION "explicit/bd6801d"

Binary file not shown.

View File

@ -1 +1 @@
d514e8fbb1bd6e9e29b58b15deba31f41f83ed52
350441cce5946caebb3cf82528d11ad6222533c0

Binary file not shown.

View File

@ -1 +1 @@
b339aca24e9bba076b998e621bafa248926a8f05
e59ab4fb757479e655795565f6af945ad97d51c3

Binary file not shown.

View File

@ -1 +1 @@
65e28a9e2272f0a5e964bf42333050d09b332acd
40ac5fcea0b2345d869889fe0d1133a89a673838

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.20.1.15\n"
"Project-Id-Version: mono 5.20.1.18\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-04-07 08:06+0000\n"
"POT-Creation-Date: 2019-04-09 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 @@
45226ff680dcaa65aa690dab0ecaec8d52f15909
61318f29951e71aded8e4ab2eb3f6280ef2464ad