Hello community, here is the log from the commit of package monodevelop for openSUSE:Factory checked in at Tue Aug 25 00:13:51 CEST 2009. -------- --- monodevelop/monodevelop.changes 2009-03-31 22:17:00.000000000 +0200 +++ monodevelop/monodevelop.changes 2009-08-24 18:56:25.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 24 16:55:12 UTC 2009 - ajorgensen@novell.com + +- Patch fixing syntax addins + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- addin-syntax.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monodevelop.spec ++++++ --- /var/tmp/diff_new_pack.JokdbX/_old 2009-08-25 00:12:36.000000000 +0200 +++ /var/tmp/diff_new_pack.JokdbX/_new 2009-08-25 00:12:36.000000000 +0200 @@ -30,9 +30,10 @@ Group: Development/Languages/Mono AutoReqProv: on Version: 2.0 -Release: 1 +Release: 2 Summary: A Full-Featured IDE for Mono and Gtk# Source: %{name}-%{version}.tar.bz2 +Patch0: addin-syntax.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Requires: xsp @@ -68,6 +69,7 @@ %prep %setup -q +%patch0 %build autoreconf -f -i ++++++ addin-syntax.patch ++++++ Index: src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateCodon.cs =================================================================== --- src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.Extension/TemplateCodon.cs (revision 130903) +++ 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: src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxModeService.cs =================================================================== --- src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxModeService.cs (revision 130903) +++ 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: src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/IXmlProvider.cs =================================================================== --- src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/IXmlProvider.cs (revision 130903) +++ 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); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org