commit: 94d3a15171b8a1ce6ea2b0afa7e4d74bd5217b7d
Author: ArsenShnurkov <ArsenShnurkov <AT> users <DOT> noreply <DOT> github
<DOT> com>
AuthorDate: Wed Dec 27 23:24:34 2017 +0000
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Wed Dec 27 23:24:34 2017 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=94d3a151
build with new jemalloc code (turned off)
dev-lang/mono/files/try-catch.patch | 31 ++++++
dev-lang/mono/mono-5.11.0.132_pre.ebuild | 114 +++++++++++++++++++++
dev-util/monodevelop/monodevelop-6.0.0.4761.ebuild | 1 -
3 files changed, 145 insertions(+), 1 deletion(-)
diff --git a/dev-lang/mono/files/try-catch.patch
b/dev-lang/mono/files/try-catch.patch
new file mode 100644
index 0000000..051c72b
--- /dev/null
+++ b/dev-lang/mono/files/try-catch.patch
@@ -0,0 +1,31 @@
+diff -ur
mono-5.9.0.398/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
mono-patched-5.9.0.398/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
+---
mono-5.9.0.398/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
2017-11-17 18:12:57.000000000 +0300
++++
mono-patched-5.9.0.398/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
2017-12-06 06:24:45.067519852 +0300
+@@ -2810,14 +2810,21 @@
+
+ internal override object ClipboardRetrieve(IntPtr handle, int
type, XplatUI.ClipboardToObject converter)
+ {
+- XConvertSelection(DisplayHandle, handle, (IntPtr)type,
(IntPtr)type, FosterParent, IntPtr.Zero);
++ try
++ {
++ XConvertSelection(DisplayHandle, handle,
(IntPtr)type, (IntPtr)type, FosterParent, IntPtr.Zero);
+
+- Clipboard.Retrieving = true;
+- while (Clipboard.Retrieving) {
+- UpdateMessageQueue(null, false);
+- }
++ Clipboard.Retrieving = true;
++ while (Clipboard.Retrieving) {
++ UpdateMessageQueue(null, false);
++ }
+
+- return Clipboard.Item;
++ return Clipboard.Item;
++ }
++ catch (Exception ex)
++ {
++ return null;
++ }
+ }
+
+ internal override void ClipboardStore (IntPtr handle, object
obj, int type, XplatUI.ObjectToClipboard converter, bool copy)
diff --git a/dev-lang/mono/mono-5.11.0.132_pre.ebuild
b/dev-lang/mono/mono-5.11.0.132_pre.ebuild
new file mode 100644
index 0000000..f054844
--- /dev/null
+++ b/dev-lang/mono/mono-5.11.0.132_pre.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+RESTRICT="mirror"
+SLOT="0"
+
+IUSE="nls minimal pax_kernel xen doc"
+
+inherit autotools eutils linux-info mono-env flag-o-matic pax-utils
versionator multilib-minimal
+
+MY_PN="${PN}"
+MY_PV="$(get_version_component_range 1-4)"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.mono-project.com/Main_Page";
+LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception
IDPL"
+
+SRC_URI="http://download.mono-project.com/sources/mono/nightly/${MY_P}.tar.bz2";
+S="${WORKDIR}/${MY_P}"
+
+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-util/cmake
+ !dev-lang/mono-basic
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.0.1.1-x86_32.patch
+ "${FILESDIR}"/try-catch.patch
+)
+
+pkg_pretend() {
+ linux-info_pkg_setup
+ if use kernel_linux; then
+ if linux_config_exists; then
+ linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not
enabled in the kernel"
+ else
+ #
https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686
+ ewarn "kernel config not found"
+ ewarn "If CONFIG_SYSVIPC is not set in your kernel
.config, mono will hang while compiling."
+ ewarn "See http://bugs.gentoo.org/261869 for more info."
+ fi
+ fi
+}
+
+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
+
+ #TODO: resolve problem with newer binutils
+ #bug: https://bugs.gentoo.org/show_bug.cgi?id=600664
+ #append-flags -fPIC
+
+ default
+ # PATCHES contains configure.ac patch
+ eautoreconf
+ multilib_copy_sources
+}
+
+multilib_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)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+ cd mcs/tests || die
+ emake check
+}
+
+multilib_src_install() {
+ default_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/[email protected]/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
+}
diff --git a/dev-util/monodevelop/monodevelop-6.0.0.4761.ebuild
b/dev-util/monodevelop/monodevelop-6.0.0.4761.ebuild
index 8a8309b..4cfc150 100644
--- a/dev-util/monodevelop/monodevelop-6.0.0.4761.ebuild
+++ b/dev-util/monodevelop/monodevelop-6.0.0.4761.ebuild
@@ -18,7 +18,6 @@ KEYWORDS="~amd64 ~x86"
IUSE="+subversion +git doc +gnome qtcurve"
COMMON_DEPEND="
- >=dev-lang/mono-3.2.8
>=dev-dotnet/gtk-sharp-2.12.21:2
>=dev-dotnet/nuget-2.8.7
dev-dotnet/referenceassemblies-pcl
