Merge tag 'debian/4.0.1-0xamarin5'

mono Debian release 4.0.1-0xamarin5


Former-commit-id: 4fc9c32bd6e0385d55e2c21dc7c1178d2e175d7c
This commit is contained in:
Jo Shields 2015-05-14 17:39:35 +01:00
commit 51f3491cf1
3 changed files with 48 additions and 0 deletions

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
mono (4.0.1-0xamarin5) unstable; urgency=medium
* [fe44de8] Add a hard dependency on ca-certificates-mono
to mono-complete. This is needed for distributions like
Mint which install without Recommends: by default.
* [7bd9b17] Emergency backport to fix #29667
-- Jo Shields <jo.shields@xamarin.com> Tue, 12 May 2015 16:16:31 +0100
mono (4.0.1-0xamarin4) unstable; urgency=medium
* [68faaca] Fix missing Mono.Xbuild.Tasks

View File

@ -0,0 +1,38 @@
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

@ -1,2 +1,3 @@
0001-system.runtime.caching-Remove-inappropropriate-use-o.patch
import-amd64-tramp-size.patch
rename-and-package-symbolicate.patch