Merge branch 'upstream'

Former-commit-id: 16761d1dd410e0fb4f101de42fa0a2aadd2a6cd7
2018-02-09 19:21:17 +00:00 · 2018-02-09 19:21:17 +00:00 · 5a0909af64
commit 5a0909af64
parent 844b564dd4 32bf5370df
41 changed files with 49 additions and 38 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-2f9aab488d9693102bd839af379a13a78a4ae23d
+29934128e74365026cd0e20fc003e23148281b95
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-1c9f6eaaaa26d36b69f66c399686242efa8fd7d6
+8cf64e6d8b3715983f82419725e624b70b0ef99d
--- a/external/bockbuild/packages/gtk+.py
+++ b/external/bockbuild/packages/gtk+.py
@ -1,7 +1,8 @@
-class GtkPackage (GnomeGitPackage):
+class GtkPackage (GitHubPackage):

    def __init__(self):
-        GnomeGitPackage.__init__(self, 'gtk+', '2.24', '280fc402be5fb46b66bcd32056963bb1afb8b54b',
+        GitHubPackage.__init__(self, 'GNOME', 'gtk', '2.24', '280fc402be5fb46b66bcd32056963bb1afb8b54b',
+                                 configure='./autogen.sh --prefix="%{package_prefix}"',
                                 configure_flags=[
                                     '--with-gdktarget=%{gdk_target}',
                                     #				'--disable-cups',
--- a/external/bockbuild/packages/gtk-sharp.py
+++ b/external/bockbuild/packages/gtk-sharp.py
@ -4,7 +4,7 @@ class GtkSharp212ReleasePackage (Package):
        Package.__init__(self, 'gtk-sharp',
                         sources=['git://github.com/mono/gtk-sharp.git'],
                         git_branch='gtk-sharp-2-12-branch',
-                         revision='ae7bbb340c0e4baad27264727f6ca80ebbc882c0',
+                         revision='372b03b5cf68af8088e1fec00c201ea057578021',
                         override_properties={
                             'configure': './bootstrap-2.12 --prefix=%{package_prefix}',
                         }
--- 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.10.0.97";
+	public const string MonoVersion = "5.10.0.101";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";
--- a/mcs/class/Facades/System.IO.Compression.ZipFile/Makefile
+++ b/mcs/class/Facades/System.IO.Compression.ZipFile/Makefile
@ -9,7 +9,7 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades

 LIBRARY = System.IO.Compression.ZipFile.dll

-KEYFILE = ../../msfinal.pub
+KEYFILE = ../../ecma.pub
 SIGN_FLAGS = /delaysign /nowarn:1616,1699
 LIB_REFS = System System.IO.Compression.FileSystem
 LIB_MCS_FLAGS = $(SIGN_FLAGS)
--- a/mcs/class/System.Dynamic/Makefile
+++ b/mcs/class/System.Dynamic/Makefile
@ -5,7 +5,7 @@ include ../../build/rules.make
 LIBRARY = System.Dynamic.dll

 LIB_REFS = System.Core System
-KEYFILE = ../ecma.pub
+KEYFILE = ../msfinal.pub
 LIB_MCS_FLAGS = -unsafe -d:CODEPLEX_40 -nowarn:414,169

 # This is a .NET 4.0+ only assembly
--- a/mcs/class/System.Reflection.Context/Makefile
+++ b/mcs/class/System.Reflection.Context/Makefile
@ -4,7 +4,7 @@ include ../../build/rules.make

 LIBRARY = System.Reflection.Context.dll
 LIB_REFS = System
-KEYFILE = ../msfinal.pub
+KEYFILE = ../ecma.pub
 LIB_MCS_FLAGS =

 NO_TEST = yes
--- a/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-22ae2d91b8cb5ad991d6f1a9be89fecbc6ebfceb
+d5fe529e72a19edabb8d0d737134f42d61076a2e
--- a/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-aeaf953be4227f3fa4aed27009a3c61cce142e08
+d6603fb55c99e4e6a2ab0f992aa575a430a23daf
--- a/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-521445c1f364c498c2a4a278187fea80c0bc92b7
+ca7879c6464de633c5d55777e99f90f6c32b0346
--- a/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-91d0de0de103bc0ddf25a470b305072cce7006dc
+05a25e094cf7053d826c561b6bae1934b651c4cd
--- a/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-4642459db67e852d384e2b69d3bea4ef8137e408
+4dda84573eb2e64b6ce95ccc37cb297d0d96ac26
--- a/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-ac921af4bce9163df2f1a3bd36362db9c48a1003
+2d54b1ef285e46cc986e00ef7bcd7775e3412a56
--- a/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-befa7b6561e99234f70a32950f98512a4d9c29c8
+ffe45e62e511ea47af2a066b17eb0637418d7347
--- a/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-22ae2d91b8cb5ad991d6f1a9be89fecbc6ebfceb
+d5fe529e72a19edabb8d0d737134f42d61076a2e
--- a/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-aeaf953be4227f3fa4aed27009a3c61cce142e08
+d6603fb55c99e4e6a2ab0f992aa575a430a23daf
--- a/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-521445c1f364c498c2a4a278187fea80c0bc92b7
+ca7879c6464de633c5d55777e99f90f6c32b0346
--- a/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-91d0de0de103bc0ddf25a470b305072cce7006dc
+05a25e094cf7053d826c561b6bae1934b651c4cd
--- a/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-4642459db67e852d384e2b69d3bea4ef8137e408
+4dda84573eb2e64b6ce95ccc37cb297d0d96ac26
--- a/Show More
+++ b/Show More