From ce3dab1ccf4b6ee0597c991d0ae607f2a4ecef43 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Tue, 9 Apr 2019 08:25:21 +0000 Subject: [PATCH] Imported Upstream version 5.20.1.18 Former-commit-id: 841c488b7b46cc6188172d4d2a1339e0be0b91e6 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- external/bockbuild/packages/gtk+.py | 1 + .../0001-gtk-combo-box-native-menu-hook.patch | 89 ++++++++++++++++++ mcs/build/common/Consts.cs | 2 +- .../System.Data/System.Data_xtest.dll.sources | 1 - .../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/debugger-engine.c | 4 +- mono/mini/version.h | 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 +- 49 files changed, 131 insertions(+), 40 deletions(-) create mode 100644 external/bockbuild/packages/patches/gtk/0001-gtk-combo-box-native-menu-hook.patch diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 6696c7f464..665e249b20 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -f9c9b3a412fac3a2eade8c2a784e6d1463a6184c \ No newline at end of file +fece540d20954b00004fe19c2d661518068cf5dc \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 722f14076f..3dbf046ab0 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -f18cc25ac85a689f076e76f6a848acb21601d93f \ No newline at end of file +d29f872d4cf2e9fe0a88525bdc4303fd8550fdd0 \ No newline at end of file diff --git a/external/bockbuild/packages/gtk+.py b/external/bockbuild/packages/gtk+.py index 56e283651e..291e027534 100644 --- a/external/bockbuild/packages/gtk+.py +++ b/external/bockbuild/packages/gtk+.py @@ -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): diff --git a/external/bockbuild/packages/patches/gtk/0001-gtk-combo-box-native-menu-hook.patch b/external/bockbuild/packages/patches/gtk/0001-gtk-combo-box-native-menu-hook.patch new file mode 100644 index 0000000000..ae6ebda958 --- /dev/null +++ b/external/bockbuild/packages/patches/gtk/0001-gtk-combo-box-native-menu-hook.patch @@ -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; + diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 6bbcb2bc05..e88bc637ca 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -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"; diff --git a/mcs/class/System.Data/System.Data_xtest.dll.sources b/mcs/class/System.Data/System.Data_xtest.dll.sources index d1f724d853..67f78a1405 100644 --- a/mcs/class/System.Data/System.Data_xtest.dll.sources +++ b/mcs/class/System.Data/System.Data_xtest.dll.sources @@ -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 diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id index 5fa98c30c1..c1a9d9c1b4 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -256432bee74f3671b895c68c9a554a9c7c645758 \ No newline at end of file +19afd750b56e8823e579cf22b9dda05a235283ef \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id index a46b0efc80..2a182b2bac 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -c6b1e10a49b6606b92e962cbead17c1135c5f3e5 \ No newline at end of file +cae7dd32de6ba52b26366bde908f8342cb564ac4 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id index ff8a750586..eb9a98099b 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -441a722c2664495a368e1a1b3799c07f877269d6 \ No newline at end of file +66b2fbcd15e6a39b306b46f0887a25415463cf70 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll index 2643fdc9a17b66606c5ea2706e5b288aab550f5a..f3966644f985b20236b6b9f614790256a8130fc1 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZD?lbSjh$`#Chx6lj$Xa)l~ Q04kTDeE}-BWfK9LaGy~Xi2wiq delta 58 zcmV-A0LA}+hz5X&29SsZkN&KZfsD0`0W=H{D?lbSjh$`#Chx6lj$Xa)l~ Q04kTDeE}-BWfK9LaGy~Xi2wiq delta 58 zcmV-A0LA}+hz5X&29SsZkN&KZfsD0`0W=H{D?lbSjh$`#Chx6lj$Xa)l~ Q04kTDeE}-BWfK9LaGy~Xi2wiq delta 58 zcmV-A0LA}+hz5X&29SsZkN&KZfsD0`0W=H{D?lbSjh$`#Chx6lj$Xa)l~ Q04kTDeE}-BWfK9LaGy~Xi2wiq delta 58 zcmV-A0LA}+hz5X&29SsZkN&KZfsD0`0W=H{\n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index c993370dcd05d0155af7aa371215fee9aa8f176c..11311a0652d60a5ca4dffba9ab5588bd735dc03e 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*)0_eEUXO7H>XZzYzF{tGzf+O delta 22 ecmaF1gXP%{mJM-J+07LUEUXO7Hm6QyYzF{t76^j? diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 887741c7a1..0bcdbf34a0 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -45226ff680dcaa65aa690dab0ecaec8d52f15909 \ No newline at end of file +61318f29951e71aded8e4ab2eb3f6280ef2464ad \ No newline at end of file