rpms/monodevelop/devel monodevelop-1.9-headbuild.patch, NONE, 1.1 import.log, 1.3, 1.4 monodevelop.spec, 1.37, 1.38

[Paul F. Johnson]

Author: pfj

Update of /cvs/pkgs/rpms/monodevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10857/devel

Modified Files:
	import.log monodevelop.spec 
Added Files:
	monodevelop-1.9-headbuild.patch 
Log Message:

Added patch to build against Mono 2.0 RC 1 (fixes build options)
Rebuild against Mono 2.0 RC 1 


monodevelop-1.9-headbuild.patch:

--- NEW FILE monodevelop-1.9-headbuild.patch ---
--- monodevelop-1.9/src/addins/VersionControl/Diff/Diff.cs	2008-09-09 12:23:03.000000000 +0100
+++ monodevelop-1.9/src/addins/VersionControl/Diff/Diff-new.cs	2008-09-09 12:24:07.000000000 +0100
@@ -612,7 +612,7 @@
 
 		bool IList.IsReadOnly { get { return true; } }
 		
-		object IList.this[int index] { set { throw new InvalidOperationException(); } }
+		object IList.this[int index] { get { throw new InvalidOperationException(); } set { throw new InvalidOperationException(); } }
 
 		int IList.Add(object obj) { throw new InvalidOperationException(); }
 		
--- monodevelop-1.9/src/addins/CSharpBinding/Parser/mcs/mcs/class.cs	2008-06-30 18:34:33.000000000 +0100
+++ monodevelop-1.9/src/addins/CSharpBinding/Parser/mcs/mcs/class-new.cs	2008-09-09 12:21:27.000000000 +0100
@@ -5143,6 +5143,7 @@
 	// Encapsulates most of the Method's state
 	//
 	public class MethodData {
+		static FieldInfo methodbuilder_attrs_field;
 
 		readonly IMethodData method;
 
@@ -5392,10 +5393,25 @@
 				return;
 			}
 
-#if GMCS_SOURCE && !MS_COMPATIBLE
-			builder.SetGenericMethodSignature (
-				flags, method.CallingConventions,
-				method.ReturnType, ParameterTypes);
+#if GMCS_SOURCE
+			//
+			// Generic method has been already defined to resolve method parameters
+			// correctly when they use type parameters
+			//
+			builder.SetParameters (ParameterTypes);
+			builder.SetReturnType (method.ReturnType);
+
+			if (builder.Attributes != flags) {
+				try {
+					if (methodbuilder_attrs_field == null)
+						methodbuilder_attrs_field = typeof (MethodBuilder).GetField ("attrs", BindingFlags.NonPublic | BindingFlags.Instance);
+					methodbuilder_attrs_field.SetValue (builder, flags);
+				} catch {
+					Report.RuntimeMissingSupport (method.Location, "Generic method MethodAttributes");
+				}
+			}
+#else
+			throw new InternalErrorException ();
 #endif
 		}



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	9 Aug 2008 14:26:37 -0000	1.3
+++ import.log	10 Sep 2008 19:35:27 -0000	1.4
@@ -1,3 +1,4 @@
 monodevelop-1_9-1_fc10:HEAD:monodevelop-1.9-1.fc10.src.rpm:1215513265
 monodevelop-1_9-2_fc10:HEAD:monodevelop-1.9-2.fc10.src.rpm:1215687691
 monodevelop-1_9-3_fc10:HEAD:monodevelop-1.9-3.fc10.src.rpm:1218291689
+monodevelop-1_9-6_fc10:HEAD:monodevelop-1.9-6.fc10.src.rpm:1221075263


Index: monodevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- monodevelop.spec	26 Aug 2008 05:11:16 -0000	1.37
+++ monodevelop.spec	10 Sep 2008 19:35:27 -0000	1.38
@@ -11,7 +11,7 @@
 
 Name:           monodevelop
 Version:        1.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -21,12 +21,13 @@
 Patch0:         monodevelop-1.9-libdir.patch
 Patch1:		monodevelop-1.9-use-system-cecil.patch
 Patch2:		monodevelop-1.9-use-system-nunit.patch
+Patch3:		monodevelop-1.9-headbuild.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-addins-devel gtk-sharp2-devel monodoc-devel
 BuildRequires:  gnome-sharp-devel gnome-desktop-sharp-devel mono-nunit-devel
 # for the NUnit add-in
-BuildRequires:  mono-nunit22
+BuildRequires:  mono-nunit22 xulrunner-devel-unstable
 BuildRequires:  autoconf desktop-file-utils intltool
 # MonoDevelop is not xulrunner-ready yet
 #Requires:       gecko-sharp2
@@ -63,6 +64,7 @@
 %patch0 -p1 -b .libdir
 %patch1 -p1 -b .use-system-cecil
 %patch2 -p1 -b .use-system-nunit
+%patch3 -p1 -b .head
 autoconf
 
 # Here is where we replace the LONGCECILSTRING and LONGCECILMDBSTRING
@@ -145,6 +147,10 @@
 
 
 %changelog
+* Tue Sep 09 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-6
+- Added patch to build against 2.0 RC 1
+- rebuild against 2.0 RC 1
+
 * Mon Aug 25 2008 Michel Salim <salimma at fedoraproject.org> - 1.9-5
 - Use system-provided nunit