[Pkg-mono-svn-commits] rev 3601 - in mono/trunk/debian: . patches

[Sebastian Dröge]

Author: slomo
Date: 2008-03-20 19:17:48 +0000 (Thu, 20 Mar 2008)
New Revision: 3601

Added:
   mono/trunk/debian/patches/method-signature-testing.dpatch
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/patches/00list
Log:
* debian/patches/method-signature-testing.dpatch:
  + Patch from upstream SVN to fix db4o build failure with cecil 0.6,
    improves checking of method signatures.

Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2008-03-20 15:16:10 UTC (rev 3600)
+++ mono/trunk/debian/changelog	2008-03-20 19:17:48 UTC (rev 3601)
@@ -1,3 +1,11 @@
+mono (1.2.6+dfsg-7) UNRELEASED; urgency=low
+
+  * debian/patches/method-signature-testing.dpatch:
+    + Patch from upstream SVN to fix db4o build failure with cecil 0.6,
+      improves checking of method signatures.
+
+ -- Sebastian Dröge <slomo at debian.org>  Thu, 20 Mar 2008 20:14:49 +0100
+
 mono (1.2.6+dfsg-6) unstable; urgency=high
 
   * debian/mono-mcs.postinst

Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list	2008-03-20 15:16:10 UTC (rev 3600)
+++ mono/trunk/debian/patches/00list	2008-03-20 19:17:48 UTC (rev 3601)
@@ -9,3 +9,4 @@
 fix_implicit_pointer_conversions
 ppc_fix_flushing_of_icache_r92014
 fix_threads.h
+method-signature-testing.dpatch

Added: mono/trunk/debian/patches/method-signature-testing.dpatch
===================================================================
--- mono/trunk/debian/patches/method-signature-testing.dpatch	                        (rev 0)
+++ mono/trunk/debian/patches/method-signature-testing.dpatch	2008-03-20 19:17:48 UTC (rev 3601)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+
+Index: mono/mcs/mcs/class.cs
+===================================================================
+--- mono/mcs/mcs/class.cs	(Revision 94888)
++++ mono/mcs/mcs/class.cs	(Revision 94889)
+@@ -8312,14 +8312,15 @@
+ 				ReturnType = pi.PropertyType;
+ 			else
+ 				return false;
+-			
++
+ 			//
+ 			// we use sig.RetType == null to mean `do not check the
+ 			// method return value.  
+ 			//
+-			if (sig.RetType != null)
+-				if (ReturnType != sig.RetType)
++			if (sig.RetType != null) {
++				if (!TypeManager.IsEqual (ReturnType, sig.RetType))
+ 					return false;
++			}
+ 
+ 			Type [] args;
+ 			if (mi != null)
+