public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Heather Cynede" <cynede@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/dotnet:master commit in: dev-util/monodevelop/files/, dev-util/monodevelop/
Date: Fri, 15 Jan 2016 13:20:28 +0000 (UTC)	[thread overview]
Message-ID: <1452143240.9df07e1aef012ef4d0ffa4d7856b0be62454e675.cynede@gentoo> (raw)

commit:     9df07e1aef012ef4d0ffa4d7856b0be62454e675
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Thu Jan  7 05:07:20 2016 +0000
Commit:     Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Thu Jan  7 05:07:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=9df07e1a

https://github.com/mrward/monodevelop-nuget-addin/issues/59

 dev-util/monodevelop/files/local-nuget-icons.patch |  48 +++++++
 dev-util/monodevelop/monodevelop-5.9.5.9-r1.ebuild | 142 +++++++++++++++++++++
 2 files changed, 190 insertions(+)

diff --git a/dev-util/monodevelop/files/local-nuget-icons.patch b/dev-util/monodevelop/files/local-nuget-icons.patch
new file mode 100644
index 0000000..329c57f
--- /dev/null
+++ b/dev-util/monodevelop/files/local-nuget-icons.patch
@@ -0,0 +1,48 @@
+From c5f730b3ffcecfd15dc291353332a6a3f0bb515a Mon Sep 17 00:00:00 2001
+From: Matt Ward <matt.ward@xamarin.com>
+Date: Sat, 2 Jan 2016 15:29:00 +0000
+Subject: [PATCH] [NuGet] Support NuGet packages that use icons from local
+ files.
+
+Allows a NuGet package to use an icon, shown in the Add Packages
+dialog, taken from the local file system using a file url.
+Previously this would fail with an invalid cast exception.
+---
+ .../MonoDevelop.PackageManagement/ImageLoader.cs           | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoader.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoader.cs
+index 07b7b99..98eff92 100644
+--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoader.cs
++++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoader.cs
+@@ -91,8 +91,7 @@ namespace MonoDevelop.PackageManagement
+ 		ImageLoadedEventArgs LoadImage (Uri uri, object state)
+ 		{
+ 			try {
+-				var httpClient = new HttpClient (uri);
+-				Stream stream = httpClient.GetResponse ().GetResponseStream ();
++				Stream stream = GetResponseStream (uri);
+ 				Image image = Image.FromStream (stream);
+ 
+ 				return new ImageLoadedEventArgs (image, uri, state);
+@@ -101,6 +100,17 @@ namespace MonoDevelop.PackageManagement
+ 			}
+ 		}
+ 
++		static Stream GetResponseStream (Uri uri)
++		{
++			if (uri.IsFile) {
++				var request = WebRequest.Create (uri);
++				return request.GetResponse ().GetResponseStream ();
++			}
++
++			var httpClient = new HttpClient (uri);
++			return httpClient.GetResponse ().GetResponseStream ();
++		}
++
+ 		void OnLoaded (ITask<ImageLoadedEventArgs> task, Uri uri, object state)
+ 		{
+ 			if (task.IsFaulted) {
+-- 
+2.6.0
+

diff --git a/dev-util/monodevelop/monodevelop-5.9.5.9-r1.ebuild b/dev-util/monodevelop/monodevelop-5.9.5.9-r1.ebuild
new file mode 100644
index 0000000..ee1cc62
--- /dev/null
+++ b/dev-util/monodevelop/monodevelop-5.9.5.9-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit fdo-mime gnome2-utils dotnet versionator eutils git-r3
+
+DESCRIPTION="Integrated Development Environment for .NET"
+HOMEPAGE="http://www.monodevelop.com/"
+SRC_URI="https://launchpadlibrarian.net/68057829/NUnit-2.5.10.11092.zip
+	https://www.nuget.org/api/v2/package/NUnit/2.6.3 -> NUnit.2.6.3.zip
+	https://www.nuget.org/api/v2/package/NUnit.Runners/2.6.3  -> NUnit.Runners.2.6.3.zip
+	https://www.nuget.org/api/v2/package/System.Web.Mvc.Extensions.Mvc.4/1.0.9 -> System.Web.Mvc.Extensions.Mvc.4.1.0.9.zip
+	https://www.nuget.org/api/v2/package/Microsoft.AspNet.Mvc/5.2.2 -> Microsoft.AspNet.Mvc.5.2.2.zip
+	https://www.nuget.org/api/v2/package/Microsoft.AspNet.Razor/3.2.2 -> Microsoft.AspNet.Razor.3.2.2.zip
+	https://www.nuget.org/api/v2/package/Microsoft.AspNet.WebPages/3.2.2 -> Microsoft.AspNet.WebPages.3.2.2.zip
+	https://www.nuget.org/api/v2/package/Microsoft.Web.Infrastructure/1.0.0.0 -> Microsoft.Web.Infrastructure.1.0.0.0.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+subversion +git doc +gnome qtcurve"
+
+RDEPEND=">=dev-lang/mono-3.2.8
+	>=dev-dotnet/nuget-2.8.3
+	gnome? ( >=dev-dotnet/gnome-sharp-2.24.2-r1 )
+	>=dev-dotnet/gtk-sharp-2.12.21:2
+	doc? ( dev-util/mono-docbrowser )
+	>=www-servers/xsp-2
+	dev-util/ctags
+	sys-apps/dbus[X]
+	subversion? ( dev-vcs/subversion )
+	!<dev-util/monodevelop-boo-$(get_version_component_range 1-2)
+	!<dev-util/monodevelop-java-$(get_version_component_range 1-2)
+	!<dev-util/monodevelop-database-$(get_version_component_range 1-2)
+	!<dev-util/monodevelop-debugger-gdb-$(get_version_component_range 1-2)
+	!<dev-util/monodevelop-debugger-mdb-$(get_version_component_range 1-2)
+	!<dev-util/monodevelop-vala-$(get_version_component_range 1-2)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	x11-misc/shared-mime-info
+	x11-terms/xterm
+	app-arch/unzip"
+MAKEOPTS="${MAKEOPTS} -j1" #nowarn
+S="${WORKDIR}"/${P}
+EGIT_REPO_URI="https://github.com/mono/monodevelop.git"
+EGIT_COMMIT="${P}"
+
+src_unpack() {
+	cd "${T}"
+	unpack NUnit-2.5.10.11092.zip
+
+	#clone from git
+	git-r3_fetch
+	git-r3_checkout "${EGIT_REPO_URI}" "${T}/${P}"
+
+	#extract packages
+	mkdir -p "${T}"/packages || die
+	cd "${T}"/packages || die
+
+	for pkg in NUnit.2.6.3 \
+				NUnit.Runners.2.6.3 \
+				System.Web.Mvc.Extensions.Mvc.4.1.0.9 \
+				Microsoft.AspNet.Mvc.5.2.2 \
+				Microsoft.AspNet.Razor.3.2.2 \
+				Microsoft.AspNet.WebPages.3.2.2 \
+				Microsoft.Web.Infrastructure.1.0.0.0
+	do
+		mkdir $pkg || die
+		cd $pkg || die
+		unpack $pkg.zip
+		cd .. || die
+	done
+	mkdir -p "${S}"
+}
+
+src_prepare() {
+	# Remove the git rev-parse (changelog?)
+	sed -i '/<Exec.*rev-parse/ d' "${T}/${P}/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj" || die
+	# Set specific_version to prevent binding problem
+	# when gtk#-3 is installed alongside gtk#-2
+	find "${T}/${P}" -name '*.csproj' -exec sed -i 's#<SpecificVersion>.*</SpecificVersion>#<SpecificVersion>True</SpecificVersion>#' {} + || die
+
+	#fix ASP.Net
+	cd "${T}/${P}/main"
+	epatch "${FILESDIR}/5.7-downgrade_to_mvc3.patch"
+
+	# fix for https://github.com/gentoo/dotnet/issues/42
+	epatch "${FILESDIR}/aspnet-template-references-fix.patch"
+	use gnome || epatch "${FILESDIR}/5.9.5-kill-gnome.patch"
+	use qtcurve && epatch "${FILESDIR}/kill-qtcurve-warning.patch"
+
+	#prepare dist package
+	cd "${T}/${P}"
+	epatch "${FILESDIR}/5.9.5-skip_merged_tar.patch"
+	./configure --profile=default || die
+	make dist || die
+
+	#move it
+	mv -f "${T}/${P}/tarballs/"monodevelop-*/* "${S}" || die
+
+	#copy missing binaries
+	mkdir -p "${S}"/external/cecil/Test/libs/nunit-2.5.10/ || die
+	cp -fR "${T}"/NUnit-2.5.10.11092/bin/net-2.0/framework/* "${S}"/external/cecil/Test/libs/nunit-2.5.10/ || die
+	mv -f "${T}/packages" "${S}"
+
+	epatch "${FILESDIR}/local-nuget-icons.patch"
+}
+
+src_configure() {
+	# env vars are added as the fix for https://github.com/gentoo/dotnet/issues/29
+	MCS=/usr/bin/dmcs CSC=/usr/bin/dmcs GMCS=/usr/bin/dmcs econf \
+		--disable-update-mimedb \
+		--disable-update-desktopdb \
+		--enable-monoextensions \
+		--enable-gnomeplatform \
+		$(use_enable subversion) \
+		$(use_enable git)
+	# https://github.com/mrward/xdt/issues/4
+	# Main.sln file is created on the fly during econf
+	epatch -p2 "${FILESDIR}/mrward-xdt-issue-4.patch"
+	# fix of https://github.com/gentoo/dotnet/issues/38
+	sed -i -E -e 's#(EXE_PATH=")(.*)(/lib/monodevelop/bin/MonoDevelop.exe")#\1'${EPREFIX}'/usr\3#g' "${S}/monodevelop" || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}


             reply	other threads:[~2016-01-15 13:20 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-15 13:20 Heather Cynede [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-07-20 12:56 [gentoo-commits] proj/dotnet:master commit in: dev-util/monodevelop/files/, dev-util/monodevelop/ Heather Cynede
2015-05-28  4:26 Heather Cynede

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1452143240.9df07e1aef012ef4d0ffa4d7856b0be62454e675.cynede@gentoo \
    --to=cynede@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox