[gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/, dev-lang/mono/files/

[gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/, dev-lang/mono/files/

[Heather Cynede]

commit:     f74eb2044f59e2d83967582a7f59b638c4b1d8f7
Author:     layman <layman <AT> localhost>
AuthorDate: Fri Jul 17 09:49:11 2015 +0000
Commit:     Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Fri Jul 17 09:49:11 2015 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=f74eb204

some fixes was moved into upstream

 dev-lang/mono/files/systemweb2.patch | 65 ++++++++++++++++++++++++++++++++++++
 dev-lang/mono/mono-9999.ebuild       |  2 +-
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/dev-lang/mono/files/systemweb2.patch b/dev-lang/mono/files/systemweb2.patch
new file mode 100644
index 0000000..188162f
--- /dev/null
+++ b/dev-lang/mono/files/systemweb2.patch
@@ -0,0 +1,65 @@
+From 65bd3eea445ee926e85050c848027bb341a1b2dc Mon Sep 17 00:00:00 2001
+From: Chris F Carroll <chris.carroll@unforgettable.me.uk>
+Date: Mon, 20 Jan 2014 21:39:12 +0000
+Subject: [PATCH] Added missing properties for net 4.5:
+ System.Web.RouteCollection.AppendTrailingSlash and .LowercaseUrl, and
+ RouteBase.RouteExistingFiles
+
+---
+ .../System.Web.Routing/RouteBase.cs                |  3 +++
+ .../System.Web.Routing/RouteCollection.cs          |  4 ++++
+ .../Test/System.Web.Routing/RouteCollectionTest.cs | 22 +++++++++++++++++++++-
+ .../Test/System.Web.Routing/RouteTest.cs           | 12 ++++++++++++
+ 4 files changed, 40 insertions(+), 1 deletion(-)
+
+diff --git a/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs b/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs
+index 077f987..eadc047 100644
+--- a/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs
++++ b/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs
+@@ -41,6 +41,9 @@ namespace System.Web.Routing
+ 	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+ 	public abstract class RouteBase
+ 	{
++#if NET_4_5
++		public bool RouteExistingFiles { get; set; }
++#endif
+ 		public abstract RouteData GetRouteData (HttpContextBase httpContext);
+ 		public abstract VirtualPathData GetVirtualPath (RequestContext requestContext, RouteValueDictionary values);
+ 	}
+diff --git a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteCollectionTest.cs b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteCollectionTest.cs
+index 18b52ea..cd1a12f 100644
+--- a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteCollectionTest.cs
++++ b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteCollectionTest.cs
+@@ -595,7 +595,6 @@ namespace MonoTests.System.Web.Routing
+ 		}
+ 
+ 		[Test]
+-		[Ignore ("looks like RouteExistingFiles ( = false) does not affect... so this test needs more investigation")]
+ 		public void GetVirtualPathToExistingFile ()
+ 		{
+ 			var c = new RouteCollection ();
+diff --git a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteTest.cs b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteTest.cs
+index e431177..f7a5988 100644
+--- a/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteTest.cs
++++ b/mcs/class/System.Web.Routing/Test/System.Web.Routing/RouteTest.cs
+@@ -1775,5 +1775,17 @@ namespace MonoTests.System.Web.Routing
+ 				"#6"
+ 			);
+ 		}
++
++#if NET_4_5
++		[Test]
++		public void RouteExistingFiles ()
++		{
++			var route = new Route ("foo", null);
++			route.RouteExistingFiles = true;
++			Assert.IsTrue (route.RouteExistingFiles);
++			route.RouteExistingFiles = false;
++			Assert.IsFalse (route.RouteExistingFiles);
++		}
++#endif
+ 	}
+ }
+-- 
+2.0.5
+

diff --git a/dev-lang/mono/mono-9999.ebuild b/dev-lang/mono/mono-9999.ebuild
index fd34cd2..998979c 100644
--- a/dev-lang/mono/mono-9999.ebuild
+++ b/dev-lang/mono/mono-9999.ebuild
@@ -44,7 +44,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/systemweb.patch"
+	epatch "${FILESDIR}/systemweb2.patch"
 	cat "${S}/mono/mini/Makefile.am.in" > "${S}/mono/mini/Makefile.am" || die
 
 	eautoreconf

[gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/, dev-lang/mono/files/

[Heather Cynede]

commit:     bee6c31e2c7e7c004e74686de2a17450d3895797
Author:     Ron MacNeil <macro <AT> hotmail <DOT> com>
AuthorDate: Sat Aug  1 10:04:56 2015 +0000
Commit:     Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 11:20:24 2015 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=bee6c31e

mono-4.0.2.5: Add patch to fix build --without-sgen

 ...0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch | 15 +++++++++++++++
 dev-lang/mono/mono-4.0.2.5.ebuild                         |  5 +++++
 2 files changed, 20 insertions(+)

diff --git a/dev-lang/mono/files/mono-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch b/dev-lang/mono/files/mono-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch
new file mode 100644
index 0000000..bbf4c6f
--- /dev/null
+++ b/dev-lang/mono/files/mono-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch
@@ -0,0 +1,15 @@
+===================================================================
+RCS file: mono/dis/RCS/Makefile.am,v
+retrieving revision 1.1
+diff -up -r1.1 mono/dis/Makefile.am
+--- mono/dis/Makefile.am	2015/05/08 15:00:22	1.1
++++ mono/dis/Makefile.am	2015/07/14 11:20:29
+@@ -7,7 +7,7 @@ endif
+ if SUPPORT_SGEN
+ metadata_lib=$(top_builddir)/mono/metadata/libmonoruntimesgen-static.la
+ else
+-metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.a
++metadata_lib=$(top_builddir)/mono/metadata/libmonoruntime-static.la
+ gc_lib=$(LIBGC_STATIC_LIBS)
+ endif
+ 

diff --git a/dev-lang/mono/mono-4.0.2.5.ebuild b/dev-lang/mono/mono-4.0.2.5.ebuild
index 3257f07..22c6348 100644
--- a/dev-lang/mono/mono-4.0.2.5.ebuild
+++ b/dev-lang/mono/mono-4.0.2.5.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+AUTOTOOLS_AUTORECONF=1
 
 inherit eutils linux-info mono-env flag-o-matic pax-utils autotools-utils
 
@@ -71,6 +72,10 @@ src_prepare() {
 	# https://bugzilla.xamarin.com/show_bug.cgi?id=31779
 	epatch "${FILESDIR}/${P}-fix-decimal-ms-on-big-endian.patch"
 
+	# Fix build --without-sgen
+	# https://bugzilla.xamarin.com/show_bug.cgi?id=32015
+	epatch "${FILESDIR}/${P}-fix-mono-dis-makefile-am-when-without-sgen.patch"
+
 	autotools-utils_src_prepare
 	epatch "${FILESDIR}/systemweb3.patch"
 }

[gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/, dev-lang/mono/files/

[Heather Cynede]

commit:     7671f48cefa3557d683fbaaed5ffb58130f53f32
Author:     Ron MacNeil <macro <AT> hotmail <DOT> com>
AuthorDate: Wed Aug  5 09:18:14 2015 +0000
Commit:     Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Wed Aug  5 09:18:14 2015 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=7671f48c

mono-4.0.[23]: Add patch from mono git to fix atomic_add_i4 on 32-bit ppc

 .../files/mono-4.0.2.5-fix-ppc-atomic-add-i4.patch | 79 ++++++++++++++++++++++
 dev-lang/mono/mono-4.0.2.5.ebuild                  |  4 ++
 dev-lang/mono/mono-4.0.3.13.ebuild                 |  4 ++
 dev-lang/mono/mono-4.0.3.19.ebuild                 |  4 ++
 4 files changed, 91 insertions(+)

diff --git a/dev-lang/mono/files/mono-4.0.2.5-fix-ppc-atomic-add-i4.patch b/dev-lang/mono/files/mono-4.0.2.5-fix-ppc-atomic-add-i4.patch
new file mode 100755
index 0000000..fd5de72
--- /dev/null
+++ b/dev-lang/mono/files/mono-4.0.2.5-fix-ppc-atomic-add-i4.patch
@@ -0,0 +1,79 @@
+From f967c79926900343f399c75624deedaba460e544 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alexrp@xamarin.com>
+Date: Mon, 3 Aug 2015 17:32:07 +0200
+Subject: [PATCH 1/2] [ppc] Instruction length of atomic_add_i4 is 28.
+
+---
+ mono/mini/cpu-ppc.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mono/mini/cpu-ppc.md b/mono/mini/cpu-ppc.md
+index ba2ec60..e6baf91 100644
+--- a/mono/mini/cpu-ppc.md
++++ b/mono/mini/cpu-ppc.md
+@@ -314,5 +314,5 @@ vcall2_membase: src1:b len:16 clob:c
+ 
+ jump_table: dest:i len:8
+ 
+-atomic_add_i4: src1:b src2:i dest:i len:20
++atomic_add_i4: src1:b src2:i dest:i len:28
+ atomic_cas_i4: src1:b src2:i src3:i dest:i len:38
+
+From 8f379f0c8f98493180b508b9e68b9aa76c0c5bdf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alexrp@xamarin.com>
+Date: Mon, 3 Aug 2015 17:32:31 +0200
+Subject: [PATCH 2/2] [ppc] Fix atomic_add_i4 support for 32-bit PPC.
+
+---
+ mono/mini/mini-ppc.c | 31 ++++++++++++++++---------------
+ 1 file changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/mono/mini/mini-ppc.c b/mono/mini/mini-ppc.c
+index 758a63f..06528bd 100644
+--- a/mono/mini/mini-ppc.c
++++ b/mono/mini/mini-ppc.c
+@@ -4420,6 +4420,22 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
+ 			else
+ 				ppc_mr (code, ins->dreg, ins->sreg1);
+ 			break;
++#else
++		case OP_ICONV_TO_R4:
++		case OP_ICONV_TO_R8: {
++			if (cpu_hw_caps & PPC_ISA_64) {
++				ppc_srawi(code, ppc_r0, ins->sreg1, 31);
++				ppc_stw (code, ppc_r0, -8, ppc_r1);
++				ppc_stw (code, ins->sreg1, -4, ppc_r1);
++				ppc_lfd (code, ins->dreg, -8, ppc_r1);
++				ppc_fcfid (code, ins->dreg, ins->dreg);
++				if (ins->opcode == OP_ICONV_TO_R4)
++					ppc_frsp (code, ins->dreg, ins->dreg);
++				}
++			break;
++		}
++#endif
++
+ 		case OP_ATOMIC_ADD_I4:
+ 		CASE_PPC64 (OP_ATOMIC_ADD_I8) {
+ 			int location = ins->inst_basereg;
+@@ -4453,21 +4469,6 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
+ 			ppc_mr (code, ins->dreg, ppc_r0);
+ 			break;
+ 		}
+-#else
+-		case OP_ICONV_TO_R4:
+-		case OP_ICONV_TO_R8: {
+-			if (cpu_hw_caps & PPC_ISA_64) {
+-				ppc_srawi(code, ppc_r0, ins->sreg1, 31);
+-				ppc_stw (code, ppc_r0, -8, ppc_r1);
+-				ppc_stw (code, ins->sreg1, -4, ppc_r1);
+-				ppc_lfd (code, ins->dreg, -8, ppc_r1);
+-				ppc_fcfid (code, ins->dreg, ins->dreg);
+-				if (ins->opcode == OP_ICONV_TO_R4)
+-					ppc_frsp (code, ins->dreg, ins->dreg);
+-				}
+-			break;
+-		}
+-#endif
+ 		case OP_ATOMIC_CAS_I4:
+ 		CASE_PPC64 (OP_ATOMIC_CAS_I8) {
+ 			int location = ins->sreg1;

diff --git a/dev-lang/mono/mono-4.0.2.5.ebuild b/dev-lang/mono/mono-4.0.2.5.ebuild
index 7ee376d..99e0bdf 100644
--- a/dev-lang/mono/mono-4.0.2.5.ebuild
+++ b/dev-lang/mono/mono-4.0.2.5.ebuild
@@ -75,6 +75,10 @@ src_prepare() {
 	# https://bugzilla.xamarin.com/show_bug.cgi?id=32015
 	epatch "${FILESDIR}/${P}-fix-mono-dis-makefile-am-when-without-sgen.patch"
 
+	# Fix atomic_add_i4 support for 32-bit ppc
+	# https://github.com/mono/mono/commit/8f379f0c8f98493180b508b9e68b9aa76c0c5bdf
+	epatch "${FILESDIR}/${P}-fix-ppc-atomic-add-i4.patch"
+
 	autotools-utils_src_prepare
 
 	epatch "${FILESDIR}/systemweb3.patch"

diff --git a/dev-lang/mono/mono-4.0.3.13.ebuild b/dev-lang/mono/mono-4.0.3.13.ebuild
index e182449..e7057b9 100644
--- a/dev-lang/mono/mono-4.0.3.13.ebuild
+++ b/dev-lang/mono/mono-4.0.3.13.ebuild
@@ -75,6 +75,10 @@ src_prepare() {
 	# https://bugzilla.xamarin.com/show_bug.cgi?id=32015
 	epatch "${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch"
 
+	# Fix atomic_add_i4 support for 32-bit ppc
+	# https://github.com/mono/mono/commit/8f379f0c8f98493180b508b9e68b9aa76c0c5bdf
+	epatch "${FILESDIR}/${PN}-4.0.2.5-fix-ppc-atomic-add-i4.patch"
+
 	autotools-utils_src_prepare
 
 	epatch "${FILESDIR}/systemweb3.patch"

diff --git a/dev-lang/mono/mono-4.0.3.19.ebuild b/dev-lang/mono/mono-4.0.3.19.ebuild
index e182449..e7057b9 100644
--- a/dev-lang/mono/mono-4.0.3.19.ebuild
+++ b/dev-lang/mono/mono-4.0.3.19.ebuild
@@ -75,6 +75,10 @@ src_prepare() {
 	# https://bugzilla.xamarin.com/show_bug.cgi?id=32015
 	epatch "${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch"
 
+	# Fix atomic_add_i4 support for 32-bit ppc
+	# https://github.com/mono/mono/commit/8f379f0c8f98493180b508b9e68b9aa76c0c5bdf
+	epatch "${FILESDIR}/${PN}-4.0.2.5-fix-ppc-atomic-add-i4.patch"
+
 	autotools-utils_src_prepare
 
 	epatch "${FILESDIR}/systemweb3.patch"

[gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/, dev-lang/mono/files/

[Heather Cynede]

commit:     beae597bb415ad4aab177b7eccdcfa2ef3a03148
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Wed Dec  9 18:02:17 2015 +0000
Commit:     Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 18:02:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=beae597b

new version of mono + new patch

 dev-lang/mono/files/fix-for-bug36724.patch |  13 ++++
 dev-lang/mono/mono-4.2.1.124.ebuild        | 115 +++++++++++++++++++++++++++++
 2 files changed, 128 insertions(+)

diff --git a/dev-lang/mono/files/fix-for-bug36724.patch b/dev-lang/mono/files/fix-for-bug36724.patch
new file mode 100644
index 0000000..187b4ba
--- /dev/null
+++ b/dev-lang/mono/files/fix-for-bug36724.patch
@@ -0,0 +1,13 @@
+diff --git a/mcs/class/System.Web/System.Web.Util/UrlUtils.cs b/mcs/class/System.Web/System.Web.Util/UrlUtils.cs
+index 4f07e83..e229a91 100644
+--- a/mcs/class/System.Web/System.Web.Util/UrlUtils.cs
++++ b/mcs/class/System.Web/System.Web.Util/UrlUtils.cs
+@@ -54,7 +54,7 @@ namespace System.Web.Util {
+ 			if (path.StartsWith (appvpath))
+ 				path = path.Substring (appvpath.Length);
+ 
+-			if (path [0] == '/')
++			if (path.StartsWith("/"))
+ 				path = path.Length > 1 ? path.Substring (1) : "";
+ 
+ 			return Canonic (appvpath + "(" + id + ")/" + path);

diff --git a/dev-lang/mono/mono-4.2.1.124.ebuild b/dev-lang/mono/mono-4.2.1.124.ebuild
new file mode 100644
index 0000000..83b5c4b
--- /dev/null
+++ b/dev-lang/mono/mono-4.2.1.124.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+AUTOTOOLS_AUTORECONF=1
+
+inherit eutils linux-info mono-env flag-o-matic pax-utils autotools-utils versionator
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.mono-project.com/Main_Page"
+SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+IUSE="nls minimal pax_kernel xen doc"
+
+COMMONDEPEND="
+	!minimal? ( >=dev-dotnet/libgdiplus-2.10 )
+	ia64? ( sys-libs/libunwind )
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${COMMONDEPEND}
+	|| ( www-client/links www-client/lynx )
+"
+DEPEND="${COMMONDEPEND}
+	sys-devel/bc
+	virtual/yacc
+	pax_kernel? ( sys-apps/elfix )
+	!dev-lang/mono-basic
+"
+
+MAKEOPTS="${MAKEOPTS} -j1" #nowarn
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+pkg_pretend() {
+	# If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling.
+	# See http://bugs.gentoo.org/261869 for more info."
+	CONFIG_CHECK="SYSVIPC"
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	mono-env_pkg_setup
+}
+
+src_prepare() {
+	# we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
+	# get killed in the build proces when MPROTEC is enable. #286280
+	# RANDMMAP kill the build proces to #347365
+	if use pax_kernel ; then
+		ewarn "We are disabling MPROTECT on the mono binary."
+
+		# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
+		sed '/exec "/ i\paxctl-ng -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
+	fi
+
+	# mono build system can fail otherwise
+	strip-flags
+
+	# Fix VB targets
+	# http://osdir.com/ml/general/2015-05/msg20808.html
+	epatch "${FILESDIR}/add_missing_vb_portable_targets.patch"
+
+	# Fix build when sgen disabled
+	# https://bugzilla.xamarin.com/show_bug.cgi?id=32015
+	epatch "${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch"
+
+	# Fix atomic_add_i4 support for 32-bit ppc
+	# https://github.com/mono/mono/compare/f967c79926900343f399c75624deedaba460e544^...8f379f0c8f98493180b508b9e68b9aa76c0c5bdf
+	epatch "${FILESDIR}/${PN}-4.0.2.5-fix-ppc-atomic-add-i4.patch"
+
+	epatch "${FILESDIR}/systemweb3.patch"
+	epatch "${FILESDIR}/fix-for-GitExtensions-issue-2710.patch"
+	epatch "${FILESDIR}/fix-for-bug36724.patch"
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-silent-rules
+		$(use_with xen xen_opt)
+		--without-ikvm-native
+		--disable-dtrace
+		$(use_with doc mcs-docs)
+		$(use_enable nls)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+}
+
+src_test() {
+	cd mcs/tests || die
+	emake check
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
+	# mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
+	# for reference.
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
+}

[gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/, dev-lang/mono/files/

[Mikhail Pukhlikov]

commit:     83f842d2f4ff6632396577fa77b7ade1ad7f4506
Author:     grbd <garlicbready <AT> googlemail <DOT> com>
AuthorDate: Sun Mar 25 21:04:12 2018 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Sun Mar 25 21:04:12 2018 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=83f842d2

Added fix for latest mono when using ncurses 6.1

 .../mono/files/mono-5.10.0.179-ncurses61.patch     | 106 +++++++++++++++++++++
 dev-lang/mono/mono-5.10.0.179.ebuild               |   4 +
 2 files changed, 110 insertions(+)

diff --git a/dev-lang/mono/files/mono-5.10.0.179-ncurses61.patch b/dev-lang/mono/files/mono-5.10.0.179-ncurses61.patch
new file mode 100644
index 0000000..93a1f8f
--- /dev/null
+++ b/dev-lang/mono/files/mono-5.10.0.179-ncurses61.patch
@@ -0,0 +1,106 @@
+diff -Naur mono-5.10.0.179.orig/mcs/class/corlib/System/TermInfoReader.cs mono-5.10.0.179/mcs/class/corlib/System/TermInfoReader.cs
+--- mono-5.10.0.179.orig/mcs/class/corlib/System/TermInfoReader.cs	2018-03-19 07:46:31.000000000 +0000
++++ mono-5.10.0.179/mcs/class/corlib/System/TermInfoReader.cs	2018-03-25 20:57:57.721279733 +0100
+@@ -72,16 +72,16 @@
+ 	//
+ 
+ 	class TermInfoReader {
+-		//short nameSize;
+-		short boolSize;
+-		short numSize;
+-		short strOffsets;
+-		//short strSize;
++		int boolSize;
++		int numSize;
++		int strOffsets;
+ 
+ 		//string [] names; // Last one is the description
+ 		byte [] buffer;
+ 		int booleansOffset;
+ 		//string term;
++		
++		int intOffset;
+ 
+ 		public TermInfoReader (string term, string filename)
+ 		{
+@@ -114,12 +114,21 @@
+ //			get { return term; }
+ //		}
+ 
++		void DetermineVersion (short magic)
++		{
++			if (magic == 0x11a)
++				intOffset = 2;
++			else if (magic == 0x21e)
++				intOffset = 4;
++			else
++				throw new Exception (String.Format ("Magic number is unexpected: {0}", magic));
++		}
++
+ 		void ReadHeader (byte [] buffer, ref int position)
+ 		{
+ 			short magic = GetInt16 (buffer, position);
+ 			position += 2;
+-			if (magic != 282)
+-				throw new Exception (String.Format ("Magic number is wrong: {0}", magic));
++			DetermineVersion (magic);
+ 			
+ 			/*nameSize =*/ GetInt16 (buffer, position);
+ 			position += 2;
+@@ -161,8 +170,8 @@
+ 			if ((offset % 2) == 1)
+ 				offset++;
+ 
+-			offset += ((int) number) * 2;
+-			return GetInt16 (buffer, offset);
++			offset += ((int) number) * intOffset;
++			return GetInteger (buffer, offset);
+ 		}
+ 
+ 		public string Get (TermInfoStrings tstr)
+@@ -175,7 +184,7 @@
+ 			if ((offset % 2) == 1)
+ 				offset++;
+ 
+-			offset += numSize * 2;
++			offset += numSize * intOffset;
+ 			int off2 = GetInt16 (buffer, offset + (int) tstr * 2);
+ 			if (off2 == -1)
+ 				return null;
+@@ -193,7 +202,7 @@
+ 			if ((offset % 2) == 1)
+ 				offset++;
+ 
+-			offset += numSize * 2;
++			offset += numSize * intOffset;
+ 			int off2 = GetInt16 (buffer, offset + (int) tstr * 2);
+ 			if (off2 == -1)
+ 				return null;
+@@ -211,6 +220,27 @@
+ 			return (short) (uno + dos * 256);
+ 		}
+ 
++		int GetInt32 (byte [] buffer, int offset)
++		{
++			int b1 = (int) buffer [offset];
++			int b2 = (int) buffer [offset + 1];
++			int b3 = (int) buffer [offset + 2];
++			int b4 = (int) buffer [offset + 3];
++			if (b1 == 255 && b2 == 255 && b3 == 255 && b4 == 255)
++				return -1;
++
++			return b1 + b2 << 8 + b3 << 16 + b4 << 24;
++		}
++
++		int GetInteger (byte [] buffer, int offset)
++		{
++			if (intOffset == 2)
++				return GetInt16 (buffer, offset);
++			else
++				// intOffset == 4
++				return GetInt32 (buffer, offset);
++		}
++
+ 		string GetString (byte [] buffer, int offset)
+ 		{
+ 			int length = 0;

diff --git a/dev-lang/mono/mono-5.10.0.179.ebuild b/dev-lang/mono/mono-5.10.0.179.ebuild
index f25dd8d..f709724 100644
--- a/dev-lang/mono/mono-5.10.0.179.ebuild
+++ b/dev-lang/mono/mono-5.10.0.179.ebuild
@@ -32,8 +32,12 @@ DEPEND="${COMMONDEPEND}
 	!dev-lang/mono-basic
 "
 
+# Patch added for ncurses 6.1
+# https://github.com/mono/mono/issues/6752
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.0.1.1-x86_32.patch
+	"${FILESDIR}"/${PN}-5.10.0.179-ncurses61.patch
 )
 
 #S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"