[gentoo-commits] proj/dotnet:master commit in: dev-util/monodevelop/, dev-util/monodevelop/files/
commit: 7da5376f5d63f70afe715fd6cdce3bd794a94296 Author: Bennjamin Blast gmail com> AuthorDate: Tue May 10 03:37:50 2016 + Commit: Heather Cynede gentoo org> CommitDate: Tue May 10 03:48:54 2016 + URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=7da5376f Add monodevelop-6.0.0.4761 .../files/6.0-aspnet-template-references-fix.patch | 20 +++ dev-util/monodevelop/files/6.0-kill-gnome.patch| 184 + dev-util/monodevelop/monodevelop-6.0.0.4761.ebuild | 124 ++ 3 files changed, 328 insertions(+) diff --git a/dev-util/monodevelop/files/6.0-aspnet-template-references-fix.patch b/dev-util/monodevelop/files/6.0-aspnet-template-references-fix.patch new file mode 100644 index 000..9cc1f26 --- /dev/null +++ b/dev-util/monodevelop/files/6.0-aspnet-template-references-fix.patch @@ -0,0 +1,20 @@ +diff -u -r work.unpacked/monodevelop-6.0/src/addins/AspNet/Templates/Projects/EmptyMvcProject.xpt.xml work/monodevelop-6.0/src/addins/AspNet/Templates/Projects/EmptyMvcProject.xpt.xml +--- work.unpacked/monodevelop-6.0/src/addins/AspNet/Templates/Projects/EmptyMvcProject.xpt.xml work/monodevelop-6.0/src/addins/AspNet/Templates/Projects/EmptyProject.xpt.xml +@@ -27,5 +27,6 @@ + + + ++ + + +diff -u -r work.unpacked/monodevelop-6.0/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml work/monodevelop-6.0/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml +--- work.unpacked/monodevelop-6.0/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml work/monodevelop-6.0/src/addins/AspNet/Templates/Projects/MvcProject.xpt.xml +@@ -29,5 +29,6 @@ + + + ++ + + diff --git a/dev-util/monodevelop/files/6.0-kill-gnome.patch b/dev-util/monodevelop/files/6.0-kill-gnome.patch new file mode 100644 index 000..c70ba24 --- /dev/null +++ b/dev-util/monodevelop/files/6.0-kill-gnome.patch @@ -0,0 +1,184 @@ +diff -rupN configure.in configure.in +--- configure.in 2016-05-08 19:44:27.107588191 -0400 configure.in 2016-05-08 19:47:32.570263105 -0400 +@@ -137,13 +137,6 @@ PKG_CHECK_MODULES(MONODOC, monodoc >= $M + AC_SUBST(MONODOC_LIBS) + + dnl soft dependencies +-PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gnome_sharp=yes], [gnome_sharp=no]) +-AC_SUBST(GNOME_SHARP_LIBS) +-PKG_CHECK_MODULES(GNOME_VFS_SHARP, gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gnome_vfs_sharp=yes], [gnome_vfs_sharp=no]) +-AC_SUBST(GNOME_VFS_SHARP_LIBS) +-PKG_CHECK_MODULES(GCONF_SHARP, gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION, [gconf_sharp=yes], [gconf_sharp=no]) +-AC_SUBST(GCONF_SHARP_LIBS) +- + gtksharp_prefix="`$PKG_CONFIG --variable=prefix gtk-sharp-2.0`" + AC_SUBST(gtksharp_prefix) + +@@ -202,13 +195,4 @@ AC_ARG_ENABLE(gnomeplatform, + if test x$enable_gnomeplatform = xyes; then +- if test x$gnome_sharp = xno; then +- AC_MSG_ERROR([Cannot enable GNOME platform without gnome-sharp-2.0]) +- fi +- if test x$gnome_vfs_sharp = xno; then +- AC_MSG_ERROR([Cannot enable GNOME platform without gnome-vfs-sharp-2.0]) +- fi +- if test x$gconf_sharp = xno; then +- AC_MSG_ERROR([Cannot enable GNOME platform without gconf-sharp-2.0]) +- fi + platform_bindings="${platform_bindings}GNOME " + fi + +diff -rupN configure configure +--- configure 2016-05-08 19:53:21.359551637 -0400 configure 2016-05-08 19:53:29.043391220 -0400 +@@ -4116,13 +4116,4 @@ + if test x$enable_gnomeplatform = xyes; then +- if test x$gnome_sharp = xno; then +- as_fn_error $? "Cannot enable GNOME platform without gnome-sharp-2.0" "$LINENO" 5 +- fi +- if test x$gnome_vfs_sharp = xno; then +- as_fn_error $? "Cannot enable GNOME platform without gnome-vfs-sharp-2.0" "$LINENO" 5 +- fi +- if test x$gconf_sharp = xno; then +- as_fn_error $? "Cannot enable GNOME platform without gconf-sharp-2.0" "$LINENO" 5 +- fi + platform_bindings="${platform_bindings}GNOME " + fi + +diff -rupN src/addins/GnomePlatform/GnomePlatform.cs src/addins/GnomePlatform/GnomePlatform.cs +--- src/addins/GnomePlatform/GnomePlatform.cs 2015-07-18 18:40:15.946222126 +0200 src/addins/GnomePlatform/GnomePlatform.cs 2015-07-18 19:56:35.272686234 +0200 +@@ -26,7 +26,6 @@ + // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + // + +-using Gnome; + using MonoDevelop.Ide.Desktop; + using System; + using System.Collections.Generic; +@@ -40,44 +39,13 @@ namespace MonoDevelop.Platform + { + public class GnomePlatform : PlatformService + {
[gentoo-commits] proj/dotnet:master commit in: dev-util/monodevelop/, dev-util/monodevelop/files/, ...
commit: 0bee78591f675dc50e69405d2e6bfdbd56e44e55 Author: layman layman AT localhost AuthorDate: Fri Mar 6 05:15:16 2015 + Commit: Heather Cynede cynede AT gentoo DOT org CommitDate: Fri Mar 6 05:15:16 2015 + URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=0bee7859 fi .../nuget-for-monodevelop-2.8.1.ebuild | 51 +++ .../monodevelop/files/gentoo-dotnet-issue-30.patch | 18 .../monodevelop/files/mrward-xdt-issue-4.patch | 34 dev-util/monodevelop/monodevelop-5.7.0-r1.ebuild | 99 ++ 4 files changed, 202 insertions(+) diff --git a/dev-dotnet/nuget-for-monodevelop/nuget-for-monodevelop-2.8.1.ebuild b/dev-dotnet/nuget-for-monodevelop/nuget-for-monodevelop-2.8.1.ebuild new file mode 100644 index 000..6989a1e --- /dev/null +++ b/dev-dotnet/nuget-for-monodevelop/nuget-for-monodevelop-2.8.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +USE_DOTNET=net45 + +inherit dotnet eutils + +DESCRIPTION=Nuget - .NET Package Manager +HOMEPAGE=http://nuget.codeplex.com; +SRC_URI=https://github.com/mrward/nuget/archive/Release-${PV}-MonoDevelop.tar.gz - nuget-for-monodevelop-${PV}.tar.gz +S=${WORKDIR}/nuget-Release-${PV}-MonoDevelop + +LICENSE=Apache-2.0 +SLOT=0 + +KEYWORDS=x86 amd64 +IUSE= + +# Mask 3.2.0 because of mcs compiler bug : http://stackoverflow.com/a/17926731/238232 +# it fixed in 3.2.3 +DEPEND=|| ( =dev-lang/mono-3.2.3 dev-lang/mono-3.2.0 ) +RDEPEND=${DEPEND} + +pkg_setup() { + dotnet_pkg_setup + mozroots --import --sync --machine +} + +src_prepare() { + sed -i -e 's@RunTests@ @g' ${S}/Build/Build.proj || die +} + +src_configure() { + export EnableNuGetPackageRestore=true +} + +src_compile() { +# xbuild Build/Build.proj /p:Configuration=Release /p:TreatWarningsAsErrors=false /tv:4.0 /p:TargetFrameworkVersion=v${FRAMEWORK} /p:Configuration=Mono Release /t:GoMono || die + esource ./build.sh +} + +src_install() { + elog Installing libraries + + insinto /usr/lib/mono/NuGet/${FRAMEWORK}/ + doins src/CommandLine/obj/Mono\ Release/NuGet.exe + doins src/Core/obj/Mono\ Release/NuGet.Core.dll + make_wrapper nuget mono /usr/lib/mono/NuGet/${FRAMEWORK}/NuGet.exe +} diff --git a/dev-util/monodevelop/files/gentoo-dotnet-issue-30.patch b/dev-util/monodevelop/files/gentoo-dotnet-issue-30.patch new file mode 100644 index 000..63ae0ea --- /dev/null +++ b/dev-util/monodevelop/files/gentoo-dotnet-issue-30.patch @@ -0,0 +1,18 @@ +--- work.orig/monodevelop-5.7/external/ikvm/reflect/IKVM.Reflection.csproj 2015-03-05 15:53:11.019394980 +0300 work/monodevelop-5.7/external/ikvm/reflect/IKVM.Reflection.csproj 2015-03-05 16:09:18.814671809 +0300 +@@ -1,5 +1,5 @@ + ?xml version=1.0 encoding=utf-8? +-Project ToolsVersion=3.5 DefaultTargets=Build xmlns=http://schemas.microsoft.com/developer/msbuild/2003; ++Project ToolsVersion=4.0 DefaultTargets=Build xmlns=http://schemas.microsoft.com/developer/msbuild/2003; + PropertyGroup + Configuration Condition= '$(Configuration)' == '' Debug/Configuration + Platform Condition= '$(Platform)' == '' AnyCPU/Platform +@@ -10,7 +10,7 @@ + AppDesignerFolderProperties/AppDesignerFolder + RootNamespaceIKVM.Reflection/RootNamespace + AssemblyNameIKVM.Reflection/AssemblyName +-TargetFrameworkVersionv2.0/TargetFrameworkVersion ++TargetFrameworkVersionv4.5/TargetFrameworkVersion + FileAlignment512/FileAlignment + TargetFrameworkSubset + /TargetFrameworkSubset diff --git a/dev-util/monodevelop/files/mrward-xdt-issue-4.patch b/dev-util/monodevelop/files/mrward-xdt-issue-4.patch new file mode 100644 index 000..8d0a30b --- /dev/null +++ b/dev-util/monodevelop/files/mrward-xdt-issue-4.patch @@ -0,0 +1,34 @@ +--- work/monodevelop-5.7/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml 2015-01-12 22:19:13.0 +0300 work.new/monodevelop-5.7/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.addin.xml 2015-03-06 07:45:39.278552461 +0300 +@@ -2,7 +2,6 @@ + + Runtime + Import assembly=MonoDevelop.PackageManagement.dll / +- Import assembly=Microsoft.Web.XmlTransform.dll / + Import assembly=NuGet.Core.dll / + /Runtime + +--- work/monodevelop-5.7/Main.sln 2015-01-12 22:19:13.0 +0300 work.new/monodevelop-5.7/Main.sln 2015-03-06 08:00:52.860939203 +0300 +@@ -555,21 +555,13 @@ + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {252117CA-0ABB-4F36-BFC8-DE23A8089BB9}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU + {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {2645C9F3-9ED5-4806-AB09-DAD9BE90C67B}.Debug|Any
[gentoo-commits] proj/dotnet:master commit in: dev-util/monodevelop/, dev-util/monodevelop/files/
commit: 317a503ace2ecfd6b9cc40e01515d800b3e22df7 Author: Tomáš Chaloupka chalucha AT gmail DOT com AuthorDate: Thu Feb 19 22:41:48 2015 + Commit: Heather Cynede cynede AT gentoo DOT org CommitDate: Thu Feb 19 22:41:48 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/dotnet.git;a=commit;h=317a503a patch to install ASP.Net addin --- .../monodevelop/files/5.7-downgrade_to_mvc3.patch | 47 ++ dev-util/monodevelop/monodevelop-5.7.0.ebuild | 3 ++ 2 files changed, 50 insertions(+) diff --git a/dev-util/monodevelop/files/5.7-downgrade_to_mvc3.patch b/dev-util/monodevelop/files/5.7-downgrade_to_mvc3.patch new file mode 100644 index 000..ba76794 --- /dev/null +++ b/dev-util/monodevelop/files/5.7-downgrade_to_mvc3.patch @@ -0,0 +1,47 @@ +Index: xamarin-pkg-monodevelop/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml +=== +--- xamarin-pkg-monodevelop.orig/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml 2015-01-15 19:43:29.994850405 + xamarin-pkg-monodevelop/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml 2015-01-15 19:51:12.746841738 + +@@ -1,13 +1,13 @@ + ExtensionModel + + Runtime +- Import assembly = System.Web.Helpers.dll / +- Import assembly = System.Web.Mvc.dll / +- Import assembly = System.Web.Razor.dll / +- Import assembly = System.Web.WebPages.Deployment.dll / +- Import assembly = System.Web.WebPages.dll / +- Import assembly = System.Web.WebPages.Razor.dll / +- ++!-- Import assembly = System.Web.Helpers.dll / ++ Import assembly = System.Web.Mvc.dll / ++ Import assembly = System.Web.Razor.dll / ++ Import assembly = System.Web.WebPages.Deployment.dll / ++ Import assembly = System.Web.WebPages.dll / ++ Import assembly = System.Web.WebPages.Razor.dll / -- ++ + Import file = Html/Schemas/xhtml1-strict.xsd / + Import file = Html/Schemas/xhtml1-transitional.xsd / + Import file = Html/Schemas/xhtml1-frameset.xsd / +@@ -202,10 +202,10 @@ + guid={E53F8FEA-EAE0-44A6-8774-FFD645390401} + type=MonoDevelop.AspNet.Projects.AspMvc3Project + useXBuild=true / +- DotNetProjectSubtype ++!-- DotNetProjectSubtype + guid={E3E379DF-F4C6-4180-9B81-6769533ABE47} + type=MonoDevelop.AspNet.Projects.AspMvc4Project +- useXBuild=true / ++ useXBuild=true / -- + DotNetProjectSubtype + id=MonoDevelop.AspNet.Projects.AspNetAppProject + guid={349C5851-65DF-11DA-9384-00065B846F21} +@@ -216,7 +216,7 @@ + Extension path = /MonoDevelop/TypeSystem/Parser + Parser class = MonoDevelop.AspNet.WebForms.WebFormsParser mimeType=application/x-aspx, application/x-ascx, application/x-master-page / + Parser class = MonoDevelop.AspNet.Html.HtmlParser mimeType=text/html, application/x-spark / +- Parser class = MonoDevelop.AspNet.Razor.RazorCSharpParser mimeType=text/x-cshtml / ++ Parser class = MonoDevelop.AspNet.Razor.RazorCSharpParser mimeType=text/x-cshtml / + /Extension + + Extension path = /MonoDevelop/ProjectModel/SerializableClasses diff --git a/dev-util/monodevelop/monodevelop-5.7.0.ebuild b/dev-util/monodevelop/monodevelop-5.7.0.ebuild index 5aa6ba5..dab577e 100644 --- a/dev-util/monodevelop/monodevelop-5.7.0.ebuild +++ b/dev-util/monodevelop/monodevelop-5.7.0.ebuild @@ -60,6 +60,9 @@ src_prepare() { # when gtk#-3 is installed alongside gtk#-2 find ${S} -name '*.csproj' -exec sed -i 's#SpecificVersion.*/SpecificVersion#SpecificVersionTrue/SpecificVersion#' {} + || die + #fix ASP.Net + epatch ${FILESDIR}/5.7-downgrade_to_mvc3.patch + #copy missing binaries mkdir -p ${S}/packages/NUnit.2.6.3/lib || die mkdir -p ${S}/packages/NUnit.Runners.2.6.3/tools/lib || die