diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 76d8487add..3e40684739 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -e94257dd53848925d89adc796d930eb14b964280 \ No newline at end of file +3d370aee6ff558d1db9495739a11b0fbdd5c3be3 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index f8a0e01d19..4652dd2def 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -e3c358a667ccdb5f92cd6fd71f750b3abb8359c5 \ No newline at end of file +590adfbc18ed4d0b5d5b6433347692980d68352f \ No newline at end of file diff --git a/external/bockbuild/packages/gtk+.py b/external/bockbuild/packages/gtk+.py index 88a138fb37..3238919cb0 100644 --- a/external/bockbuild/packages/gtk+.py +++ b/external/bockbuild/packages/gtk+.py @@ -208,7 +208,12 @@ class GtkPackage (GitHubPackage): # https://developercommunity.visualstudio.com/content/problem/104471/visual-studio-for-mac-720540-cannot-launch-exc-bre.html 'patches/gtk/update_only_apple_keyboard_layout.patch', - 'patches/gtk/gtk-backing-scale-factor.patch' + 'patches/gtk/gtk-backing-scale-factor.patch', + + 'patches/gtk/gtk-fix-find_nsview_at_pos-recursive.patch', + + # https://devdiv.visualstudio.com/DevDiv/_workitems/edit/569768 + 'patches/gtk/gtk-imquartz-commit-on-focus-out.patch' ]) def prep(self): diff --git a/external/bockbuild/packages/patches/gtk/gtk-fix-find_nsview_at_pos-recursive.patch b/external/bockbuild/packages/patches/gtk/gtk-fix-find_nsview_at_pos-recursive.patch new file mode 100644 index 0000000000..ef090fac59 --- /dev/null +++ b/external/bockbuild/packages/patches/gtk/gtk-fix-find_nsview_at_pos-recursive.patch @@ -0,0 +1,13 @@ +diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c +index 195899b13b..844128e0b2 100644 +--- a/gdk/quartz/gdkevents-quartz.c ++++ b/gdk/quartz/gdkevents-quartz.c +@@ -748,7 +748,7 @@ find_nsview_at_pos (GdkWindowImplQuartz *impl, gint x, gint y) + if (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, x - r.origin.x, y - r.origin.y); + if (child != NULL) + return child; + else diff --git a/external/bockbuild/packages/patches/gtk/gtk-imquartz-commit-on-focus-out.patch b/external/bockbuild/packages/patches/gtk/gtk-imquartz-commit-on-focus-out.patch new file mode 100644 index 0000000000..87fdaa8b6e --- /dev/null +++ b/external/bockbuild/packages/patches/gtk/gtk-imquartz-commit-on-focus-out.patch @@ -0,0 +1,44 @@ +commit 5358d331a5a01fd7d11297b1686293251fd93197 +Author: Cody Russell +Date: Tue Jun 26 23:01:29 2018 -0500 + + When focusing out, commit the preedit instead of discarding. + + Fixes VSTS #569768 + +diff --git a/modules/input/imquartz.c b/modules/input/imquartz.c +index c93330f22..7829929ac 100644 +--- a/modules/input/imquartz.c ++++ b/modules/input/imquartz.c +@@ -277,6 +277,22 @@ quartz_reset (GtkIMContext *context) + discard_preedit (context); + } + ++static void ++quartz_commit (GtkIMContext *context) ++{ ++ GtkIMContextQuartz *qc = GTK_IM_CONTEXT_QUARTZ (context); ++ NSView *nsview; ++ GdkWindow *window; ++ ++ if (!qc->client_window) ++ return; ++ ++ nsview = gdk_quartz_window_get_nsview (qc->client_window); ++ window = (GdkWindow *)[(GdkQuartzView *)nsview gdkWindow]; ++ ++ output_result (context, window); ++} ++ + static void + quartz_set_client_window (GtkIMContext *context, GdkWindow *window) + { +@@ -305,7 +321,7 @@ quartz_focus_out (GtkIMContext *context) + qc->focused = FALSE; + + /* Commit any partially built strings or it'll mess up other GTK+ widgets in the window */ +- discard_preedit (context); ++ quartz_commit (context); + } + + static void diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index c919d46286..8ccb3ba240 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.14.0.156"; + public const string MonoVersion = "5.14.0.158"; 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-darwin/1051400003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id index 64ee6e83b7..f0d8db9080 100644 --- a/mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -6196c069b0580d9adc346e2dffa9e1fbc0b6e4f6 \ No newline at end of file +78920717669553c991639cd8ca1188215eaa85af \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id index f829e518e5..9874012353 100644 --- a/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -7cd4ce8794c209e26f59d0c354d93fb9ae1f95db \ No newline at end of file +66936f786b470766acbfa39582d2a6c9ce011046 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id index 879e6787d9..952d22ac69 100644 --- a/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -40ab52f347643403188c38498f42091ef9f00d9c \ No newline at end of file +66f20a4c99d0395431836ac79442c69b728ace7a \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id index 6ee82825d0..12bb034a28 100644 --- a/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -14839a10498c41b5b2bc637ff264e816bd2d87d0 \ No newline at end of file +0d28f3fa635006a8aebd64886b9980cd2b077077 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id index b5cacae632..53e90743a3 100644 --- a/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -79b791d700de0970735b209e0d091d1a21787896 \ No newline at end of file +722e1a947458dbff3be028eccb95a69433773c95 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id index fb5b1d602a..f46f3f3427 100644 --- a/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -03f9e0b46c10b5712398a929c279cd9654a0393d \ No newline at end of file +04915ee16c1fcbc265345e14dee015a5e9a0c74b \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id index a5a78db8d1..2cd6969b2c 100644 --- a/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -9a030f23563302ff603ffee74a0dd6f89a4f8b15 \ No newline at end of file +12d08661907184a324a81714dfdc065d412b7229 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id index 64ee6e83b7..f0d8db9080 100644 --- a/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -6196c069b0580d9adc346e2dffa9e1fbc0b6e4f6 \ No newline at end of file +78920717669553c991639cd8ca1188215eaa85af \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id index f829e518e5..9874012353 100644 --- a/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -7cd4ce8794c209e26f59d0c354d93fb9ae1f95db \ No newline at end of file +66936f786b470766acbfa39582d2a6c9ce011046 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id index 879e6787d9..952d22ac69 100644 --- a/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -40ab52f347643403188c38498f42091ef9f00d9c \ No newline at end of file +66f20a4c99d0395431836ac79442c69b728ace7a \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id index 6ee82825d0..12bb034a28 100644 --- a/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -14839a10498c41b5b2bc637ff264e816bd2d87d0 \ No newline at end of file +0d28f3fa635006a8aebd64886b9980cd2b077077 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id index b5cacae632..53e90743a3 100644 --- a/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -79b791d700de0970735b209e0d091d1a21787896 \ No newline at end of file +722e1a947458dbff3be028eccb95a69433773c95 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id index fb5b1d602a..f46f3f3427 100644 --- a/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -03f9e0b46c10b5712398a929c279cd9654a0393d \ No newline at end of file +04915ee16c1fcbc265345e14dee015a5e9a0c74b \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id index a5a78db8d1..2cd6969b2c 100644 --- a/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -9a030f23563302ff603ffee74a0dd6f89a4f8b15 \ No newline at end of file +12d08661907184a324a81714dfdc065d412b7229 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400003/Mono.Security.dll.REMOVED.git-id index 64ee6e83b7..f0d8db9080 100644 --- a/mcs/class/lib/monolite-win32/1051400003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -6196c069b0580d9adc346e2dffa9e1fbc0b6e4f6 \ No newline at end of file +78920717669553c991639cd8ca1188215eaa85af \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400003/System.Configuration.dll.REMOVED.git-id index f829e518e5..9874012353 100644 --- a/mcs/class/lib/monolite-win32/1051400003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -7cd4ce8794c209e26f59d0c354d93fb9ae1f95db \ No newline at end of file +66936f786b470766acbfa39582d2a6c9ce011046 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400003/System.Numerics.dll.REMOVED.git-id index 879e6787d9..952d22ac69 100644 --- a/mcs/class/lib/monolite-win32/1051400003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -40ab52f347643403188c38498f42091ef9f00d9c \ No newline at end of file +66f20a4c99d0395431836ac79442c69b728ace7a \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400003/System.Security.dll.REMOVED.git-id index 6ee82825d0..12bb034a28 100644 --- a/mcs/class/lib/monolite-win32/1051400003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -14839a10498c41b5b2bc637ff264e816bd2d87d0 \ No newline at end of file +0d28f3fa635006a8aebd64886b9980cd2b077077 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400003/System.Xml.dll.REMOVED.git-id index b5cacae632..53e90743a3 100644 --- a/mcs/class/lib/monolite-win32/1051400003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -79b791d700de0970735b209e0d091d1a21787896 \ No newline at end of file +722e1a947458dbff3be028eccb95a69433773c95 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400003/mcs.exe.REMOVED.git-id index fb5b1d602a..f46f3f3427 100644 --- a/mcs/class/lib/monolite-win32/1051400003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -03f9e0b46c10b5712398a929c279cd9654a0393d \ No newline at end of file +04915ee16c1fcbc265345e14dee015a5e9a0c74b \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400003/mscorlib.dll.REMOVED.git-id index a5a78db8d1..2cd6969b2c 100644 --- a/mcs/class/lib/monolite-win32/1051400003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -9a030f23563302ff603ffee74a0dd6f89a4f8b15 \ No newline at end of file +12d08661907184a324a81714dfdc065d412b7229 \ No newline at end of file diff --git a/mono/mini/aot-runtime.c.REMOVED.git-id b/mono/mini/aot-runtime.c.REMOVED.git-id index 964ddacca4..fa24643d51 100644 --- a/mono/mini/aot-runtime.c.REMOVED.git-id +++ b/mono/mini/aot-runtime.c.REMOVED.git-id @@ -1 +1 @@ -10044f8ee122b24d3aa8777fe86f875a1f24b447 \ No newline at end of file +e0b9a82da9b8b1bc4577aa597b25cec96a764491 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index a7318a08a9..9c40b6ed1d 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/5a3352a" +#define FULL_VERSION "explicit/9d69811" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 1a7f84012e..2e3132a055 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 33dec1481a..8b31704714 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -89149d8dba318f0c744dbc08dceae0c7d65bcc34 \ No newline at end of file +7f8365e160a5c74d1cc4a1ffa68898551e97252d \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index be6eafc07c..246c34a22e 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 0ca2c06c93..5f917bc55f 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -61f8dcbd5fbac920ac25a5b524d039a8099fa638 \ No newline at end of file +718067532e460df5be35d6a06fa995b515339b8e \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 7971f2996a..048d91116f 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 644feb4633..755289096e 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -999726fdcea18744c7110fc65c2296b4a1fcbff1 \ No newline at end of file +e77b3bf043812da9a06cc98e0c11b8328c9412c1 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index ac66721a9f..22d471278c 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.14.0.156\n" +"Project-Id-Version: mono 5.14.0.158\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-06-30 08:08+0000\n" +"POT-Creation-Date: 2018-07-03 08:04+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index cb9fae838a..71b2cb5931 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 515dbc863f..7cde108974 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -89e3c11456d80d5823c9384bd77869e429171158 \ No newline at end of file +6c495385233f7d6f0970c7d5839043f50e701270 \ No newline at end of file