aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArsenShnurkov <Arsen.Shnurkov@gmail.com>2015-12-01 10:50:18 +0300
committerArsenShnurkov <Arsen.Shnurkov@gmail.com>2015-12-01 15:15:31 +0300
commit6204c7bc4c99e7d9c873c199132492e23a7fdabf (patch)
tree5cb48ca431abeef249569dbb1e16484a5a25e8c0 /dev-lang/mono
parentrename mono-4.2.1.60 to mono-4.2.1.60-r1 (diff)
downloaddotnet-6204c7bc4c99e7d9c873c199132492e23a7fdabf.tar.gz
dotnet-6204c7bc4c99e7d9c873c199132492e23a7fdabf.tar.bz2
dotnet-6204c7bc4c99e7d9c873c199132492e23a7fdabf.zip
add patch for GitExtensions issue 2710
Diffstat (limited to 'dev-lang/mono')
-rw-r--r--dev-lang/mono/files/2710.patch28
-rw-r--r--dev-lang/mono/mono-4.2.1.60-r1.ebuild1
2 files changed, 29 insertions, 0 deletions
diff --git a/dev-lang/mono/files/2710.patch b/dev-lang/mono/files/2710.patch
new file mode 100644
index 0000000..3d60923
--- /dev/null
+++ b/dev-lang/mono/files/2710.patch
@@ -0,0 +1,28 @@
+diff --git a/mcs/class/System/System.Configuration/SettingsPropertyValue.cs b/mcs/class/System/System.Configuration/SettingsPropertyValue.cs
+index 9bf62c0..9f026461 100644
+--- a/mcs/class/System/System.Configuration/SettingsPropertyValue.cs
++++ b/mcs/class/System/System.Configuration/SettingsPropertyValue.cs
+@@ -118,11 +118,18 @@ namespace System.Configuration
+ #if (XML_DEP)
+ case SettingsSerializeAs.Xml:
+ if (propertyValue != null) {
+- XmlSerializer serializer = new XmlSerializer (propertyValue.GetType ());
+- StringWriter w = new StringWriter(CultureInfo.InvariantCulture);
+-
+- serializer.Serialize (w, propertyValue);
+- serializedValue = w.ToString();
++ using (StringWriter w = new StringWriter(CultureInfo.InvariantCulture))
++ {
++ var xmlSettings = new XmlWriterSettings();
++ xmlSettings.OmitXmlDeclaration = true;
++ using (var writer = XmlWriter.Create(w, xmlSettings))
++ {
++ XmlSerializer serializer = new XmlSerializer(propertyValue.GetType ());
++ var emptyNamespaces = new XmlSerializerNamespaces(new[] { XmlQualifiedName.Empty });
++ serializer.Serialize(writer, propertyValue, emptyNamespaces);
++ } // writer.Flush happens here
++ serializedValue = w.ToString();
++ }
+ }
+ else
+ serializedValue = null;
diff --git a/dev-lang/mono/mono-4.2.1.60-r1.ebuild b/dev-lang/mono/mono-4.2.1.60-r1.ebuild
index db52e5c..a85802d 100644
--- a/dev-lang/mono/mono-4.2.1.60-r1.ebuild
+++ b/dev-lang/mono/mono-4.2.1.60-r1.ebuild
@@ -78,6 +78,7 @@ src_prepare() {
autotools-utils_src_prepare
epatch "${FILESDIR}/systemweb3.patch"
+ epatch "${FILESDIR}/2710.patch"
}
src_configure() {