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

Imported Upstream version 5.14.0.84

Browse Source 
Former-commit-id: e5f8f1d50c120c9125a03f9dccb1701969e9a257
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-05-16 08:41:46 +00:00
parent 6c35b8ab10
commit ee1763fb41
36 changed files with 81 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
9ff6063dc10c3a86e9906912d420f8547b64b71b
140ec3920dca207f77ab9142ac89bc455003ef76

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

@ -1 +1 @@
29c799e5f85353ded9628d88add0ef0df3500006
003a94bb3fbe2c4593a6c218379c80858e571b8f

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

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

47
external/bockbuild/packages/patches/gtk/gtk-backing-scale-factor.patch vendored Normal file
View File

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

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.
//
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";

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

@ -1 +1 @@
55c94cc46f44e890909e1a1237b9d55741a80176
839f103c74c88a2801043484a09e75202ae8a629

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

@ -1 +1 @@
604cebbdda77e512fc380aec7cea894cc3e6da9b
8739aeb1983d811097942dd8fb6f8a674a22aac2

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

@ -1 +1 @@
c2513545611e5b10c41fda45508d1bb39eab33c5
6ecc97919483a7056c7d9a1ab1cf8e1b93cf3a74

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

@ -1 +1 @@
5af118d177d5fde31ecf9f4e276a89370e91907b
7a661b2772a14658cc6e7d56c202f37cb6186b3c

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

@ -1 +1 @@
86e43db36a6a6c3b63aac0960035b180c0a1df09
da054b18cf6764ce57924ba093e1a85453cdcc22

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

@ -1 +1 @@
cc7d1e4073fd991d75c5b30b8e7179febba5f5ae
f129ce3303c180773a392cc1e2d50244de2d5119

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

@ -1 +1 @@
11a855bf7b4a86a5f4de47eaf9a0bbf5c482828f
6a9ab2371c41b004ae342b7145a67a2583c21672

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

@ -1 +1 @@
55c94cc46f44e890909e1a1237b9d55741a80176
839f103c74c88a2801043484a09e75202ae8a629

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

@ -1 +1 @@
604cebbdda77e512fc380aec7cea894cc3e6da9b
8739aeb1983d811097942dd8fb6f8a674a22aac2

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

@ -1 +1 @@
c2513545611e5b10c41fda45508d1bb39eab33c5
6ecc97919483a7056c7d9a1ab1cf8e1b93cf3a74

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

@ -1 +1 @@
5af118d177d5fde31ecf9f4e276a89370e91907b
7a661b2772a14658cc6e7d56c202f37cb6186b3c

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

@ -1 +1 @@
86e43db36a6a6c3b63aac0960035b180c0a1df09
da054b18cf6764ce57924ba093e1a85453cdcc22

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

@ -1 +1 @@
cc7d1e4073fd991d75c5b30b8e7179febba5f5ae
f129ce3303c180773a392cc1e2d50244de2d5119

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

@ -1 +1 @@
11a855bf7b4a86a5f4de47eaf9a0bbf5c482828f
6a9ab2371c41b004ae342b7145a67a2583c21672

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

@ -1 +1 @@
55c94cc46f44e890909e1a1237b9d55741a80176
839f103c74c88a2801043484a09e75202ae8a629

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

@ -1 +1 @@
604cebbdda77e512fc380aec7cea894cc3e6da9b
8739aeb1983d811097942dd8fb6f8a674a22aac2

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

@ -1 +1 @@
c2513545611e5b10c41fda45508d1bb39eab33c5
6ecc97919483a7056c7d9a1ab1cf8e1b93cf3a74

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

@ -1 +1 @@
5af118d177d5fde31ecf9f4e276a89370e91907b
7a661b2772a14658cc6e7d56c202f37cb6186b3c

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

@ -1 +1 @@
86e43db36a6a6c3b63aac0960035b180c0a1df09
da054b18cf6764ce57924ba093e1a85453cdcc22

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

@ -1 +1 @@
cc7d1e4073fd991d75c5b30b8e7179febba5f5ae
f129ce3303c180773a392cc1e2d50244de2d5119

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

@ -1 +1 @@
11a855bf7b4a86a5f4de47eaf9a0bbf5c482828f
6a9ab2371c41b004ae342b7145a67a2583c21672

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/769481d"
#define FULL_VERSION "explicit/ef73a49"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
f8a3ce56183760992fee322f999b195410a82ab6
ef959d144578423707ca4759fd983126329c1825

BIN
po/mcs/es.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
17a6aac5c8e05f53fb8a918a208d4c8eab4feb87
cd29947cabf89d5fc078b042bd5aec5c03dbfe7d

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
a9bb86508f66e240f874f2cfb230d75a21c378c8
b6b7fff5dfaa2b225d6ad637b312d2dcabebb1a8

4
po/mcs/mcs.pot
View File

@ -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 <EMAIL@ADDRESS>\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 @@
9ef36f4ed26a59c61da6aa1b6b65ad6263440d5f
716bc7bb4d29c455ce1af5b07a810f685cacf2da