From fb74a874e380cfaec095d6f81fe37052c5a8d1eb Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Wed, 30 Dec 2020 09:27:39 -0500 Subject: dev-lang/mono: add bump to 6.12 --- dev-lang/mono/Manifest | 1 + dev-lang/mono/files/mono-5.12-try-catch.patch | 31 ++++++++ dev-lang/mono/mono-6.12.0.107.ebuild | 105 ++++++++++++++++++++++++++ 3 files changed, 137 insertions(+) create mode 100644 dev-lang/mono/Manifest create mode 100644 dev-lang/mono/files/mono-5.12-try-catch.patch create mode 100644 dev-lang/mono/mono-6.12.0.107.ebuild diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest new file mode 100644 index 0000000..f30e6e5 --- /dev/null +++ b/dev-lang/mono/Manifest @@ -0,0 +1 @@ +DIST mono-6.12.0.107.tar.xz 291862192 BLAKE2B 5a4773ada5bbc08aa95b5bf718e07ed7f9165891519eb95db5b8fccde27006b6868223bf64c046ecfd29780cb2794761dc1877e134a4f33fd249e39006723ebf SHA512 567cd37847bd5a0bf78df8a3ada2ed2cfb10e466fffb5aadc3d145751552720bdd1fc2a734fba142b91f2e221f42b6717d6eb3f7c8823cbec3d458b10712d7ea diff --git a/dev-lang/mono/files/mono-5.12-try-catch.patch b/dev-lang/mono/files/mono-5.12-try-catch.patch new file mode 100644 index 0000000..051c72b --- /dev/null +++ b/dev-lang/mono/files/mono-5.12-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-6.12.0.107.ebuild b/dev-lang/mono/mono-6.12.0.107.ebuild new file mode 100644 index 0000000..817de94 --- /dev/null +++ b/dev-lang/mono/mono-6.12.0.107.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" + +SLOT="0" + +IUSE="nls minimal pax_kernel xen doc" + +inherit autotools eutils linux-info mono-env flag-o-matic pax-utils multilib-minimal + +DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter" +HOMEPAGE="https://mono-project.com" +LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL" + +SRC_URI="https://download.mono-project.com/sources/mono/${P}.tar.xz" + +#Note: mono works incorrect with older versions of libgdiplus +#details on dotnet overlay issue: https://github.com/gentoo/dotnet/issues/429 +COMMONDEPEND=" + !minimal? ( >=dev-dotnet/libgdiplus-6.0.2 ) + ia64? ( sys-libs/libunwind ) + nls? ( sys-devel/gettext ) +" +RDEPEND="${COMMONDEPEND}" +DEPEND="${COMMONDEPEND} + sys-devel/bc + virtual/yacc + pax_kernel? ( sys-apps/elfix ) + dev-util/cmake +" + +PATCHES=( + "${FILESDIR}"/mono-5.12-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 https://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 + + default + + # PATCHES contains configure.ac patch + eautoreconf + multilib_copy_sources +} + +multilib_src_configure() { + local myeconfargs=( + $(use_with xen xen_opt) + --without-ikvm-native + --disable-dtrace + --enable-system-aot + $(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/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 +} -- cgit v1.2.3-54-g00ecf