[Pkg-mono-svn-commits] rev 2054 - in non-group/ndoc/trunk: . patches

Jelmer Vernooij ctrlsoft-guest at costa.debian.org
Sun Oct 2 16:18:32 UTC 2005


Author: ctrlsoft-guest
Date: 2005-10-02 16:18:32 +0000 (Sun, 02 Oct 2005)
New Revision: 2054

Added:
   non-group/ndoc/trunk/patches/01_unused_private_methods.dpatch
   non-group/ndoc/trunk/patches/02_ds_reference.dpatch
Modified:
   non-group/ndoc/trunk/
   non-group/ndoc/trunk/patches/00list
Log:
Add a couple of patches that fix the build for mono. 



Property changes on: non-group/ndoc/trunk
___________________________________________________________________
Name: svn:ignore
   + libndoc-cil
patched
tmp
ndoc
libndoc-dev


Modified: non-group/ndoc/trunk/patches/00list
===================================================================
--- non-group/ndoc/trunk/patches/00list	2005-10-02 15:49:15 UTC (rev 2053)
+++ non-group/ndoc/trunk/patches/00list	2005-10-02 16:18:32 UTC (rev 2054)
@@ -0,0 +1,2 @@
+01_unused_private_methods.dpatch
+02_ds_reference.dpatch

Added: non-group/ndoc/trunk/patches/01_unused_private_methods.dpatch
===================================================================
--- non-group/ndoc/trunk/patches/01_unused_private_methods.dpatch	2005-10-02 15:49:15 UTC (rev 2053)
+++ non-group/ndoc/trunk/patches/01_unused_private_methods.dpatch	2005-10-02 16:18:32 UTC (rev 2054)
@@ -0,0 +1,146 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_unused_private_methods.dpatch by  <jelmer at samba.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix dir seperator for POSIX
+
+ at DPATCH@
+
+--- ndoc-1.3.1.orig/src/Documenter/LinearHtml/LinearHtmlDocumenter.cs	2005-01-30 02:18:37.000000000 +0100
++++ ndoc-1.3.1/src/Documenter/LinearHtml/LinearHtmlDocumenter.cs	2005-09-25 22:24:40.000000000 +0200
+@@ -607,17 +607,6 @@
+ 			return(sortedList);
+ 		}
+ 
+-		void GetSummaryAndRemarks(XPathNavigator nav, out string summary, out string remarks)
+-		{
+-			XPathNavigator summaryNav = GetDescendantNodeWithName(nav, "summary");
+-			XPathNavigator remarksNav = GetDescendantNodeWithName(nav, "remarks");
+-			summary = GetNodeXmlFixCode(summaryNav);
+-			if (summaryNav != null)
+-				Console.WriteLine("GSAR: got {0} from {1}", summary, summaryNav.Value);
+-			else Console.WriteLine("GSAR: No summary");
+-			remarks = GetNodeXmlFixCode(remarksNav);
+-		}
+-
+ 		/// <summary>
+ 		/// Fix code node such that it will be rendered correctly (using pre).
+ 		/// </summary>
+@@ -631,27 +620,6 @@
+ 		}
+ 
+ 		/// <summary>
+-		/// Fix code node such that it will be rendered correctly (using pre).
+-		/// </summary>
+-		private void FixCodeNodes(XPathNavigator nav)
+-		{
+-			XmlNode n = null;
+-			try
+-			{
+-				n = ((IHasXmlNode)nav).GetNode();
+-			}
+-			catch(Exception) 
+-			{
+-				return;
+-			}
+-
+-			if (n != null) 
+-			{
+-				FixCodeNodes(n); // change <code> to <pre class="code">
+-			}
+-		}
+-
+-		/// <summary>
+ 		/// Fix any code nodes under the specified navigator, and return the node's
+ 		/// inner Xml. 
+ 		/// </summary>
+--- ndoc-1.3.1.orig/src/Documenter/LinearHtml/LinearHtmlDocumenterConfig.cs	2005-01-30 02:18:37.000000000 +0100
++++ ndoc-1.3.1/src/Documenter/LinearHtml/LinearHtmlDocumenterConfig.cs	2005-09-25 22:23:47.000000000 +0200
+@@ -115,7 +115,6 @@
+ 				SetDirty();
+ 			}
+ 		}
+-		void ResetOutputDirectory() { _outputDirectory = string.Format( ".{0}doc{0}", Path.DirectorySeparatorChar ); }
+ 
+ 
+ 		private bool _MethodParametersInTable;
+--- ndoc-1.3.1.orig/src/Documenter/Msdn/HtmlHelp.cs	2005-02-19 17:25:08.000000000 +0100
++++ ndoc-1.3.1/src/Documenter/Msdn/HtmlHelp.cs	2005-09-25 22:17:15.000000000 +0200
+@@ -191,11 +191,6 @@
+ 			}
+ 		}
+ 
+-		private string GetProjectFilename()
+-		{
+-			return _projectName + ".hhp";
+-		}
+-
+ 		private string GetContentsFilename()
+ 		{
+ 			return (_tocFiles.Count > 0) ? (string)_tocFiles[0] : string.Empty;
+--- ndoc-1.3.1.orig/src/Documenter/Msdn/MsdnDocumenterConfig.cs	2005-02-19 17:25:08.000000000 +0100
++++ ndoc-1.3.1/src/Documenter/Msdn/MsdnDocumenterConfig.cs	2005-09-25 22:16:00.000000000 +0200
+@@ -98,7 +98,6 @@
+ 				SetDirty();
+ 			}
+ 		}
+-		void ResetOutputDirectory() { _outputDirectory = string.Format( ".{0}doc{0}", Path.DirectorySeparatorChar ); }
+ 
+ 
+ 		/// <summary>Gets or sets the HtmlHelpName property.</summary>
+@@ -418,7 +417,6 @@
+ 				}
+ 			}
+ 		}	
+-		void ResetAdditionalContentResourceDirectory() { _AdditionalContentResourceDirectory = new FolderPath(); }
+ 
+ 
+ 		FilePath _ExtensibilityStylesheet = new FilePath();
+@@ -442,7 +440,6 @@
+ 				}
+ 			}
+ 		}	
+-		void ResetExtensibilityStylesheet() { _ExtensibilityStylesheet = new FilePath(); }
+ 	
+ 		short _LangID = 1033;
+ 
+--- ndoc-1.3.1.orig/src/Documenter/Msdn2/HtmlHelp.cs	2005-02-19 17:33:42.000000000 +0100
++++ ndoc-1.3.1/src/Documenter/Msdn2/HtmlHelp.cs	2005-09-25 22:22:05.000000000 +0200
+@@ -191,11 +191,6 @@
+ 			}
+ 		}
+ 
+-		private string GetProjectFilename()
+-		{
+-			return _projectName + ".hhp";
+-		}
+-
+ 		private string GetContentsFilename()
+ 		{
+			return (_tocFiles.Count > 0) ? (string)_tocFiles[0] : string.Empty;
+--- ndoc-1.3.1.orig/src/Documenter/Msdn2/Msdn2DocumenterConfig.cs	2005-02-19 19:42:11.000000000 +0100
++++ ndoc-1.3.1/src/Documenter/Msdn2/Msdn2DocumenterConfig.cs	2005-09-25 22:20:49.000000000 +0200
+@@ -114,7 +114,6 @@
+ 				SetDirty();
+ 			}
+ 		}
+-		void ResetOutputDirectory() { _outputDirectory = string.Format( ".{0}doc{0}", Path.DirectorySeparatorChar ); }
+ 
+ 
+ 		/// <summary>Gets or sets the HtmlHelpName property.</summary>
+@@ -434,7 +433,6 @@
+ 				}
+ 			}
+ 		}	
+-		void ResetAdditionalContentResourceDirectory() { _AdditionalContentResourceDirectory = new FolderPath(); }
+ 
+ 
+ 		FilePath _ExtensibilityStylesheet = new FilePath();
+@@ -458,7 +456,6 @@
+ 				}
+ 			}
+ 		}	
+-		void ResetExtensibilityStylesheet() { _ExtensibilityStylesheet = new FilePath(); }
+ 	
+ 		short _LangID = 1033;
+ 

Added: non-group/ndoc/trunk/patches/02_ds_reference.dpatch
===================================================================
--- non-group/ndoc/trunk/patches/02_ds_reference.dpatch	2005-10-02 15:49:15 UTC (rev 2053)
+++ non-group/ndoc/trunk/patches/02_ds_reference.dpatch	2005-10-02 16:18:32 UTC (rev 2054)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_ds_reference.dpatch by  <jelmer at samba.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix dir seperator for POSIX
+
+ at DPATCH@
+
+--- ndoc-1.3.1.orig/src/VisualStudio/VisualStudio.build	2004-07-08 08:35:26.000000000 +0200
++++ ndoc-1.3.1/src/VisualStudio/VisualStudio.build	2005-09-25 22:14:11.000000000 +0200
+@@ -9,6 +9,7 @@
+ 			<references>
+ 				<include name="System.dll" />
+ 				<include name="System.Xml.dll" />
++				<include name="System.DirectoryServices.dll" />
+ 			</references>
+ 		</csc>
+ 	</target>




More information about the Pkg-mono-svn-commits mailing list