* [gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/files/, dev-lang/mono/
@ 2015-03-23 3:56 Heather Cynede
0 siblings, 0 replies; 9+ messages in thread
From: Heather Cynede @ 2015-03-23 3:56 UTC (permalink / raw
To: gentoo-commits
commit: b8d6e89bd4612b874b2e7d679b5b5cf09880f157
Author: layman <layman <AT> localhost>
AuthorDate: Sun Mar 22 22:42:32 2015 +0000
Commit: Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 22:42:32 2015 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=b8d6e89b
patch for missing asp .net mvc properties
dev-lang/mono/files/systemweb.patch | 108 +++++++++++++++++++++++++++++++++
dev-lang/mono/mono-9999-r1.ebuild | 115 ++++++++++++++++++++++++++++++++++++
2 files changed, 223 insertions(+)
diff --git a/dev-lang/mono/files/systemweb.patch b/dev-lang/mono/files/systemweb.patch
new file mode 100644
index 0000000..b591ceb
--- /dev/null
+++ b/dev-lang/mono/files/systemweb.patch
@@ -0,0 +1,108 @@
+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/System.Web.Routing/RouteCollection.cs b/mcs/class/System.Web.Routing/System.Web.Routing/RouteCollection.cs
+index 7993e44..4a2f1cf 100644
+--- a/mcs/class/System.Web.Routing/System.Web.Routing/RouteCollection.cs
++++ b/mcs/class/System.Web.Routing/System.Web.Routing/RouteCollection.cs
+@@ -95,6 +95,10 @@ namespace System.Web.Routing
+ }
+
+ public bool RouteExistingFiles { get; set; }
++#if NET_4_5
++ public bool AppendTrailingSlash { get; set; }
++ public bool LowercaseUrls { get; set; }
++#endif
+
+ public void Add (string name, RouteBase item)
+ {
+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 ();
+@@ -926,6 +925,27 @@ namespace MonoTests.System.Web.Routing
+ Assert.AreEqual (typeof (PageRouteHandler), rd.RouteHandler.GetType (), "#A4-3");
+ Assert.IsFalse (((PageRouteHandler) rd.RouteHandler).CheckPhysicalUrlAccess, "#A4-4");
+ }
++
++#if NET_4_5
++ [Test]
++ public void AppendTrailingSlash ()
++ {
++ var c = new RouteCollection ();
++ c.AppendTrailingSlash = true;
++ Assert.IsTrue (c.AppendTrailingSlash);
++ c.AppendTrailingSlash = false;
++ Assert.IsFalse (c.AppendTrailingSlash);
++ }
++ [Test]
++ public void LowercaseUrls ()
++ {
++ var c = new RouteCollection ();
++ c.LowercaseUrls = true;
++ Assert.IsTrue (c.LowercaseUrls);
++ c.LowercaseUrls = false;
++ Assert.IsFalse (c.LowercaseUrls);
++ }
++#endif
+ #endif
+ }
+ }
+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-r1.ebuild b/dev-lang/mono/mono-9999-r1.ebuild
new file mode 100644
index 0000000..ee8d8bc
--- /dev/null
+++ b/dev-lang/mono/mono-9999-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-3.0.11.ebuild $
+
+EAPI="5"
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+
+inherit linux-info mono-env flag-o-matic pax-utils autotools-utils git-2
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.mono-project.com/Main_Page"
+
+EGIT_REPO_URI="git://github.com/mono/${PN}.git"
+EGIT_HAS_SUBMODULES="true"
+
+LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
+SLOT="0"
+KEYWORDS=""
+IUSE="minimal pax_kernel xen doc"
+
+COMMONDEPEND="
+ !minimal? ( >=dev-dotnet/libgdiplus-2.10 )
+ ia64? ( sys-libs/libunwind )
+"
+RDEPEND="${COMMONDEPEND}
+ || ( www-client/links www-client/lynx )
+"
+DEPEND="${COMMONDEPEND}
+ sys-devel/bc
+ virtual/yacc
+ pax_kernel? ( sys-apps/elfix )
+"
+
+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() {
+ epatch "${FILESDIR}/systemweb.patch"
+ cat "${S}/mono/mini/Makefile.am.in" > "${S}/mono/mini/Makefile.am" || die
+
+ eautoreconf
+ # 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."
+ sed '/exec/ i\paxctl-ng -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in
+ fi
+
+ # mono build system can fail otherwise
+ strip-flags
+
+ # Remove this at your own peril. Mono will barf in unexpected ways.
+ append-flags -fno-strict-aliasing
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ # NOTE: We need the static libs for now so mono-debugger works.
+ # See http://bugs.gentoo.org/show_bug.cgi?id=256264 for details
+ #
+ # --without-moonlight since www-plugins/moonlight is not the only one
+ # using mono: https://bugzilla.novell.com/show_bug.cgi?id=641005#c3
+ #
+ # --with-profile4 needs to be always enabled since it's used by default
+ # and, otherwise, problems like bug #340641 appear.
+ #
+ # sgen fails on ppc, bug #359515
+ local myeconfargs=(
+ --enable-system-aot=yes
+ --enable-static
+ --disable-quiet-build
+ --without-moonlight
+ --with-libgdiplus=$(use minimal && printf "no" || printf "installed" )
+ $(use_with xen xen_opt)
+ --without-ikvm-native
+ --with-jit
+ --disable-dtrace
+ --with-profile4
+ --with-sgen=$(use ppc && printf "no" || printf "yes" )
+ $(use_with doc mcs-docs)
+ )
+
+ autotools-utils_src_configure
+}
+
+src_make() {
+ # Doesn't require previous mono to be installed
+ emake get-monolite-latest
+ emake EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/gmcs.exe "$@" || die "emake failed"
+}
+
+src_test() {
+ emake check || die "tests fails"
+}
+
+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
+ rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/files/, dev-lang/mono/
@ 2015-05-21 17:43 Heather Cynede
0 siblings, 0 replies; 9+ messages in thread
From: Heather Cynede @ 2015-05-21 17:43 UTC (permalink / raw
To: gentoo-commits
commit: 0ddc51d7ea825f0d5dfcc276d7bcbdcccab27d2c
Author: Binyamin Sagal <bensagal <AT> gmail <DOT> com>
AuthorDate: Tue May 19 07:37:05 2015 +0000
Commit: Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Tue May 19 07:37:05 2015 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=0ddc51d7
Add mono 4.0.1.34
.../files/add_missing_vb_portable_targets.patch | 20 ++++
dev-lang/mono/mono-4.0.1.34.ebuild | 124 +++++++++++++++++++++
2 files changed, 144 insertions(+)
diff --git a/dev-lang/mono/files/add_missing_vb_portable_targets.patch b/dev-lang/mono/files/add_missing_vb_portable_targets.patch
new file mode 100644
index 0000000..ece90a5
--- /dev/null
+++ b/dev-lang/mono/files/add_missing_vb_portable_targets.patch
@@ -0,0 +1,20 @@
+Index: mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets 2015-05-15 15:55:12.074775985 +0100
+@@ -0,0 +1,5 @@
++<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++ <Import Project="..\Microsoft.Portable.Core.props" />
++ <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
++ <Import Project="..\Microsoft.Portable.Core.targets" />
++</Project>
+Index: mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets 2015-05-15 15:55:19.194775876 +0100
+@@ -0,0 +1,5 @@
++<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++ <Import Project="..\Microsoft.Portable.Core.props" />
++ <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
++ <Import Project="..\Microsoft.Portable.Core.targets" />
++</Project>
diff --git a/dev-lang/mono/mono-4.0.1.34.ebuild b/dev-lang/mono/mono-4.0.1.34.ebuild
new file mode 100644
index 0000000..c76fb8f
--- /dev/null
+++ b/dev-lang/mono/mono-4.0.1.34.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+
+inherit eutils linux-info mono-env flag-o-matic pax-utils autotools-utils
+
+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 debug"
+
+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 )
+"
+
+S="${WORKDIR}/${PN}-4.0.1"
+
+MAKEOPTS="${MAKEOPTS} -j1" #nowarn
+
+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
+
+ # Remove this at your own peril. Mono will barf in unexpected ways.
+ append-flags -fno-strict-aliasing
+
+ #fix vb targets http://osdir.com/ml/general/2015-05/msg20808.html
+ epatch "${FILESDIR}/add_missing_vb_portable_targets.patch"
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ # NOTE: We need the static libs for now so mono-debugger works.
+ # See http://bugs.gentoo.org/show_bug.cgi?id=256264 for details
+ #
+ # --without-moonlight since www-plugins/moonlight is not the only one
+ # using mono: https://bugzilla.novell.com/show_bug.cgi?id=641005#c3
+ #
+ # --with-profile4 needs to be always enabled since it's used by default
+ # and, otherwise, problems like bug #340641 appear.
+ #
+ # sgen fails on ppc, bug #359515
+ local myeconfargs=(
+ --enable-system-aot=yes
+ --enable-static
+ --disable-quiet-build
+ --without-moonlight
+ --with-libgdiplus=$(usex minimal no installed)
+ $(use_with xen xen_opt)
+ --without-ikvm-native
+ --with-jit
+ --disable-dtrace
+ --with-profile4
+ --with-sgen=$(usex ppc no yes)
+ $(use_with doc mcs-docs)
+ $(use_enable debug)
+ $(use_enable nls)
+ )
+
+ autotools-utils_src_configure
+
+ # FIX for uncompilable 3.4.0 sources
+ FF="${WORKDIR}/mono-3.4.0/mcs/tools/xbuild/targets/Microsoft.Portable.Common.targets"
+ rm -f $FF
+ touch $FF
+ echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' >> $FF
+ echo ' <Import Project="..\\Microsoft.Portable.Core.props" />' >> $FF
+ echo ' <Import Project="..\\Microsoft.Portable.Core.targets" />' >> $FF
+ echo '</Project>' >> $FF
+}
+
+src_compile() {
+ nonfatal autotools-utils_src_compile || {
+ eqawarn "maintainer of this ebuild has no idea why it fails. If you happen to know how to fix it - please let me know"
+ autotools-utils_src_compile
+ }
+}
+
+src_test() {
+ cd mcs/tests || die
+ emake check
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/files/, dev-lang/mono/
@ 2015-07-20 12:56 Heather Cynede
0 siblings, 0 replies; 9+ messages in thread
From: Heather Cynede @ 2015-07-20 12:56 UTC (permalink / raw
To: gentoo-commits
commit: f256172505cb095d5aca55818320cfee688adf5b
Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Mon Jul 20 11:22:16 2015 +0000
Commit: Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 11:22:16 2015 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=f2561725
stable version of ebuild
dev-lang/mono/files/systemweb3.patch | 22 +++++++
dev-lang/mono/mono-4.0.2.5.ebuild | 124 +++++++++++++++++++++++++++++++++++
2 files changed, 146 insertions(+)
diff --git a/dev-lang/mono/files/systemweb3.patch b/dev-lang/mono/files/systemweb3.patch
new file mode 100644
index 0000000..5ccb63a
--- /dev/null
+++ b/dev-lang/mono/files/systemweb3.patch
@@ -0,0 +1,22 @@
+--- a/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs 2015-05-08 18:00:15.000000000 +0300
++++ b/mcs/class/System.Web.Routing/System.Web.Routing/RouteBase.cs 2015-07-20 14:13:09.215784924 +0300
+@@ -41,5 +41,19 @@
+ {
+ public abstract RouteData GetRouteData (HttpContextBase httpContext);
+ public abstract VirtualPathData GetVirtualPath (RequestContext requestContext, RouteValueDictionary values);
++
++ // Default needs to be true to avoid breaking change
++ private bool _routeExistingFiles = true;
++ public bool RouteExistingFiles
++ {
++ get
++ {
++ return _routeExistingFiles;
++ }
++ set
++ {
++ _routeExistingFiles = value;
++ }
++ }
+ }
+ }
diff --git a/dev-lang/mono/mono-4.0.2.5.ebuild b/dev-lang/mono/mono-4.0.2.5.ebuild
new file mode 100644
index 0000000..b5aa9c9
--- /dev/null
+++ b/dev-lang/mono/mono-4.0.2.5.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+
+inherit eutils linux-info mono-env flag-o-matic pax-utils autotools-utils
+
+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 debug"
+
+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 )
+"
+
+MAKEOPTS="${MAKEOPTS} -j1" #nowarn
+S="${WORKDIR}/${PN}-4.0.2"
+
+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
+
+ # Remove this at your own peril. Mono will barf in unexpected ways.
+ append-flags -fno-strict-aliasing
+
+ #fix vb targets http://osdir.com/ml/general/2015-05/msg20808.html
+ epatch "${FILESDIR}/add_missing_vb_portable_targets.patch"
+
+ autotools-utils_src_prepare
+ epatch "${FILESDIR}/systemweb3.patch"
+}
+
+src_configure() {
+ # NOTE: We need the static libs for now so mono-debugger works.
+ # See http://bugs.gentoo.org/show_bug.cgi?id=256264 for details
+ #
+ # --without-moonlight since www-plugins/moonlight is not the only one
+ # using mono: https://bugzilla.novell.com/show_bug.cgi?id=641005#c3
+ #
+ # --with-profile4 needs to be always enabled since it's used by default
+ # and, otherwise, problems like bug #340641 appear.
+ #
+ # sgen fails on ppc, bug #359515
+ local myeconfargs=(
+ --enable-system-aot=yes
+ --enable-static
+ --disable-quiet-build
+ --without-moonlight
+ --with-libgdiplus=$(usex minimal no installed)
+ $(use_with xen xen_opt)
+ --without-ikvm-native
+ --with-jit
+ --disable-dtrace
+ --with-profile4
+ --with-sgen=$(usex ppc no yes)
+ $(use_with doc mcs-docs)
+ $(use_enable debug)
+ $(use_enable nls)
+ )
+
+ autotools-utils_src_configure
+
+ # FIX for uncompilable 3.4.0 sources
+ FF="${WORKDIR}/mono-3.4.0/mcs/tools/xbuild/targets/Microsoft.Portable.Common.targets"
+ rm -f $FF
+ touch $FF
+ echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' >> $FF
+ echo ' <Import Project="..\\Microsoft.Portable.Core.props" />' >> $FF
+ echo ' <Import Project="..\\Microsoft.Portable.Core.targets" />' >> $FF
+ echo '</Project>' >> $FF
+}
+
+src_compile() {
+ nonfatal autotools-utils_src_compile || {
+ eqawarn "maintainer of this ebuild has no idea why it fails. If you happen to know how to fix it - please let me know"
+ autotools-utils_src_compile
+ }
+}
+
+src_test() {
+ cd mcs/tests || die
+ emake check
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/files/, dev-lang/mono/
@ 2015-07-20 12:56 Heather Cynede
0 siblings, 0 replies; 9+ messages in thread
From: Heather Cynede @ 2015-07-20 12:56 UTC (permalink / raw
To: gentoo-commits
commit: dc98ca586342fa3be88441fb8f3116fe5916305f
Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Mon Jul 20 08:56:53 2015 +0000
Commit: Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 08:56:53 2015 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=dc98ca58
removing patch
dev-lang/mono/files/systemweb.patch | 108 -----------------------------------
dev-lang/mono/files/systemweb2.patch | 65 ---------------------
dev-lang/mono/mono-9999.ebuild | 1 -
3 files changed, 174 deletions(-)
diff --git a/dev-lang/mono/files/systemweb.patch b/dev-lang/mono/files/systemweb.patch
deleted file mode 100644
index b591ceb..0000000
--- a/dev-lang/mono/files/systemweb.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-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/System.Web.Routing/RouteCollection.cs b/mcs/class/System.Web.Routing/System.Web.Routing/RouteCollection.cs
-index 7993e44..4a2f1cf 100644
---- a/mcs/class/System.Web.Routing/System.Web.Routing/RouteCollection.cs
-+++ b/mcs/class/System.Web.Routing/System.Web.Routing/RouteCollection.cs
-@@ -95,6 +95,10 @@ namespace System.Web.Routing
- }
-
- public bool RouteExistingFiles { get; set; }
-+#if NET_4_5
-+ public bool AppendTrailingSlash { get; set; }
-+ public bool LowercaseUrls { get; set; }
-+#endif
-
- public void Add (string name, RouteBase item)
- {
-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 ();
-@@ -926,6 +925,27 @@ namespace MonoTests.System.Web.Routing
- Assert.AreEqual (typeof (PageRouteHandler), rd.RouteHandler.GetType (), "#A4-3");
- Assert.IsFalse (((PageRouteHandler) rd.RouteHandler).CheckPhysicalUrlAccess, "#A4-4");
- }
-+
-+#if NET_4_5
-+ [Test]
-+ public void AppendTrailingSlash ()
-+ {
-+ var c = new RouteCollection ();
-+ c.AppendTrailingSlash = true;
-+ Assert.IsTrue (c.AppendTrailingSlash);
-+ c.AppendTrailingSlash = false;
-+ Assert.IsFalse (c.AppendTrailingSlash);
-+ }
-+ [Test]
-+ public void LowercaseUrls ()
-+ {
-+ var c = new RouteCollection ();
-+ c.LowercaseUrls = true;
-+ Assert.IsTrue (c.LowercaseUrls);
-+ c.LowercaseUrls = false;
-+ Assert.IsFalse (c.LowercaseUrls);
-+ }
-+#endif
- #endif
- }
- }
-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/files/systemweb2.patch b/dev-lang/mono/files/systemweb2.patch
deleted file mode 100644
index 188162f..0000000
--- a/dev-lang/mono/files/systemweb2.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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 998979c..cc6d99c 100644
--- a/dev-lang/mono/mono-9999.ebuild
+++ b/dev-lang/mono/mono-9999.ebuild
@@ -44,7 +44,6 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}/systemweb2.patch"
cat "${S}/mono/mini/Makefile.am.in" > "${S}/mono/mini/Makefile.am" || die
eautoreconf
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/files/, dev-lang/mono/
@ 2015-08-01 13:21 Heather Cynede
0 siblings, 0 replies; 9+ messages in thread
From: Heather Cynede @ 2015-08-01 13:21 UTC (permalink / raw
To: gentoo-commits
commit: 5e0c9066fc07252bc3286338af2951dfc03ff213
Author: Ron MacNeil <macro <AT> hotmail <DOT> com>
AuthorDate: Sat Aug 1 09:48:20 2015 +0000
Commit: Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Sat Aug 1 09:48:20 2015 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=5e0c9066
mono-4.0.2.5: Add patch to fix build on big-endian machines
...mono-4.0.2.5-fix-decimal-ms-on-big-endian.patch | 22 ++++++++++++++++++++++
dev-lang/mono/mono-4.0.2.5.ebuild | 4 ++++
2 files changed, 26 insertions(+)
diff --git a/dev-lang/mono/files/mono-4.0.2.5-fix-decimal-ms-on-big-endian.patch b/dev-lang/mono/files/mono-4.0.2.5-fix-decimal-ms-on-big-endian.patch
new file mode 100644
index 0000000..c6349fe
--- /dev/null
+++ b/dev-lang/mono/files/mono-4.0.2.5-fix-decimal-ms-on-big-endian.patch
@@ -0,0 +1,22 @@
+diff -up mono/metadata/decimal-ms.c.than
+mono/metadata/decimal-ms.c
+--- mono/metadata/decimal-ms.c.than 2015-07-06 08:21:27.524461795
+-0400
++++ mono/metadata/decimal-ms.c 2015-07-06 08:30:26.954461795
+-0400
+@@ -55,8 +55,13 @@ static const uint32_t ten_to_ten_div_4 =
+ #define DECIMAL_LO32(dec) ((dec).v.v.Lo32)
+ #define DECIMAL_MID32(dec) ((dec).v.v.Mid32)
+ #define DECIMAL_HI32(dec) ((dec).Hi32)
+-#define DECIMAL_LO64_GET(dec) ((dec).v.Lo64)
+-#define DECIMAL_LO64_SET(dec,value) {(dec).v.Lo64 = value; }
++#if G_BYTE_ORDER != G_LITTLE_ENDIAN
++# define DECIMAL_LO64_GET(dec) (((uint64_t)((dec).v.v.Mid32) << 32) | (dec).v.v.Lo32)
++# define DECIMAL_LO64_SET(dec,value) {(dec).v.v.Lo32 = (value); (dec).v.v.Mid32 = ((value) >> 32); }
++#else
++# define DECIMAL_LO64_GET(dec) ((dec).v.Lo64)
++# define DECIMAL_LO64_SET(dec,value) {(dec).v.Lo64 = value; }
++#endif
+
+ #define DECIMAL_SETZERO(dec) {DECIMAL_LO32(dec) = 0; DECIMAL_MID32(dec) = 0; DECIMAL_HI32(dec) = 0; DECIMAL_SIGNSCALE(dec) = 0;}
+ #define COPYDEC(dest, src) {DECIMAL_SIGNSCALE(dest) = DECIMAL_SIGNSCALE(src); DECIMAL_HI32(dest) = DECIMAL_HI32(src); \
diff --git a/dev-lang/mono/mono-4.0.2.5.ebuild b/dev-lang/mono/mono-4.0.2.5.ebuild
index b5aa9c9..3257f07 100644
--- a/dev-lang/mono/mono-4.0.2.5.ebuild
+++ b/dev-lang/mono/mono-4.0.2.5.ebuild
@@ -67,6 +67,10 @@ src_prepare() {
#fix vb targets http://osdir.com/ml/general/2015-05/msg20808.html
epatch "${FILESDIR}/add_missing_vb_portable_targets.patch"
+ # Fix build on big-endian machines
+ # https://bugzilla.xamarin.com/show_bug.cgi?id=31779
+ epatch "${FILESDIR}/${P}-fix-decimal-ms-on-big-endian.patch"
+
autotools-utils_src_prepare
epatch "${FILESDIR}/systemweb3.patch"
}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/files/, dev-lang/mono/
@ 2015-12-10 7:44 Heather Cynede
0 siblings, 0 replies; 9+ messages in thread
From: Heather Cynede @ 2015-12-10 7:44 UTC (permalink / raw
To: gentoo-commits
commit: 6204c7bc4c99e7d9c873c199132492e23a7fdabf
Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Tue Dec 1 07:50:18 2015 +0000
Commit: Heather Cynede <cynede <AT> gentoo <DOT> 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() {
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/files/, dev-lang/mono/
@ 2015-12-10 7:44 Heather Cynede
0 siblings, 0 replies; 9+ messages in thread
From: Heather Cynede @ 2015-12-10 7:44 UTC (permalink / raw
To: gentoo-commits
commit: 1e4922756892eade0253d619b42572434526b9a7
Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Tue Dec 1 12:23:58 2015 +0000
Commit: Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Tue Dec 1 12:23:58 2015 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=1e492275
patch 2710.patch was renamed to fix-for-GitExtensions-issue-2710.patch
.../mono/files/{2710.patch => fix-for-GitExtensions-issue-2710.patch} | 0
dev-lang/mono/mono-4.2.1.102-r1.ebuild | 2 +-
dev-lang/mono/mono-4.2.1.60-r1.ebuild | 2 +-
dev-lang/mono/mono-4.2.1.91-r1.ebuild | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-lang/mono/files/2710.patch b/dev-lang/mono/files/fix-for-GitExtensions-issue-2710.patch
similarity index 100%
rename from dev-lang/mono/files/2710.patch
rename to dev-lang/mono/files/fix-for-GitExtensions-issue-2710.patch
diff --git a/dev-lang/mono/mono-4.2.1.102-r1.ebuild b/dev-lang/mono/mono-4.2.1.102-r1.ebuild
index a85802d..d17c6a6 100644
--- a/dev-lang/mono/mono-4.2.1.102-r1.ebuild
+++ b/dev-lang/mono/mono-4.2.1.102-r1.ebuild
@@ -78,7 +78,7 @@ src_prepare() {
autotools-utils_src_prepare
epatch "${FILESDIR}/systemweb3.patch"
- epatch "${FILESDIR}/2710.patch"
+ epatch "${FILESDIR}/fix-for-GitExtensions-issue-2710.patch"
}
src_configure() {
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 a85802d..d17c6a6 100644
--- a/dev-lang/mono/mono-4.2.1.60-r1.ebuild
+++ b/dev-lang/mono/mono-4.2.1.60-r1.ebuild
@@ -78,7 +78,7 @@ src_prepare() {
autotools-utils_src_prepare
epatch "${FILESDIR}/systemweb3.patch"
- epatch "${FILESDIR}/2710.patch"
+ epatch "${FILESDIR}/fix-for-GitExtensions-issue-2710.patch"
}
src_configure() {
diff --git a/dev-lang/mono/mono-4.2.1.91-r1.ebuild b/dev-lang/mono/mono-4.2.1.91-r1.ebuild
index a85802d..d17c6a6 100644
--- a/dev-lang/mono/mono-4.2.1.91-r1.ebuild
+++ b/dev-lang/mono/mono-4.2.1.91-r1.ebuild
@@ -78,7 +78,7 @@ src_prepare() {
autotools-utils_src_prepare
epatch "${FILESDIR}/systemweb3.patch"
- epatch "${FILESDIR}/2710.patch"
+ epatch "${FILESDIR}/fix-for-GitExtensions-issue-2710.patch"
}
src_configure() {
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/files/, dev-lang/mono/
@ 2015-12-28 7:54 Heather Cynede
0 siblings, 0 replies; 9+ messages in thread
From: Heather Cynede @ 2015-12-28 7:54 UTC (permalink / raw
To: gentoo-commits
commit: a7b8ee97f6a55cef378805b7ece1e73f69bb92ee
Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Sat Dec 26 12:07:00 2015 +0000
Commit: Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 12:37:39 2015 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=a7b8ee97
new version of patch
...tExtensions-issue-2710-another-resolution.patch | 48 +++++++++
dev-lang/mono/mono-4.2.2.10-r1.ebuild | 116 +++++++++++++++++++++
2 files changed, 164 insertions(+)
diff --git a/dev-lang/mono/files/fix-for-GitExtensions-issue-2710-another-resolution.patch b/dev-lang/mono/files/fix-for-GitExtensions-issue-2710-another-resolution.patch
new file mode 100644
index 0000000..b306b69
--- /dev/null
+++ b/dev-lang/mono/files/fix-for-GitExtensions-issue-2710-another-resolution.patch
@@ -0,0 +1,48 @@
+diff --git a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
+index 4b69010..1bb6195 100644
+--- a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
++++ b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
+@@ -578,6 +578,34 @@ namespace System.Configuration
+ private ExeConfigurationFileMap exeMapPrev = null;
+ private SettingsPropertyValueCollection values = null;
+
++ /// <remarks>
++ /// Hack to remove the XmlDeclaration that the XmlSerializer adds.
++ /// <br />
++ /// see <a href="https://github.com/mono/mono/pull/2273">Issue 2273</a> for details
++ /// </remarks>
++ private string StripXmlHeader(string serializedValue)
++ {
++ if (serializedValue == null)
++ {
++ return string.Empty;
++ }
++
++ XmlDocument doc = new XmlDocument();
++ XmlElement valueXml = doc.CreateElement("value");
++ valueXml.InnerXml = serializedValue;
++
++ foreach (XmlNode child in valueXml.ChildNodes) {
++ if (child.NodeType == XmlNodeType.XmlDeclaration) {
++ valueXml.RemoveChild(child);
++ break;
++ }
++ }
++
++ // InnerXml will give you well-formed XML that you could save as a separate document, and
++ // InnerText will immediately give you a pure-text representation of this inner XML.
++ return valueXml.InnerXml;
++ }
++
+ private void SaveProperties (ExeConfigurationFileMap exeMap, SettingsPropertyValueCollection collection, ConfigurationUserLevel level, SettingsContext context, bool checkUserLevel)
+ {
+ Configuration config = ConfigurationManager.OpenMappedExeConfiguration (exeMap, level);
+@@ -623,7 +651,7 @@ namespace System.Configuration
+ element.Value.ValueXml = new XmlDocument ().CreateElement ("value");
+ switch (value.Property.SerializeAs) {
+ case SettingsSerializeAs.Xml:
+- element.Value.ValueXml.InnerXml = (value.SerializedValue as string) ?? string.Empty;
++ element.Value.ValueXml.InnerXml = StripXmlHeader(value.SerializedValue as string);
+ break;
+ case SettingsSerializeAs.String:
+ element.Value.ValueXml.InnerText = value.SerializedValue as string;
diff --git a/dev-lang/mono/mono-4.2.2.10-r1.ebuild b/dev-lang/mono/mono-4.2.2.10-r1.ebuild
new file mode 100644
index 0000000..677210a
--- /dev/null
+++ b/dev-lang/mono/mono-4.2.2.10-r1.ebuild
@@ -0,0 +1,116 @@
+# 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 MPROTECT is enable. #286280
+ # RANDMMAP kill the build proces to #347365
+ # use paxmark.sh to get PT/XT logic #532244
+ 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\paxmark.sh -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-another-resolution.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
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/files/, dev-lang/mono/
@ 2017-06-06 10:36 Mikhail Pukhlikov
0 siblings, 0 replies; 9+ messages in thread
From: Mikhail Pukhlikov @ 2017-06-06 10:36 UTC (permalink / raw
To: gentoo-commits
commit: 0ac994b1059a9b51f957965175bb05528fc36163
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 6 09:23:19 2017 +0000
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Tue Jun 6 09:26:18 2017 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=0ac994b1
dev-lang/mono: forward-port mono-4.8.0.371-x86_32.patch
Bug: https://github.com/gentoo/dotnet/issues/300
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Manifest-Sign-Key: 0x71A1EE76611FF3AA
dev-lang/mono/files/mono-5.0.1.1-x86_32.patch | 21 +++++++++++++++++++++
dev-lang/mono/mono-5.0.1.1.ebuild | 8 +++-----
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/dev-lang/mono/files/mono-5.0.1.1-x86_32.patch b/dev-lang/mono/files/mono-5.0.1.1-x86_32.patch
new file mode 100644
index 0000000..08d443a
--- /dev/null
+++ b/dev-lang/mono/files/mono-5.0.1.1-x86_32.patch
@@ -0,0 +1,21 @@
+Native toolchain can default to different ABI (amd64 in bug case).
+Set target to i386.
+https://bugs.gentoo.org/600664
+diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
+index 0656a57..690c96b 100644
+--- a/mono/mini/aot-compiler.c
++++ b/mono/mini/aot-compiler.c
+@@ -9926,4 +9926,6 @@ compile_asm (MonoAotCompile *acfg)
+ #ifdef TARGET_WIN32_MSVC
+ #define AS_OPTIONS "-c -x assembler"
++#elif defined(TARGET_X86) && !defined(TARGET_MACH)
++#define AS_OPTIONS "--32"
+ #elif defined(TARGET_AMD64) && !defined(TARGET_MACH)
+ #define AS_OPTIONS "--64"
+@@ -9981,4 +9983,6 @@ compile_asm (MonoAotCompile *acfg)
+ #elif defined(TARGET_POWERPC64)
+ #define LD_OPTIONS "-m elf64ppc"
++#elif defined(TARGET_X86)
++#define LD_OPTIONS "-m elf_i386"
+ #endif
+
diff --git a/dev-lang/mono/mono-5.0.1.1.ebuild b/dev-lang/mono/mono-5.0.1.1.ebuild
index 14e9ef4..2640c83 100644
--- a/dev-lang/mono/mono-5.0.1.1.ebuild
+++ b/dev-lang/mono/mono-5.0.1.1.ebuild
@@ -12,7 +12,6 @@ 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"
-#TODO: update patch: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a0e31adf6af28adf3c8709e542ecf7039cb5942
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
IUSE="nls minimal pax_kernel xen doc"
@@ -33,10 +32,9 @@ DEPEND="${COMMONDEPEND}
!dev-lang/mono-basic
"
-#PATCHES=(
-# "${FILESDIR}"/${PN}-4.8.0.371-makedev.patch
-# "${FILESDIR}"/${PN}-4.8.0.371-x86_32.patch
-#)
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.0.1.1-x86_32.patch
+)
#S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-06-06 10:36 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-23 3:56 [gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/files/, dev-lang/mono/ Heather Cynede
-- strict thread matches above, loose matches on Subject: below --
2015-05-21 17:43 Heather Cynede
2015-07-20 12:56 Heather Cynede
2015-07-20 12:56 Heather Cynede
2015-08-01 13:21 Heather Cynede
2015-12-10 7:44 Heather Cynede
2015-12-10 7:44 Heather Cynede
2015-12-28 7:54 Heather Cynede
2017-06-06 10:36 Mikhail Pukhlikov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox