Merge branch 'upstream'
Former-commit-id: dfb1ca2e39e05da418cf1488dbb0b4332e469bb4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
commit
d5aa3ace51
@ -1 +1 @@
|
||||
dda12b89b57ec43ec7425bee91b759452f9ece18
|
||||
4f26311439dfdc4ae5585d7f998acdd5b6cda058
|
||||
@ -1 +1 @@
|
||||
62872d5f3cb314c4c4b962ce6f487b4e2941c0de
|
||||
f9bb195944f46cc2f6ac6329917b7e5359e6e315
|
||||
5
external/bockbuild/packages/gtk+.py
vendored
5
external/bockbuild/packages/gtk+.py
vendored
@ -202,7 +202,10 @@ class GtkPackage (GnomeGitPackage):
|
||||
# 'patches/gtk/gtk-new-screen-updates-api.patch',
|
||||
|
||||
# https://bugzilla.xamarin.com/show_bug.cgi?id=5162
|
||||
'patches/gtk/get-ascii-capable-keyboard-input-source.patch'
|
||||
# 'patches/gtk/get-ascii-capable-keyboard-input-source.patch',
|
||||
|
||||
# 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'
|
||||
])
|
||||
|
||||
def prep(self):
|
||||
|
||||
31
external/bockbuild/packages/patches/gtk/update_only_apple_keyboard_layout.patch
vendored
Normal file
31
external/bockbuild/packages/patches/gtk/update_only_apple_keyboard_layout.patch
vendored
Normal file
@ -0,0 +1,31 @@
|
||||
commit 0fb9feb1c32491aaf00350c1038367d5614e9574
|
||||
Author: Yusuke Yamada <yamachu.dev@gmail.com>
|
||||
Date: Mon Sep 18 11:06:12 2017 +0900
|
||||
|
||||
[gtk] Fix crashing when using Third-party IME
|
||||
|
||||
diff --git a/gdk/quartz/gdkkeys-quartz.c b/gdk/quartz/gdkkeys-quartz.c
|
||||
index b96683c488..9a66d13902 100644
|
||||
--- a/gdk/quartz/gdkkeys-quartz.c
|
||||
+++ b/gdk/quartz/gdkkeys-quartz.c
|
||||
@@ -56,6 +56,7 @@
|
||||
#include "gdk.h"
|
||||
#include "gdkkeysyms.h"
|
||||
#include "gdkprivate-quartz.h"
|
||||
+#include <Foundation/Foundation.h>
|
||||
|
||||
#define NUM_KEYCODES 128
|
||||
#define KEYVALS_PER_KEYCODE 4
|
||||
@@ -286,6 +287,12 @@ update_keymap (void)
|
||||
keyval_array = g_new0 (guint, NUM_KEYCODES * KEYVALS_PER_KEYCODE);
|
||||
|
||||
#ifdef __LP64__
|
||||
+ TISInputSourceRef new_ascii_layout = TISCopyCurrentASCIICapableKeyboardInputSource();
|
||||
+ NSString *sourceId = TISGetInputSourceProperty(new_ascii_layout, kTISPropertyInputSourceID);
|
||||
+ if ([sourceId hasPrefix:@"com.apple.keylayout"])
|
||||
+ {
|
||||
+ new_layout = new_ascii_layout;
|
||||
+ }
|
||||
layout_data_ref = (CFDataRef) TISGetInputSourceProperty
|
||||
(new_layout, kTISPropertyUnicodeKeyLayoutData);
|
||||
|
||||
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.4.0.199";
|
||||
public const string MonoVersion = "5.4.0.201";
|
||||
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 @@
|
||||
be9aa05dcf77e3a678e866b6356372647c1cc13c
|
||||
99c772c1f20234e3c0a71dfd4db791b83f223c7f
|
||||
@ -1 +1 @@
|
||||
3af123b023a664cae8e867980a3fac5e1f10be4d
|
||||
0caa7f38536f1b65e13e4dd29939c02ecd26c74a
|
||||
@ -1 +1 @@
|
||||
91b45d039180bf17f0320233e15df3127ca1fcd6
|
||||
6369b838505786811cc16b1922880be640ee9727
|
||||
@ -1 +1 @@
|
||||
1c2d90a445f904d7931338651b4eb30c2f90556c
|
||||
d035fb43c59718a5ba32508d2e5ae2ea74a43980
|
||||
@ -1 +1 @@
|
||||
4561c1a91655dbff891faed14271cf5326d69171
|
||||
c6dfd075a29dbe15b6b8537fa8e7ad7b8716ed5b
|
||||
@ -1 +1 @@
|
||||
8ef5fe00834d2790dd279a4e3152ed7d3b2cf042
|
||||
269a52e910363e3bf60b8fea648b93eba899bffe
|
||||
@ -1 +1 @@
|
||||
1c9b11fa10eb41cba446db688ad5f32157c7c936
|
||||
4f8813bec7ffbd4b153bef17ef60f359f6e7ef89
|
||||
@ -1 +1 @@
|
||||
949647d93cf97e4425af624028fe259adf0cadc7
|
||||
da3d16a2e53cb6229ce77d527dd2eb37245433c5
|
||||
@ -1 +1 @@
|
||||
c68056663022971dfea97db6fbb1305193515e0f
|
||||
2705cd8db3d4a35b7f31d6eb3b981aa8ecd5a825
|
||||
@ -1 +1 @@
|
||||
5b606e131c5591dc6a772f44ffb045ffb6bf72a9
|
||||
a350f1c008284c4d10b58843d8309cb35bf9b9bc
|
||||
@ -1 +1 @@
|
||||
3085670584ff3c0cb27fc441778ac7203a549369
|
||||
a59407d6be9d896bb8ab8baedda22631ec41f45a
|
||||
@ -1 +1 @@
|
||||
7e596014ea1f6802c2a3c1e42158d1b67dd9639c
|
||||
2b24697067c3018389c572c9e3920653cdc07444
|
||||
@ -1 +1 @@
|
||||
f0a5cf9baa7a06afaf0c41a2578d0767a386332b
|
||||
e2a42c4b7e5df97895403c7ca3b6c63db33be064
|
||||
@ -1 +1 @@
|
||||
7b26d518a6ed18bf35d5efbfd6ba91a9a961cb60
|
||||
91b56cec7c19a6c738556dca93c303dc5ca01690
|
||||
@ -1 +1 @@
|
||||
25c0a41aa61e73c95d26f94ade64cc0fb31402b5
|
||||
4530ef6f1d8972006b02e42528f4fb5a5c38f06b
|
||||
@ -1 +1 @@
|
||||
0511e6c8fd04f83753543eb2f97e7ed6a55f156b
|
||||
d37a36d3679f1203e85b925de810e308f42c6dfc
|
||||
@ -1 +1 @@
|
||||
80f4d35af487244016901a92c9ea9335b44a0cde
|
||||
4c8ea48b632b8522f4511a6431a83036fcf0fbdc
|
||||
@ -1 +1 @@
|
||||
e25627ab12f30575004c4a2ee0c8a3aa0df8664f
|
||||
b0d5896e9c57979c5cd7dfdd3bb2a9152522287e
|
||||
@ -1 +1 @@
|
||||
db405ecae016a720f714aa2b160253add697d737
|
||||
d94445ff86b7de952be20f70bdc07256902ae056
|
||||
@ -1 +1 @@
|
||||
da5d03672b0a421a04a4c880c1f50ea24f5d6035
|
||||
deaaac712b989dc18831bbd4ddccdab88238c21e
|
||||
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/7d78877"
|
||||
#define FULL_VERSION "explicit/71277e7"
|
||||
|
||||
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
fda9d7a830a207581b4d7af95c0ba266742dc674
|
||||
d03cb204b2828a4ed76834b8bad056fc3de26b52
|
||||
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
12a53a10dc14dec78b4abc4815bd7afd92e0e764
|
||||
c30d3f8acb3ae1d263ed87f4eb50bc2ecb414b2e
|
||||
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
3f52fb4b6afb28f6a5f2cccc0d41bfa11e9c6994
|
||||
330719deb980bb54c1d46256cc086f9b989361e8
|
||||
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.4.0.199\n"
|
||||
"Project-Id-Version: mono 5.4.0.201\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2017-09-25 16:39+0000\n"
|
||||
"POT-Creation-Date: 2017-10-04 16:03+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"
|
||||
|
||||
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
c8e7f072ee5743808fb9ac5987dce39f4980c80c
|
||||
0e32fb6d56a543bfb619219ed463cc49bc066e17
|
||||
Loading…
x
Reference in New Issue
Block a user