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

[Mirco Bauer]

Author: meebey-guest
Date: 2005-10-16 19:24:07 +0000 (Sun, 16 Oct 2005)
New Revision: 2081

Added:
   mono/trunk/debian/patches/fix_xsp2_inherits.dpatch
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/patches/00list
Log:
- added XSP2 patch



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2005-10-16 19:06:40 UTC (rev 2080)
+++ mono/trunk/debian/changelog	2005-10-16 19:24:07 UTC (rev 2081)
@@ -10,6 +10,9 @@
         will be in the XSP package (mono-xsp-base) instead.
     + debian/patches/s390_compile_fix.dpatch:
       - Updated the patch, one "break" was missing in an empty default label.
+    + debian/patches/fix_xsp2_inherits.dpatch:
+      - Added patch to fix class inheritance with XSP2.
+        (thanks to Dylan R. E. Moonfire <d.moonfire at mfgames.com> for the patch)
 
  -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sun, 16 Oct 2005 14:01:28 +0200
 

Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list	2005-10-16 19:06:40 UTC (rev 2080)
+++ mono/trunk/debian/patches/00list	2005-10-16 19:24:07 UTC (rev 2081)
@@ -2,3 +2,4 @@
 datetime_doparse_fix
 s390_compile_fix
 64bit_implicit_pointer_cast_fix
+fix_xsp2_inherits

Added: mono/trunk/debian/patches/fix_xsp2_inherits.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_xsp2_inherits.dpatch	2005-10-16 19:06:40 UTC (rev 2080)
+++ mono/trunk/debian/patches/fix_xsp2_inherits.dpatch	2005-10-16 19:24:07 UTC (rev 2081)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_xsp2_inherits.dpatch by Dylan R. E. Moonfire <debian at mfgames.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Temporarily corrects the problem with XSP2 using inherits working 
+## DP: properly. This patch reverts that specific XSP2 code to XSP until 
+## DB: it functions properly from the SVN.
+
+ at DPATCH@
+
+diff -ru mono-1.1.9.1.orig/mcs/class/System.Web/System.Web.UI/TemplateParser.cs mono-1.1.9.1/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
+--- mono-1.1.9.1.orig/mcs/class/System.Web/System.Web.UI/TemplateParser.cs	2005-10-14 08:23:32.000000000 -0500
++++ mono-1.1.9.1/mcs/class/System.Web/System.Web.UI/TemplateParser.cs	2005-10-14 08:24:53.000000000 -0500
+@@ -428,16 +428,13 @@
+ 				srcAssembly = GetAssemblyFromSource (src);
+ 
+ 			string inherits = GetString (atts, "Inherits", null);
+-#if NET_2_0
+-			className = inherits;
+-#else
++
+ 			if (inherits != null)
+ 				SetBaseType (inherits);
+ 
+ 			className = GetString (atts, "ClassName", null);
+ 			if (className != null && !CodeGenerator.IsValidLanguageIndependentIdentifier (className))
+ 				ThrowParseException (String.Format ("'{0}' is not valid for 'className'", className));
+-#endif
+ 
+ 			if (atts.Count > 0)
+ 				ThrowParseException ("Unknown attribute: " + GetOneKey (atts));


Property changes on: mono/trunk/debian/patches/fix_xsp2_inherits.dpatch
___________________________________________________________________
Name: svn:executable
   + *