diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 41aa7cc7dc..cda5c0782a 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -9ff6063dc10c3a86e9906912d420f8547b64b71b \ No newline at end of file +140ec3920dca207f77ab9142ac89bc455003ef76 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index a815e15a98..09ac8e70be 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -29c799e5f85353ded9628d88add0ef0df3500006 \ No newline at end of file +003a94bb3fbe2c4593a6c218379c80858e571b8f \ No newline at end of file diff --git a/external/bockbuild/packages/gtk+.py b/external/bockbuild/packages/gtk+.py index 505813ab21..88a138fb37 100644 --- a/external/bockbuild/packages/gtk+.py +++ b/external/bockbuild/packages/gtk+.py @@ -206,7 +206,9 @@ class GtkPackage (GitHubPackage): # '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' + 'patches/gtk/update_only_apple_keyboard_layout.patch', + + 'patches/gtk/gtk-backing-scale-factor.patch' ]) def prep(self): diff --git a/external/bockbuild/packages/patches/gtk/gtk-backing-scale-factor.patch b/external/bockbuild/packages/patches/gtk/gtk-backing-scale-factor.patch new file mode 100644 index 0000000000..fa01598621 --- /dev/null +++ b/external/bockbuild/packages/patches/gtk/gtk-backing-scale-factor.patch @@ -0,0 +1,47 @@ +diff --git a/gdk/quartz/gdkscreen-quartz.c b/gdk/quartz/gdkscreen-quartz.c +index e6f0c44e7..3daad2d6e 100644 +--- a/gdk/quartz/gdkscreen-quartz.c ++++ b/gdk/quartz/gdkscreen-quartz.c +@@ -83,13 +83,16 @@ _gdk_screen_quartz_init (GdkScreenQuartz *screen_quartz) + { + GdkScreen *screen = GDK_SCREEN (screen_quartz); + NSScreen *nsscreen; ++ NSDictionary *dd; ++ NSSize size; + + gdk_screen_set_default_colormap (screen, + gdk_screen_get_system_colormap (screen)); + + nsscreen = [[NSScreen screens] objectAtIndex:0]; +- gdk_screen_set_resolution (screen, +- 72.0 * [nsscreen userSpaceScaleFactor]); ++ dd = [nsscreen deviceDescription]; ++ size = [[dd valueForKey:NSDeviceResolution] sizeValue]; ++ gdk_screen_set_resolution (screen, size.width / [nsscreen backingScaleFactor]); + + gdk_screen_quartz_calculate_layout (screen_quartz); + +@@ -357,17 +360,12 @@ gdk_screen_get_height (GdkScreen *screen) + static gint + get_mm_from_pixels (NSScreen *screen, int pixels) + { +- /* userSpaceScaleFactor is in "pixels per point", +- * 72 is the number of points per inch, +- * and 25.4 is the number of millimeters per inch. +- */ +-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3 +- float dpi = [screen userSpaceScaleFactor] * 72.0; +-#else +- float dpi = 96.0 / 72.0; +-#endif +- +- return (pixels / dpi) * 25.4; ++ const float mm_per_inch = 25.4; ++ NSScreen *nsscreen = [[NSScreen screens] objectAtIndex:0]; ++ NSDictionary *dd = [nsscreen deviceDescription]; ++ NSSize size = [[dd valueForKey:NSDeviceResolution] sizeValue]; ++ float dpi = size.width / [nsscreen backingScaleFactor]; ++ return (pixels / dpi) * mm_per_inch; + } + + static NSScreen * diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 49dcb9d617..163e7a4a42 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.83"; + public const string MonoVersion = "5.14.0.84"; 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 45004eec26..cf9464c46b 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 @@ -55c94cc46f44e890909e1a1237b9d55741a80176 \ No newline at end of file +839f103c74c88a2801043484a09e75202ae8a629 \ 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 7645d9b72b..1fad0d6224 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 @@ -604cebbdda77e512fc380aec7cea894cc3e6da9b \ No newline at end of file +8739aeb1983d811097942dd8fb6f8a674a22aac2 \ 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 b418c78efc..fda2265b19 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 @@ -c2513545611e5b10c41fda45508d1bb39eab33c5 \ No newline at end of file +6ecc97919483a7056c7d9a1ab1cf8e1b93cf3a74 \ 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 8fab36405e..85f6f1f0c4 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 @@ -5af118d177d5fde31ecf9f4e276a89370e91907b \ No newline at end of file +7a661b2772a14658cc6e7d56c202f37cb6186b3c \ 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 4945d18351..1e83d30969 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 @@ -86e43db36a6a6c3b63aac0960035b180c0a1df09 \ No newline at end of file +da054b18cf6764ce57924ba093e1a85453cdcc22 \ 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 50e4f35d0b..ac20c3a766 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 @@ -cc7d1e4073fd991d75c5b30b8e7179febba5f5ae \ No newline at end of file +f129ce3303c180773a392cc1e2d50244de2d5119 \ 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 e24c1ce159..67bb96a012 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 @@ -11a855bf7b4a86a5f4de47eaf9a0bbf5c482828f \ No newline at end of file +6a9ab2371c41b004ae342b7145a67a2583c21672 \ 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 45004eec26..cf9464c46b 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 @@ -55c94cc46f44e890909e1a1237b9d55741a80176 \ No newline at end of file +839f103c74c88a2801043484a09e75202ae8a629 \ 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 7645d9b72b..1fad0d6224 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 @@ -604cebbdda77e512fc380aec7cea894cc3e6da9b \ No newline at end of file +8739aeb1983d811097942dd8fb6f8a674a22aac2 \ 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 b418c78efc..fda2265b19 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 @@ -c2513545611e5b10c41fda45508d1bb39eab33c5 \ No newline at end of file +6ecc97919483a7056c7d9a1ab1cf8e1b93cf3a74 \ 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 8fab36405e..85f6f1f0c4 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 @@ -5af118d177d5fde31ecf9f4e276a89370e91907b \ No newline at end of file +7a661b2772a14658cc6e7d56c202f37cb6186b3c \ 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 4945d18351..1e83d30969 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 @@ -86e43db36a6a6c3b63aac0960035b180c0a1df09 \ No newline at end of file +da054b18cf6764ce57924ba093e1a85453cdcc22 \ 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 50e4f35d0b..ac20c3a766 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 @@ -cc7d1e4073fd991d75c5b30b8e7179febba5f5ae \ No newline at end of file +f129ce3303c180773a392cc1e2d50244de2d5119 \ 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 e24c1ce159..67bb96a012 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 @@ -11a855bf7b4a86a5f4de47eaf9a0bbf5c482828f \ No newline at end of file +6a9ab2371c41b004ae342b7145a67a2583c21672 \ 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 45004eec26..cf9464c46b 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 @@ -55c94cc46f44e890909e1a1237b9d55741a80176 \ No newline at end of file +839f103c74c88a2801043484a09e75202ae8a629 \ 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 7645d9b72b..1fad0d6224 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 @@ -604cebbdda77e512fc380aec7cea894cc3e6da9b \ No newline at end of file +8739aeb1983d811097942dd8fb6f8a674a22aac2 \ 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 b418c78efc..fda2265b19 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 @@ -c2513545611e5b10c41fda45508d1bb39eab33c5 \ No newline at end of file +6ecc97919483a7056c7d9a1ab1cf8e1b93cf3a74 \ 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 8fab36405e..85f6f1f0c4 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 @@ -5af118d177d5fde31ecf9f4e276a89370e91907b \ No newline at end of file +7a661b2772a14658cc6e7d56c202f37cb6186b3c \ 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 4945d18351..1e83d30969 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 @@ -86e43db36a6a6c3b63aac0960035b180c0a1df09 \ No newline at end of file +da054b18cf6764ce57924ba093e1a85453cdcc22 \ 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 50e4f35d0b..ac20c3a766 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 @@ -cc7d1e4073fd991d75c5b30b8e7179febba5f5ae \ No newline at end of file +f129ce3303c180773a392cc1e2d50244de2d5119 \ 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 e24c1ce159..67bb96a012 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 @@ -11a855bf7b4a86a5f4de47eaf9a0bbf5c482828f \ No newline at end of file +6a9ab2371c41b004ae342b7145a67a2583c21672 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index dcf1326054..5e352bbb2e 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/769481d" +#define FULL_VERSION "explicit/ef73a49" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 2021731009..3009160a83 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 5715b57c56..92ce943030 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -f8a3ce56183760992fee322f999b195410a82ab6 \ No newline at end of file +ef959d144578423707ca4759fd983126329c1825 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index de807de82b..eba2ef7aad 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 3153c20c02..417322746f 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -17a6aac5c8e05f53fb8a918a208d4c8eab4feb87 \ No newline at end of file +cd29947cabf89d5fc078b042bd5aec5c03dbfe7d \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 7af44e41cc..64d4881d32 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 b694b1dfaf..0f7791ffe1 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -a9bb86508f66e240f874f2cfb230d75a21c378c8 \ No newline at end of file +b6b7fff5dfaa2b225d6ad637b312d2dcabebb1a8 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index ad12798321..54c5745868 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.83\n" +"Project-Id-Version: mono 5.14.0.84\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-05-15 08:25+0000\n" +"POT-Creation-Date: 2018-05-16 08:17+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 8f7efa25c8..6ea2e6509c 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 7ee6e5c115..d838f06cbb 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -9ef36f4ed26a59c61da6aa1b6b65ad6263440d5f \ No newline at end of file +716bc7bb4d29c455ce1af5b07a810f685cacf2da \ No newline at end of file