summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Johanson <latexer@gentoo.org>2005-11-14 02:55:50 +0000
committerPeter Johanson <latexer@gentoo.org>2005-11-14 02:55:50 +0000
commit3b64b34fc0aea597b6d327b61ebe85385a5afcca (patch)
treef96c75890d5d8514a0e3aa63f39d01b39ab35a1c /dev-util
parent1.2.5.1 version bump for bug 112341 (diff)
downloadgentoo-2-3b64b34fc0aea597b6d327b61ebe85385a5afcca.tar.gz
gentoo-2-3b64b34fc0aea597b6d327b61ebe85385a5afcca.tar.bz2
gentoo-2-3b64b34fc0aea597b6d327b61ebe85385a5afcca.zip
Add patch to make ISO-1 C# compliant. Needed for compilation with upcoming mono-1.1.10
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/monodevelop/ChangeLog7
-rw-r--r--dev-util/monodevelop/files/monodevelop-0.8-iso-api-update.diff86
-rw-r--r--dev-util/monodevelop/monodevelop-0.8.ebuild8
3 files changed, 99 insertions, 2 deletions
diff --git a/dev-util/monodevelop/ChangeLog b/dev-util/monodevelop/ChangeLog
index 37181dc03d40..6ac56e8a5099 100644
--- a/dev-util/monodevelop/ChangeLog
+++ b/dev-util/monodevelop/ChangeLog
@@ -1,6 +1,11 @@
# 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.37 2005/10/16 02:21:06 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/ChangeLog,v 1.38 2005/11/14 02:55:50 latexer Exp $
+
+ 14 Nov 2005; Peter Johanson <latexer@gentoo.org>
+ +files/monodevelop-0.8-iso-api-update.diff, monodevelop-0.8.ebuild:
+ Add patch to make ISO-1 C# compliant. Needed for compilation with upcoming
+ mono-1.1.10
*monodevelop-0.8 (16 Oct 2005)
diff --git a/dev-util/monodevelop/files/monodevelop-0.8-iso-api-update.diff b/dev-util/monodevelop/files/monodevelop-0.8-iso-api-update.diff
new file mode 100644
index 000000000000..60cb641448c7
--- /dev/null
+++ b/dev-util/monodevelop/files/monodevelop-0.8-iso-api-update.diff
@@ -0,0 +1,86 @@
+diff -aur monodevelop-0.8-orig/Extras/VersionControl/VersionControl/Subversion.cs monodevelop-0.8/Extras/VersionControl/VersionControl/Subversion.cs
+--- monodevelop-0.8-orig/Extras/VersionControl/VersionControl/Subversion.cs 2005-09-23 13:11:15.000000000 -0700
++++ monodevelop-0.8/Extras/VersionControl/VersionControl/Subversion.cs 2005-11-12 22:54:54.000000000 -0800
+@@ -474,7 +474,7 @@
+ ArrayList statuses;
+ public StatusCollector(ArrayList statuses) { this.statuses = statuses; }
+ public void Func(IntPtr baton, IntPtr path, ref svn_wc_status_t status) {
+- if (status.to__svn_wc_entry_t == IntPtr.Zero)
++ if (status.to_svn_wc_entry_t == IntPtr.Zero)
+ return;
+ string pathstr = Marshal.PtrToStringAnsi(path);
+ statuses.Add(new StatusEnt(status, pathstr));
+@@ -586,18 +586,18 @@
+
+ internal StatusEnt(svn_wc_status_t status, string localpath) {
+ LocalFilePath = localpath;
+- TextStatus = (NodeStatus)status.svn_wc_status_kind__text;
+- PropsStatus = (NodeStatus)status.svn_wc_status_kind__props;
++ TextStatus = (NodeStatus)status.svn_wc_status_kind_text;
++ PropsStatus = (NodeStatus)status.svn_wc_status_kind_props;
+ Locked = status.locked != 0;
+ Copied = status.copied != 0;
+ Switched = status.switched != 0;
+- RemoteTextStatus = (NodeStatus)status.svn_wc_status_kind__text__repo;
+- RemotePropsStatus = (NodeStatus)status.svn_wc_status_kind__props__repo;
++ RemoteTextStatus = (NodeStatus)status.svn_wc_status_kind_text_repo;
++ RemotePropsStatus = (NodeStatus)status.svn_wc_status_kind_props_repo;
+
+- if (status.to__svn_wc_entry_t == IntPtr.Zero)
++ if (status.to_svn_wc_entry_t == IntPtr.Zero)
+ return;
+
+- svn_wc_entry_t ent = (svn_wc_entry_t)Marshal.PtrToStructure(status.to__svn_wc_entry_t, typeof(svn_wc_entry_t));
++ svn_wc_entry_t ent = (svn_wc_entry_t)Marshal.PtrToStructure(status.to_svn_wc_entry_t, typeof(svn_wc_entry_t));
+ Name = ent.name;
+ Revision = ent.revision;
+ Url = ent.url;
+@@ -695,7 +695,7 @@
+ private struct svn_error_t {
+ public int apr_err;
+ public string message;
+- public IntPtr svn_error_t__child;
++ public IntPtr svn_error_t_child;
+ public IntPtr pool;
+ }
+
+@@ -774,14 +774,14 @@
+ }
+
+ internal struct svn_wc_status_t {
+- public IntPtr to__svn_wc_entry_t;
+- public int svn_wc_status_kind__text;
+- public int svn_wc_status_kind__props;
++ public IntPtr to_svn_wc_entry_t;
++ public int svn_wc_status_kind_text;
++ public int svn_wc_status_kind_props;
+ public int locked;
+ public int copied;
+ public int switched;
+- public int svn_wc_status_kind__text__repo;
+- public int svn_wc_status_kind__props__repo;
++ public int svn_wc_status_kind_text_repo;
++ public int svn_wc_status_kind_props_repo;
+ }
+
+ public struct Rev {
+@@ -877,7 +877,7 @@
+ IntPtr ctx, IntPtr pool);
+
+ [DllImport(svnclientlib)] static extern IntPtr svn_client_log (
+- IntPtr apr_array_header_t__targets,
++ IntPtr apr_array_header_t_targets,
+ ref Rev rev_start, ref Rev rev_end,
+ int discover_changed_paths,
+ int strict_node_history,
+@@ -911,8 +911,8 @@
+ int recurse, IntPtr ctx, IntPtr pool);
+
+ [DllImport(svnclientlib)] static extern IntPtr svn_client_commit (
+- ref IntPtr svn_client_commit_info_t__commit_info,
+- IntPtr apr_array_header_t__targets, int nonrecursive,
++ ref IntPtr svn_client_commit_info_t_commit_info,
++ IntPtr apr_array_header_t_targets, int nonrecursive,
+ IntPtr ctx, IntPtr pool);
+ }
+
diff --git a/dev-util/monodevelop/monodevelop-0.8.ebuild b/dev-util/monodevelop/monodevelop-0.8.ebuild
index 9843411f286f..f3a76d1ae776 100644
--- a/dev-util/monodevelop/monodevelop-0.8.ebuild
+++ b/dev-util/monodevelop/monodevelop-0.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-0.8.ebuild,v 1.1 2005/10/16 02:21:06 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-0.8.ebuild,v 1.2 2005/11/14 02:55:50 latexer Exp $
inherit mono eutils fdo-mime
@@ -26,6 +26,12 @@ DEPEND=">=dev-dotnet/gtksourceview-sharp-0.10
KEYWORDS="~amd64 ~ppc ~x86"
SLOT="0"
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/${P}-iso-api-update.diff
+}
+
src_compile() {
econf \
$(use_enable boo) \