From abd04103bc4e4ea6fc8fe92ac69232367cf9da08 Mon Sep 17 00:00:00 2001 From: Peter Johanson Date: Thu, 8 Sep 2005 20:32:52 +0000 Subject: [PATCH] Revision bump with boo and gtk-sharp fixes. Package-Manager: portage-2.0.51.22-r2 --- dev-util/monodevelop/ChangeLog | 9 +- dev-util/monodevelop/Manifest | 6 +- .../files/digest-monodevelop-0.7-r1 | 1 + .../monodevelop-0.7-boo-0.6.0-compat.diff | 26 +++++ .../monodevelop-0.7-gtksharp-update.diff | 96 +++++++++++++++++++ .../monodevelop/monodevelop-0.7-r1.ebuild | 69 +++++++++++++ 6 files changed, 205 insertions(+), 2 deletions(-) create mode 100644 dev-util/monodevelop/files/digest-monodevelop-0.7-r1 create mode 100644 dev-util/monodevelop/files/monodevelop-0.7-boo-0.6.0-compat.diff create mode 100644 dev-util/monodevelop/files/monodevelop-0.7-gtksharp-update.diff create mode 100644 dev-util/monodevelop/monodevelop-0.7-r1.ebuild diff --git a/dev-util/monodevelop/ChangeLog b/dev-util/monodevelop/ChangeLog index 7d47071c1928..8aa9b2e53e28 100644 --- a/dev-util/monodevelop/ChangeLog +++ b/dev-util/monodevelop/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/monodevelop # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/ChangeLog,v 1.33 2005/08/17 02:46:45 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/ChangeLog,v 1.34 2005/09/08 20:32:52 latexer Exp $ + +*monodevelop-0.7-r1 (08 Sep 2005) + + 08 Sep 2005; Peter Johanson + +files/monodevelop-0.7-boo-0.6.0-compat.diff, + +files/monodevelop-0.7-gtksharp-update.diff, +monodevelop-0.7-r1.ebuild: + Revision bump with boo and gtk-sharp fixes. 17 Aug 2005; Peter Johanson -monodevelop-0.5.1-r3.ebuild, -monodevelop-0.6.ebuild: diff --git a/dev-util/monodevelop/Manifest b/dev-util/monodevelop/Manifest index e68fc21c9b19..e1e97ee00713 100644 --- a/dev-util/monodevelop/Manifest +++ b/dev-util/monodevelop/Manifest @@ -1,8 +1,12 @@ MD5 35c17e64aed292e7a7f6aeb5915787a3 monodevelop-0.5.1-r4.ebuild 1559 -MD5 1e3ef7700b9ac93d7e3e9fe852595d19 ChangeLog 5619 +MD5 ce64f8726eadf694a85c135f454b65d5 ChangeLog 5875 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159 +MD5 9cf588769f67de01bdb230e64b451ac5 monodevelop-0.7-r1.ebuild 1800 MD5 13904679a3ded9ecacaa67f19771c483 monodevelop-0.7.ebuild 1647 MD5 f36ce806f3552f974021d1a56021f67c files/monodevelop-0.5.1-iconloader.diff 1255 MD5 9e3ea3908c299c9240a5f7689f83909a files/monodevelop-0.5.1-nemerle-gtk-sharp.diff 1874 +MD5 48b44fa7ba76c3b567d260ecff9e7aea files/digest-monodevelop-0.7-r1 68 MD5 8c9f33855ebcc0bd8100baec6a00fb50 files/digest-monodevelop-0.5.1-r4 157 MD5 48b44fa7ba76c3b567d260ecff9e7aea files/digest-monodevelop-0.7 68 +MD5 cff7e9d967516c14789c6d0246791c9d files/monodevelop-0.7-boo-0.6.0-compat.diff 1576 +MD5 31886624cd9fce60d5c7346c2b22960e files/monodevelop-0.7-gtksharp-update.diff 8260 diff --git a/dev-util/monodevelop/files/digest-monodevelop-0.7-r1 b/dev-util/monodevelop/files/digest-monodevelop-0.7-r1 new file mode 100644 index 000000000000..c965015f597c --- /dev/null +++ b/dev-util/monodevelop/files/digest-monodevelop-0.7-r1 @@ -0,0 +1 @@ +MD5 a62a5e12127ca5dd8c3e4f44dd6ecc4b monodevelop-0.7.tar.gz 1901522 diff --git a/dev-util/monodevelop/files/monodevelop-0.7-boo-0.6.0-compat.diff b/dev-util/monodevelop/files/monodevelop-0.7-boo-0.6.0-compat.diff new file mode 100644 index 000000000000..2b67bf6b4ae3 --- /dev/null +++ b/dev-util/monodevelop/files/monodevelop-0.7-boo-0.6.0-compat.diff @@ -0,0 +1,26 @@ +diff -aur monodevelop-0.7-orig/Extras/BooBinding/BooBindingCompilerServices.boo monodevelop-0.7/Extras/BooBinding/BooBindingCompilerServices.boo +--- monodevelop-0.7-orig/Extras/BooBinding/BooBindingCompilerServices.boo 2005-04-25 21:27:10.000000000 -0400 ++++ monodevelop-0.7/Extras/BooBinding/BooBindingCompilerServices.boo 2005-09-06 21:31:23.000000000 -0400 +@@ -105,7 +105,7 @@ + try: + monitor.BeginTask (null, 2) + monitor.Log.WriteLine ("Compiling Boo source code ...") +- arguments = String.Format ("-c \"{0} {1} > {2} 2> {3}\"", (compiler, args, output, error)) ++ arguments = String.Format ("-c \"{0} {1} > {2} 2> {3}\"", compiler, args, output, error) + si = ProcessStartInfo ("/bin/sh", arguments) + // print "${si.FileName}, ${si.Arguments}" + si.RedirectStandardOutput = true +diff -aur monodevelop-0.7-orig/Extras/BooBinding/Gui/OptionPanels/CodeCompilationPanel.boo monodevelop-0.7/Extras/BooBinding/Gui/OptionPanels/CodeCompilationPanel.boo +--- monodevelop-0.7-orig/Extras/BooBinding/Gui/OptionPanels/CodeCompilationPanel.boo 2005-04-27 22:38:46.000000000 -0400 ++++ monodevelop-0.7/Extras/BooBinding/Gui/OptionPanels/CodeCompilationPanel.boo 2005-08-29 09:29:06.000000000 -0400 +@@ -119,9 +119,7 @@ + labelCompileTarget.Markup = String.Format ("{0} :", GettextCatalog.GetString ("Output Assembly")) + + +- typeArray = array(System.Type, 1) +- typeArray[0] = typeof(string) +- store = ListStore (typeArray) ++ store = ListStore (typeof(string)) + + stringArray = array(System.String, 1) + stringArray[0] = GettextCatalog.GetString ("Executable") diff --git a/dev-util/monodevelop/files/monodevelop-0.7-gtksharp-update.diff b/dev-util/monodevelop/files/monodevelop-0.7-gtksharp-update.diff new file mode 100644 index 000000000000..e2204298ecbf --- /dev/null +++ b/dev-util/monodevelop/files/monodevelop-0.7-gtksharp-update.diff @@ -0,0 +1,96 @@ +diff -aur monodevelop-0.7-orig/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GladeSharp2Project.xpt.xml monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GladeSharp2Project.xpt.xml +--- monodevelop-0.7-orig/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GladeSharp2Project.xpt.xml 2005-02-19 19:50:39.000000000 -0500 ++++ monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GladeSharp2Project.xpt.xml 2005-08-29 09:19:06.000000000 -0400 +@@ -27,12 +27,12 @@ + + + +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ + + + +diff -aur monodevelop-0.7-orig/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GnomeSharp2Project.xpt.xml monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GnomeSharp2Project.xpt.xml +--- monodevelop-0.7-orig/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GnomeSharp2Project.xpt.xml 2005-02-19 19:50:39.000000000 -0500 ++++ monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GnomeSharp2Project.xpt.xml 2005-08-29 09:19:06.000000000 -0400 +@@ -27,12 +27,12 @@ + + + +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ + + + +diff -aur monodevelop-0.7-orig/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GtkSharp2Project.xpt.xml monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GtkSharp2Project.xpt.xml +--- monodevelop-0.7-orig/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GtkSharp2Project.xpt.xml 2005-02-19 19:50:39.000000000 -0500 ++++ monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/templates/GtkSharp2Project.xpt.xml 2005-08-29 09:19:06.000000000 -0400 +@@ -27,11 +27,11 @@ + + + +- +- +- +- +- ++ ++ ++ ++ ++ + + + +diff -aur monodevelop-0.7-orig/Core/src/AddIns/BackendBindings/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml monodevelop-0.7/Core/src/AddIns/BackendBindings/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml +--- monodevelop-0.7-orig/Core/src/AddIns/BackendBindings/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml 2005-05-13 19:13:05.000000000 -0400 ++++ monodevelop-0.7/Core/src/AddIns/BackendBindings/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml 2005-08-29 09:19:21.000000000 -0400 +@@ -27,11 +27,11 @@ + + + +- +- +- +- +- ++ ++ ++ ++ ++ + + + +diff -aur monodevelop-0.7-orig/Extras/BooBinding/templates/BooGtkSharpProject.xpt.xml monodevelop-0.7/Extras/BooBinding/templates/BooGtkSharpProject.xpt.xml +--- monodevelop-0.7-orig/Extras/BooBinding/templates/BooGtkSharpProject.xpt.xml 2005-04-25 21:27:10.000000000 -0400 ++++ monodevelop-0.7/Extras/BooBinding/templates/BooGtkSharpProject.xpt.xml 2005-08-29 09:17:25.000000000 -0400 +@@ -23,7 +23,7 @@ + + + +- ++ + + + =dev-dotnet/gtksourceview-sharp-0.10 + >=dev-dotnet/gecko-sharp-0.10 + >=dev-lang/mono-1.1.4 + >=dev-util/monodoc-1.0 + >=dev-dotnet/gtk-sharp-2.3.90 + >=dev-dotnet/gnomevfs-sharp-2.3.90 + >=dev-dotnet/gnome-sharp-2.3.90 + >=dev-dotnet/gconf-sharp-2.3.90 + >=dev-dotnet/gtkhtml-sharp-2.3.90 + >=dev-dotnet/glade-sharp-2.3.90 + >=sys-devel/automake-1.8 + boo? ( >=dev-lang/boo-0.6.0 ) + java? ( || ( >=dev-dotnet/ikvm-bin-0.14 >=dev-dotnet/ikvm-0.14.0.1-r1 ) )" + +KEYWORDS="~amd64 ~ppc ~x86" +SLOT="0" + +src_unpack() { + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/${P}-gtksharp-update.diff + epatch ${FILESDIR}/${P}-boo-0.6.0-compat.diff +} + +src_compile() { + econf \ + $(use_enable boo) \ + $(use_enable java) \ + --disable-update-mimedb \ + --disable-update-desktopdb \ + || die + emake -j1 || die +} + +src_install () { + # Needed if update-mime-info is run + addwrite ${ROOT}/usr/share/mime + + make DESTDIR=${D} install || die + + # Install documentation. + dodoc ChangeLog README +} + +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + + echo + ewarn "${P} is affected by a bug in gtk-sharp which makes it" + ewarn "crash horribly when loading any project referencing the" + ewarn "gtk-sharp-1.0.x assemblies. If you absolutly need to use" + ewarn "monodevelop to compile such projects, use ${PN}-0.5.x with" + ewarn "mono-1.0.x" + echo +} -- 2.26.2