Accepting request 432355 from home:Mailaender:branches:Mono:Factory

woops

OBS-URL: https://build.opensuse.org/request/show/432355
OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=176

bxc-44402.patch

@@ -1,96 +0,0 @@
-From 0dfef7b3453a1599806b8be04cf42f9b67c2e592 Mon Sep 17 00:00:00 2001
-From: Marek Safar <marek.safar@gmail.com>
-Date: Fri, 16 Sep 2016 13:12:34 +0200
-Subject: [PATCH] [mcs] Delay array base type interfaces initialization. Fixes
- #44402
-
----
- mcs/mcs/typespec.cs | 30 ++++++++++++++++++++++++++----
- 1 file changed, 26 insertions(+), 4 deletions(-)
-
-diff --git a/mcs/mcs/typespec.cs b/mcs/mcs/typespec.cs
-index fb02370d..696bde5 100644
---- a/mcs/mcs/typespec.cs
-+++ b/mcs/mcs/typespec.cs
-@@ -109,7 +109,6 @@ public TypeSpec (MemberKind kind, TypeSpec declaringType, ITypeDefinition defini
- 					var imported = MemberDefinition as ImportedTypeDefinition;
- 					if (imported != null && Kind != MemberKind.MissingType)
- 						imported.DefineInterfaces (this);
--
- 				}
- 
- 				return ifaces;
-@@ -1603,6 +1602,12 @@ protected ElementTypeSpec (MemberKind kind, TypeSpec element, MetaType info)
- 
- 		public TypeSpec Element { get; private set; }
- 
-+		public override IList<TypeSpec> Interfaces {
-+			set {
-+				throw new NotSupportedException ();
-+			}
-+		}
-+
- 		bool ITypeDefinition.IsComImport {
- 			get {
- 				return false;
-@@ -1777,13 +1782,19 @@ public bool Equals (TypeRankPair other)
- 		readonly int rank;
- 		readonly ModuleContainer module;
- 
--		private ArrayContainer (ModuleContainer module, TypeSpec element, int rank)
-+		ArrayContainer (ModuleContainer module, TypeSpec element, int rank)
- 			: base (MemberKind.ArrayType, element, null)
- 		{
- 			this.module = module;
- 			this.rank = rank;
- 		}
- 
-+		public override IList<TypeSpec> Interfaces {
-+			get {
-+				return BaseType.Interfaces;
-+			}
-+		}
-+
- 		public int Rank {
- 			get {
- 				return rank;
-@@ -1926,7 +1937,6 @@ public static ArrayContainer MakeType (ModuleContainer module, TypeSpec element,
- 			if (!module.ArrayTypesCache.TryGetValue (key, out ac)) {
- 				ac = new ArrayContainer (module, element, rank);
- 				ac.BaseType = module.Compiler.BuiltinTypes.Array;
--				ac.Interfaces = ac.BaseType.Interfaces;
- 
- 				module.ArrayTypesCache.Add (key, ac);
- 			}
-@@ -1942,11 +1952,17 @@ public override List<MissingTypeSpecReference> ResolveMissingDependencies (Membe
- 
- 	class ReferenceContainer : ElementTypeSpec
- 	{
--		private ReferenceContainer (TypeSpec element)
-+		ReferenceContainer (TypeSpec element)
- 			: base (MemberKind.Class, element, null)	// TODO: Kind.Class is most likely wrong
- 		{
- 		}
- 
-+		public override IList<TypeSpec> Interfaces {
-+			get {
-+				return null;
-+			}
-+		}
-+
- 		public override MetaType GetMetaInfo ()
- 		{
- 			if (info == null) {
-@@ -1977,6 +1993,12 @@ private PointerContainer (TypeSpec element)
- 			state &= ~StateFlags.CLSCompliant_Undetected;
- 		}
- 
-+		public override IList<TypeSpec> Interfaces {
-+			get {
-+				return null;
-+			}
-+		}
-+
- 		public override MetaType GetMetaInfo ()
- 		{
- 			if (info == null) {

mono-4.6.0.245.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2981f518cace63bfe10953fecd57c7fef040077a1ac617967dde5466062c1327
-size 83214380

mono-4.6.1.3.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a5d4cec3d4676fcd7bcbc59b5ab12dc9a2481abbd10017a2ed737098a6b2e891
+size 83229465

mono-core.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Oct  2 08:26:07 UTC 2016 - mailaender@opensuse.org
+
+- Update to version 4.6.1 (Bugfix release)
+  * bxc#44402 - Array doesn’t implement non-generic IEnumerable
+- Drop upstream applied bxc-44402.patch
+
 -------------------------------------------------------------------
 Tue Sep 27 18:00:00 UTC 2016 - fwdsbs.to.11df@xoxy.net
 

mono-core.spec

@@ -21,13 +21,13 @@
 %define sgen yes
 
 Name:           mono-core
-Version:        4.6.0
+Version:        4.6.1
 Release:        0
 Summary:        Cross-platform, Open Source, .NET development framework
 License:        LGPL-2.1 and MIT and MS-PL
 Group:          Development/Languages/Mono
 Url:            http://www.mono-project.com
-Source0:        http://download.mono-project.com/sources/mono/mono-%{version}.245.tar.bz2
+Source0:        http://download.mono-project.com/sources/mono/mono-%{version}.3.tar.bz2
 Source1:        mono-core.rpmlintrc
 Source2:        gmcs
 # ppc build segfault so exclude it
@@ -36,8 +36,6 @@ ExcludeArch:    ppc
 Patch14:        find-deps-fix.patch
 # PATCH-FIX-OPENSUSE fix incorrect $mono_libdir substitution for libMonoPosixHelper.so library when native library dir (/usr/lib64 on x86_64) is different from mono lib dir (/usr/lib)
 Patch15:        mono-config-fix-monoposixhelper-libdir.patch
-# PATCH-FIX-UPSTREAM https://bugzilla.xamarin.com/show_bug.cgi?id=44402 ; https://github.com/mono/mono/commit/0dfef7b3453a1599806b8be04cf42f9b67c2e592
-Patch16:        bxc-44402.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
@@ -171,7 +169,6 @@ technologies that have been submitted to the ECMA for standardization.
 %setup -q -n mono-%{version}
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
 
 %build
 NOCONFIGURE="yes" ./autogen.sh