Accepting request 34491 from Mono:Factory

Copy from Mono:Factory/mono-core based on submit request 34491 from user coolo

OBS-URL: https://build.opensuse.org/request/show/34491
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mono-core?expand=0&rev=37

_g_boolean_expr.patch

@@ -0,0 +1,13 @@
+Index: mono/metadata/object-internals.h
+===================================================================
+--- mono/metadata/object-internals.h	(revision 153372)
++++ mono/metadata/object-internals.h	(revision 153373)
+@@ -27,7 +27,7 @@
+  */
+ #ifdef _G_BOOLEAN_EXPR
+ #undef _G_BOOLEAN_EXPR
+-#define _G_BOOLEAN_EXPR(expr) (gsize)(expr)
++#define _G_BOOLEAN_EXPR(expr) ((gsize)(expr) != 0)
+ #endif
+ 
+ #if 1

mono-2.6.1.tar.bz2

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

mono-2.6.3.tar.bz2

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

mono-cleanup_crash.patch

@@ -1,28 +0,0 @@
---- mono/metadata/domain.c
-+++ mono/metadata/domain.c
-@@ -1907,6 +1907,12 @@
- 		domain->type_init_exception_hash = NULL;
- 	}
- 
-+	/* must do this early as it accesses fields and types */
-+	if (domain->special_static_fields) {
-+		mono_alloc_special_static_data_free (domain->special_static_fields);
-+		g_hash_table_destroy (domain->special_static_fields);
-+		domain->special_static_fields = NULL;
-+	}
- 	for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) {
- 		MonoAssembly *ass = tmp->data;
- 		mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Unloading domain %s %p, assembly %s %p, refcount=%d\n", domain->friendly_name, domain, ass->aname.name, ass, ass->ref_count);
-@@ -1929,12 +1935,6 @@
- 	domain->null_reference_ex = NULL;
- 	domain->stack_overflow_ex = NULL;
- 	domain->entry_assembly = NULL;
--	/* must do this early as it accesses fields and types */
--	if (domain->special_static_fields) {
--		mono_alloc_special_static_data_free (domain->special_static_fields);
--		g_hash_table_destroy (domain->special_static_fields);
--		domain->special_static_fields = NULL;
--	}
- 
- 	g_free (domain->friendly_name);
- 	domain->friendly_name = NULL;

mono-core.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar  2 20:12:24 UTC 2010 - ajorgensen@novell.com
+
+- Update to 2.6.3
+  * http://www.mono-project.com/Release_Notes_Mono_2.6.3
+- Obsoleted patches
+
 -------------------------------------------------------------------
 Mon Mar  1 17:12:06 CET 2010 - ro@suse.de
 

mono-core.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package mono-core (Version 2.6.1)
+# spec file for package mono-core (Version 2.6.3)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -24,12 +24,11 @@ License:        LGPLv2.1
 Group:          Development/Languages/Mono
 Summary:        A .NET Runtime Environment
 Url:            http://go-mono.org/
-Version:        2.6.1
+Version:        2.6.3
-Release:        2
+Release:        1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        mono-%{version}.tar.bz2
-Patch0:         xen-aot.patch
+Patch0:         _g_boolean_expr.patch
-Patch1:         mono-cleanup_crash.patch
 ExclusiveArch:  %ix86 x86_64 ppc ppc64 hppa armv4l sparc s390 ia64 s390x
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       mono = %{version}-%{release}
@@ -517,7 +516,9 @@ Authors:
 %_prefix/lib/mono/2.0/System.Management.dll
 %_prefix/lib/mono/gac/RabbitMQ.Client
 %_prefix/lib/mono/1.0/RabbitMQ.Client.dll
+%_prefix/lib/mono/1.0/RabbitMQ.Client.Apigen.exe*
 %_prefix/lib/mono/2.0/RabbitMQ.Client.dll
+%_prefix/lib/mono/2.0/RabbitMQ.Client.Apigen.exe*
 %_prefix/lib/mono/gac/System.Messaging
 %_prefix/lib/mono/1.0/System.Messaging.dll
 %_prefix/lib/mono/2.0/System.Messaging.dll
@@ -1231,7 +1232,6 @@ Authors:
 %prep
 %setup -q -n mono-%{version}
 %patch0
-%patch1
 
 %build
 # These are only needed if there are patches to the runtime

xen-aot.patch

@@ -1,28 +0,0 @@
-Index: mono/mini/mini-amd64.c
-===================================================================
---- mono/mini/mini-amd64.c	(revision 149672)
-+++ mono/mini/mini-amd64.c	(revision 149673)
-@@ -2558,11 +2558,6 @@
- 			/* These methods are allocated using malloc */
- 			near_call = FALSE;
- 
--		if (cfg->compile_aot) {
--			near_call = TRUE;
--			no_patch = TRUE;
--		}
--
- #ifdef MONO_ARCH_NOMAP32BIT
- 		near_call = FALSE;
- #endif
-@@ -2571,6 +2566,11 @@
- 		if (optimize_for_xen)
- 			near_call = FALSE;
- 
-+		if (cfg->compile_aot) {
-+			near_call = TRUE;
-+			no_patch = TRUE;
-+		}
-+
- 		if (near_call) {
- 			/* 
- 			 * Align the call displacement to an address divisible by 4 so it does