Refresh needed patches

This commit is contained in:
Jo Shields 2015-05-18 15:01:05 +01:00
parent 3c06656676
commit 867deaabf5
4 changed files with 21 additions and 54 deletions

View File

@ -1,38 +0,0 @@
From ffb5c90e08d2f619b207c07c25b8551f52e9913e Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Sat, 9 May 2015 12:24:20 +0200
Subject: [PATCH] [system.runtime.caching] Remove inappropropriate use of
Marshal.SizeOf. Fixes #29667
---
mcs/class/System.Runtime.Caching/ReferenceSources/SRef.cs | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/mcs/class/System.Runtime.Caching/ReferenceSources/SRef.cs b/mcs/class/System.Runtime.Caching/ReferenceSources/SRef.cs
index ce0812b..644a2fc 100644
--- a/mcs/class/System.Runtime.Caching/ReferenceSources/SRef.cs
+++ b/mcs/class/System.Runtime.Caching/ReferenceSources/SRef.cs
@@ -11,14 +11,17 @@ namespace System.Runtime.Caching {
*/
internal class SRef {
- private Object _sizedRef;
+// private Object _sizedRef;
internal SRef (Object target) {
- _sizedRef = target;
+// _sizedRef = target;
}
internal long ApproximateSize {
- get { return (long) Marshal.SizeOf (_sizedRef.GetType ()); }
+ get {
+ // TODO: .net uses System.SizedReference which contains approximate size after Gen 2 collection
+ return 16;
+ }
}
internal void Dispose() {
--
1.9.1

View File

@ -0,0 +1,20 @@
Index: xamarin-pkg-mono/mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ xamarin-pkg-mono/mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets 2015-05-15 15:55:12.074775985 +0100
@@ -0,0 +1,5 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\Microsoft.Portable.Core.props" />
+ <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+ <Import Project="..\Microsoft.Portable.Core.targets" />
+</Project>
Index: xamarin-pkg-mono/mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ xamarin-pkg-mono/mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets 2015-05-15 15:55:19.194775876 +0100
@@ -0,0 +1,5 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\Microsoft.Portable.Core.props" />
+ <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+ <Import Project="..\Microsoft.Portable.Core.targets" />
+</Project>

View File

@ -1,13 +0,0 @@
Index: xamarin-pkg-mono/mono/mini/tramp-amd64.c
===================================================================
--- xamarin-pkg-mono.orig/mono/mini/tramp-amd64.c 2015-04-28 00:23:39.342850339 +0100
+++ xamarin-pkg-mono/mono/mini/tramp-amd64.c 2015-04-28 00:23:39.338850339 +0100
@@ -995,7 +995,7 @@
status_offset = MONO_THREADS_SYNC_MEMBER_OFFSET (status_offset);
nest_offset = MONO_THREADS_SYNC_MEMBER_OFFSET (nest_offset);
- tramp_size = 96;
+ tramp_size = 128;
code = buf = mono_global_codeman_reserve (tramp_size);

View File

@ -34,8 +34,7 @@ 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}.tar.bz2
Patch0: import-amd64-tramp-size.patch
Patch1: 0001-system.runtime.caching-Remove-inappropropriate-use-o.patch
Patch0: add_missing_vb_portable_targets.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
@ -122,7 +121,6 @@ technologies that have been submitted to the ECMA for standardization.
%prep
%setup -q -n mono-%{__threepartver}
%patch0 -p1
%patch1 -p1
%build
./autogen.sh