[Pkg-cli-apps-commits] r4818 - in /packages/monodevelop/trunk/debian: changelog patches/00list patches/monodevelop_fix_addin_highlights_r130904.dpatch
directhex-guest at users.alioth.debian.org
directhex-guest at users.alioth.debian.org
Wed Apr 8 18:21:39 UTC 2009
Author: directhex-guest
Date: Wed Apr 8 18:21:39 2009
New Revision: 4818
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4818
Log:
* debian/patches/monodevelop_fix_addin_highlights_r130904.dpatch:
+ Backported fix from 2.0 branch to fix breakage in highlighting
for addins (and possible resource leakage with them too)
Added:
packages/monodevelop/trunk/debian/patches/monodevelop_fix_addin_highlights_r130904.dpatch (with props)
Modified:
packages/monodevelop/trunk/debian/changelog
packages/monodevelop/trunk/debian/patches/00list
Modified: packages/monodevelop/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/changelog?rev=4818&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/changelog (original)
+++ packages/monodevelop/trunk/debian/changelog Wed Apr 8 18:21:39 2009
@@ -1,3 +1,11 @@
+monodevelop (2.0+dfsg-2) UNRELEASED; urgency=low
+
+ * debian/patches/monodevelop_fix_addin_highlights_r130904.dpatch:
+ + Backported fix from 2.0 branch to fix breakage in highlighting
+ for addins (and possible resource leakage with them too)
+
+ -- Jo Shields <directhex at apebox.org> Wed, 08 Apr 2009 19:18:29 +0100
+
monodevelop (2.0+dfsg-1) unstable; urgency=low
* New upstream release
Modified: packages/monodevelop/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/00list?rev=4818&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/patches/00list (original)
+++ packages/monodevelop/trunk/debian/patches/00list Wed Apr 8 18:21:39 2009
@@ -5,3 +5,4 @@
update_templates_for_gtk-sharp_2.12
boo_mimetype
use_csc
+monodevelop_fix_addin_highlights_r130904
Added: packages/monodevelop/trunk/debian/patches/monodevelop_fix_addin_highlights_r130904.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/monodevelop_fix_addin_highlights_r130904.dpatch?rev=4818&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/patches/monodevelop_fix_addin_highlights_r130904.dpatch (added)
+++ packages/monodevelop/trunk/debian/patches/monodevelop_fix_addin_highlights_r130904.dpatch Wed Apr 8 18:21:39 2009
@@ -1,0 +1,168 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## monodevelop_fix_addin_highlights_r130904.dpatch by Jo Shields <directhex at apebox.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backport from 2.0 branch to fix highlights (and possible resource leakage
+## DP: in addin highlighing)
+
+ at DPATCH@
+Index: 2.0/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateCodon.cs
+===================================================================
+--- 2.0/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateCodon.cs (revision 130903)
++++ 2.0/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateCodon.cs (revision 130904)
+@@ -46,7 +46,7 @@
+ resource = file = null;
+ }
+
+- public XmlTextReader Open ()
++ public XmlReader Open ()
+ {
+ Stream stream;
+ if (!string.IsNullOrEmpty (file)) {
+@@ -59,9 +59,9 @@
+ throw new InvalidOperationException ("Template file or resource not provided");
+ }
+
+- using (stream) {
+- return new XmlTextReader (stream);
+- }
++ XmlReaderSettings settings = new XmlReaderSettings ();
++ settings.CloseInput = true;
++ return XmlTextReader.Create (stream, settings);
+ }
+ }
+ }
+Index: 2.0/src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxModeService.cs
+===================================================================
+--- 2.0/src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxModeService.cs (revision 130903)
++++ 2.0/src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxModeService.cs (revision 130904)
+@@ -88,7 +88,7 @@
+ {
+ if (!styleLookup.ContainsKey (name))
+ throw new System.ArgumentException ("Style " + name + " not found", "name");
+- XmlTextReader reader = styleLookup [name].Open ();
++ XmlReader reader = styleLookup [name].Open ();
+ try {
+ styles [name] = Style.LoadFrom (reader);
+ } finally {
+@@ -100,7 +100,7 @@
+ {
+ if (!syntaxModeLookup.ContainsKey (mimeType))
+ throw new System.ArgumentException ("Syntax mode for mime:" + mimeType + " not found", "mimeType");
+- XmlTextReader reader = syntaxModeLookup [mimeType].Open ();
++ XmlReader reader = syntaxModeLookup [mimeType].Open ();
+ try {
+ SyntaxMode mode = SyntaxMode.Read (reader);
+ foreach (string mime in mode.MimeType.Split (';')) {
+@@ -463,7 +463,7 @@
+ queueSignal.Set ();
+ }
+
+- static string Scan (XmlTextReader reader, string attribute)
++ static string Scan (XmlReader reader, string attribute)
+ {
+ while (reader.Read () && !reader.IsStartElement ())
+ ;
+@@ -524,25 +524,29 @@
+ if (!resource.EndsWith (".xml"))
+ continue;
+ if (resource.EndsWith ("SyntaxMode.xml")) {
+- XmlTextReader reader = new XmlTextReader (assembly.GetManifestResourceStream (resource));
+- string mimeTypes = Scan (reader, SyntaxMode.MimeTypesAttribute);
+- ResourceXmlProvider provider = new ResourceXmlProvider (assembly, resource);
+- foreach (string mimeType in mimeTypes.Split (';')) {
+- syntaxModeLookup [mimeType] = provider;
++ using (Stream stream = assembly.GetManifestResourceStream (resource)) {
++ XmlTextReader reader = new XmlTextReader (stream);
++ string mimeTypes = Scan (reader, SyntaxMode.MimeTypesAttribute);
++ ResourceXmlProvider provider = new ResourceXmlProvider (assembly, resource);
++ foreach (string mimeType in mimeTypes.Split (';')) {
++ syntaxModeLookup [mimeType] = provider;
++ }
++ reader.Close ();
+ }
+- reader.Close ();
+ } else if (resource.EndsWith ("Style.xml")) {
+- XmlTextReader reader = new XmlTextReader (assembly.GetManifestResourceStream (resource));
+- string styleName = Scan (reader, Style.NameAttribute);
+- styleLookup [styleName] = new ResourceXmlProvider (assembly, resource);
+- reader.Close ();
++ using (Stream stream = assembly.GetManifestResourceStream (resource)) {
++ XmlTextReader reader = new XmlTextReader (stream);
++ string styleName = Scan (reader, Style.NameAttribute);
++ styleLookup [styleName] = new ResourceXmlProvider (assembly, resource);
++ reader.Close ();
++ }
+ }
+ }
+ }
+
+ public static void AddSyntaxMode (IXmlProvider provider)
+ {
+- using (XmlTextReader reader = provider.Open ()) {
++ using (XmlReader reader = provider.Open ()) {
+ string mimeTypes = Scan (reader, SyntaxMode.MimeTypesAttribute);
+ foreach (string mimeType in mimeTypes.Split (';')) {
+ syntaxModeLookup [mimeType] = provider;
+@@ -552,7 +556,7 @@
+
+ public static void RemoveSyntaxMode (IXmlProvider provider)
+ {
+- using (XmlTextReader reader = provider.Open ()) {
++ using (XmlReader reader = provider.Open ()) {
+ string mimeTypes = Scan (reader, SyntaxMode.MimeTypesAttribute);
+ foreach (string mimeType in mimeTypes.Split (';')) {
+ syntaxModeLookup.Remove (mimeType);
+@@ -562,14 +566,14 @@
+
+ public static void AddStyle (IXmlProvider provider)
+ {
+- using (XmlTextReader reader = provider.Open ()) {
++ using (XmlReader reader = provider.Open ()) {
+ string styleName = Scan (reader, Style.NameAttribute);
+ styleLookup [styleName] = provider;
+ }
+ }
+ public static void RemoveStyle (IXmlProvider provider)
+ {
+- using (XmlTextReader reader = provider.Open ()) {
++ using (XmlReader reader = provider.Open ()) {
+ string styleName = Scan (reader, Style.NameAttribute);
+ styleLookup.Remove (styleName);
+ }
+Index: 2.0/src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/IXmlProvider.cs
+===================================================================
+--- 2.0/src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/IXmlProvider.cs (revision 130903)
++++ 2.0/src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/IXmlProvider.cs (revision 130904)
+@@ -32,7 +32,7 @@
+ {
+ public interface IXmlProvider
+ {
+- XmlTextReader Open ();
++ XmlReader Open ();
+ }
+
+ public class ResourceXmlProvider : IXmlProvider
+@@ -58,9 +58,11 @@
+ this.manifestResourceName = manifestResourceName;
+ }
+
+- public XmlTextReader Open ()
++ public XmlReader Open ()
+ {
+- return new XmlTextReader (this.assembly.GetManifestResourceStream (this.ManifestResourceName));
++ XmlReaderSettings settings = new XmlReaderSettings ();
++ settings.CloseInput = true;
++ return XmlTextReader.Create (this.assembly.GetManifestResourceStream (this.ManifestResourceName), settings);
+ }
+ }
+
+@@ -79,7 +81,7 @@
+ this.url = url;
+ }
+
+- public XmlTextReader Open ()
++ public XmlReader Open ()
+ {
+ return new XmlTextReader (url);
+ }
Propchange: packages/monodevelop/trunk/debian/patches/monodevelop_fix_addin_highlights_r130904.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-cli-apps-commits
mailing list