From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B40F81388C1 for ; Thu, 10 Dec 2015 07:45:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F2E121C072; Thu, 10 Dec 2015 07:45:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9432A21C04A for ; Thu, 10 Dec 2015 07:45:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5262F33E01A for ; Thu, 10 Dec 2015 07:44:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E4DA2E68 for ; Thu, 10 Dec 2015 07:44:56 +0000 (UTC) From: "Heather Cynede" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Heather Cynede" Message-ID: <1448972131.6204c7bc4c99e7d9c873c199132492e23a7fdabf.cynede@gentoo> Subject: [gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/files/, dev-lang/mono/ X-VCS-Repository: proj/dotnet X-VCS-Files: dev-lang/mono/files/2710.patch dev-lang/mono/mono-4.2.1.60-r1.ebuild X-VCS-Directories: dev-lang/mono/ dev-lang/mono/files/ X-VCS-Committer: cynede X-VCS-Committer-Name: Heather Cynede X-VCS-Revision: 6204c7bc4c99e7d9c873c199132492e23a7fdabf X-VCS-Branch: master Date: Thu, 10 Dec 2015 07:44:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4609683e-11fa-4b09-8702-eea1305879eb X-Archives-Hash: 5145308a5883da087685588385ebd46c commit: 6204c7bc4c99e7d9c873c199132492e23a7fdabf Author: ArsenShnurkov gmail com> AuthorDate: Tue Dec 1 07:50:18 2015 +0000 Commit: Heather Cynede gentoo org> CommitDate: Tue Dec 1 12:15:31 2015 +0000 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=6204c7bc add patch for GitExtensions issue 2710 dev-lang/mono/files/2710.patch | 28 ++++++++++++++++++++++++++++ dev-lang/mono/mono-4.2.1.60-r1.ebuild | 1 + 2 files changed, 29 insertions(+) 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() {