mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: 18fd42587697d4be6fc47b8f07a50c9cadb08b98
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-07-03 08:22:49 +00:00
commit 9e3d21607c
38 changed files with 95 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
e94257dd53848925d89adc796d930eb14b964280 3d370aee6ff558d1db9495739a11b0fbdd5c3be3

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
e3c358a667ccdb5f92cd6fd71f750b3abb8359c5 590adfbc18ed4d0b5d5b6433347692980d68352f

7
external/bockbuild/packages/gtk+.py vendored
View File

@ -208,7 +208,12 @@ class GtkPackage (GitHubPackage):
# https://developercommunity.visualstudio.com/content/problem/104471/visual-studio-for-mac-720540-cannot-launch-exc-bre.html # 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/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): def prep(self):

13
external/bockbuild/packages/patches/gtk/gtk-fix-find_nsview_at_pos-recursive.patch vendored Normal file
View File

@ -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

44
external/bockbuild/packages/patches/gtk/gtk-imquartz-commit-on-focus-out.patch vendored Normal file
View File

@ -0,0 +1,44 @@
commit 5358d331a5a01fd7d11297b1686293251fd93197
Author: Cody Russell <cody@jhu.edu>
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

2
mcs/build/common/Consts.cs
View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable. // 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 MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors"; public const string MonoCopyright = "(c) Various Mono authors";

2
mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
6196c069b0580d9adc346e2dffa9e1fbc0b6e4f6 78920717669553c991639cd8ca1188215eaa85af

2
mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
7cd4ce8794c209e26f59d0c354d93fb9ae1f95db 66936f786b470766acbfa39582d2a6c9ce011046

2
mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
40ab52f347643403188c38498f42091ef9f00d9c 66f20a4c99d0395431836ac79442c69b728ace7a

2
mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
14839a10498c41b5b2bc637ff264e816bd2d87d0 0d28f3fa635006a8aebd64886b9980cd2b077077

2
mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
79b791d700de0970735b209e0d091d1a21787896 722e1a947458dbff3be028eccb95a69433773c95

2
mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
03f9e0b46c10b5712398a929c279cd9654a0393d 04915ee16c1fcbc265345e14dee015a5e9a0c74b

2
mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
9a030f23563302ff603ffee74a0dd6f89a4f8b15 12d08661907184a324a81714dfdc065d412b7229

2
mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
6196c069b0580d9adc346e2dffa9e1fbc0b6e4f6 78920717669553c991639cd8ca1188215eaa85af

2
mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
7cd4ce8794c209e26f59d0c354d93fb9ae1f95db 66936f786b470766acbfa39582d2a6c9ce011046

2
mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
40ab52f347643403188c38498f42091ef9f00d9c 66f20a4c99d0395431836ac79442c69b728ace7a

2
mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
14839a10498c41b5b2bc637ff264e816bd2d87d0 0d28f3fa635006a8aebd64886b9980cd2b077077

2
mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
79b791d700de0970735b209e0d091d1a21787896 722e1a947458dbff3be028eccb95a69433773c95

2
mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
03f9e0b46c10b5712398a929c279cd9654a0393d 04915ee16c1fcbc265345e14dee015a5e9a0c74b

2
mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
9a030f23563302ff603ffee74a0dd6f89a4f8b15 12d08661907184a324a81714dfdc065d412b7229

2
mcs/class/lib/monolite-win32/1051400003/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
6196c069b0580d9adc346e2dffa9e1fbc0b6e4f6 78920717669553c991639cd8ca1188215eaa85af

2
mcs/class/lib/monolite-win32/1051400003/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
7cd4ce8794c209e26f59d0c354d93fb9ae1f95db 66936f786b470766acbfa39582d2a6c9ce011046

2
mcs/class/lib/monolite-win32/1051400003/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
40ab52f347643403188c38498f42091ef9f00d9c 66f20a4c99d0395431836ac79442c69b728ace7a

2
mcs/class/lib/monolite-win32/1051400003/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
14839a10498c41b5b2bc637ff264e816bd2d87d0 0d28f3fa635006a8aebd64886b9980cd2b077077

2
mcs/class/lib/monolite-win32/1051400003/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
79b791d700de0970735b209e0d091d1a21787896 722e1a947458dbff3be028eccb95a69433773c95

2
mcs/class/lib/monolite-win32/1051400003/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
03f9e0b46c10b5712398a929c279cd9654a0393d 04915ee16c1fcbc265345e14dee015a5e9a0c74b

2
mcs/class/lib/monolite-win32/1051400003/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
9a030f23563302ff603ffee74a0dd6f89a4f8b15 12d08661907184a324a81714dfdc065d412b7229

2
mono/mini/aot-runtime.c.REMOVED.git-id
View File

@ -1 +1 @@
10044f8ee122b24d3aa8777fe86f875a1f24b447 e0b9a82da9b8b1bc4577aa597b25cec96a764491

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/5a3352a" #define FULL_VERSION "explicit/9d69811"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

2
po/mcs/de.po.REMOVED.git-id
View File

@ -1 +1 @@
89149d8dba318f0c744dbc08dceae0c7d65bcc34 7f8365e160a5c74d1cc4a1ffa68898551e97252d

BIN
po/mcs/es.gmo
View File

Binary file not shown.

2
po/mcs/es.po.REMOVED.git-id
View File

@ -1 +1 @@
61f8dcbd5fbac920ac25a5b524d039a8099fa638 718067532e460df5be35d6a06fa995b515339b8e

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

2
po/mcs/ja.po.REMOVED.git-id
View File

@ -1 +1 @@
999726fdcea18744c7110fc65c2296b4a1fcbff1 e77b3bf043812da9a06cc98e0c11b8328c9412c1

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" 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" "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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

BIN
po/mcs/pt_BR.gmo
View File

Binary file not shown.

2
po/mcs/pt_BR.po.REMOVED.git-id
View File

@ -1 +1 @@
89e3c11456d80d5823c9384bd77869e429171158 6c495385233f7d6f0970c7d5839043f50e701270