GNOME.org
 

Re: PATCH: compilation issues

'allo.

On Wed, 2004-06-16 at 00:37 -0500, Jon Trowbridge wrote:
> On Sun, 2004-06-13 at 00:33 -0500, Kevin Godby wrote:
> > I've attached a patch that should fix most of the compilation issues
> > with cvs dashboard (and mono beta 2).
> 
> Except for the odd remaining hard-wired -r:gconf-sharp, this patch looks
> good.  You should check for gconf-sharp via pkg-config at configure-
> time, just like you do for the other dependencies.
> 
> Also, could you confirm that it all still works w/ beta 3?

Okay, I've updated it to detect gconf-sharp at configure time and it
works for me with mono beta 3.  Can I have a couple others confirm it
works okay for them?  If so, I'll make sure it gets in cvs.

Thanks!


-- 
Kevin Godby <godbyk yahoo com>

Index: configure.in
===================================================================
RCS file: /cvs/gnome/dashboard/configure.in,v
retrieving revision 1.23
diff -u -r1.23 configure.in
--- configure.in	19 May 2004 18:24:56 -0000	1.23
+++ configure.in	17 Jun 2004 02:09:12 -0000
@@ -23,7 +23,12 @@
 fi
 
 GTK_SHARP_REQUIRED_VERSION=0.10
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk-sharp >= $GTK_SHARP_REQUIRED_VERSION)
+PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk-sharp >= $GTK_SHARP_REQUIRED_VERSION \
+				     gnome-sharp gtkhtml-sharp)
+AC_SUBST(BASE_DEPENDENCIES_LIBS)
+
+PKG_CHECK_MODULES(GCONF_SHARP, gconf-sharp)
+AC_SUBST(GCONF_SHARP_LIBS)
 
 BEAGLE_REQUIRED_VERSION=0.0
 PKG_CHECK_MODULES(BEAGLE, beagle-0.0 >= $BEAGLE_REQUIRED_VERSION)
Index: backends/Makefile.am
===================================================================
RCS file: /cvs/gnome/dashboard/backends/Makefile.am,v
retrieving revision 1.77
diff -u -r1.77 Makefile.am
--- backends/Makefile.am	19 May 2004 18:24:56 -0000	1.77
+++ backends/Makefile.am	17 Jun 2004 02:09:13 -0000
@@ -1,6 +1,6 @@
 CSC=mcs -g -warnaserror
 dashboard_exe=../engine/dashboard.exe
-DLLDEPS=-r:glib-sharp -r:gdk-sharp -r:gtkhtml-sharp -r:gtk-sharp -r:gnome-sharp -r:gconf-sharp -r:System.Web -r:$(dashboard_exe) -r:../util/drive/drive.dll -r:../engine/rdf.dll
+DLLDEPS=$(BASE_DEPENDENCIES_LIBS) $(GCONF_SHARP_LIBS) -r:System.Web -r:$(dashboard_exe) -r:../util/drive/drive.dll -r:../engine/rdf.dll
 LIBFLAGS=-target:library -L ../util/webservices $(DLLDEPS)
 EXEFLAGS=$(DLLDEPS)
 
@@ -14,7 +14,7 @@
 	TextChainerBackend.dll
 
 if ENABLE_EVOSHARP
-conditional_backends = EvolutionAddressbookBackend.dll
+#conditional_backends = EvolutionAddressbookBackend.dll
 endif
 
 # These backends may work fine, but we have consciously decided not to
@@ -73,7 +73,7 @@
 	$(CSC) $(LIBFLAGS) -out:BeagleBackend.dll $(srcdir)/BeagleBackend.cs $(top_srcdir)/engine/gnome.cs $(BEAGLE_LIBS)
 
 EvolutionAddressbookBackend.dll: EvolutionAddressbookBackend.cs $(dashboard_exe)
-	$(CSC) $(LIBFLAGS) -out:EvolutionAddressbookBackend.dll $(srcdir)/EvolutionAddressbookBackend.cs -r:glib-sharp $(evosharp_flags)
+	$(CSC) $(LIBFLAGS) -out:EvolutionAddressbookBackend.dll $(srcdir)/EvolutionAddressbookBackend.cs $(evosharp_flags)
 
 HTMLIndexBackend.dll: HTMLIndexBackend.cs $(dashboard_exe)
 	$(CSC) $(LIBFLAGS) -out:HTMLIndexBackend.dll $(srcdir)/HTMLIndexBackend.cs -r:../index/index-manager.dll
@@ -88,7 +88,7 @@
 	$(CSC) $(LIBFLAGS) -out:EvolutionMailBackend.dll $(srcdir)/EvolutionMailBackend.cs -r:../util/evolution/evolution.dll
 
 BugzillaBackend.dll: BugzillaBackend.cs $(dashboard_exe)
-	$(CSC) $(LIBFLAGS) -out:BugzillaBackend.dll $(srcdir)/BugzillaBackend.cs -r:gconf-sharp
+	$(CSC) $(LIBFLAGS) -out:BugzillaBackend.dll $(srcdir)/BugzillaBackend.cs
 
 GoogleBackend.dll: GoogleBackend.cs $(dashboard_exe)
 	$(CSC) $(LIBFLAGS) -out:GoogleBackend.dll $(srcdir)/GoogleBackend.cs -r:../util/webservices/GoogleSearchService.dll
Index: engine/Makefile.am
===================================================================
RCS file: /cvs/gnome/dashboard/engine/Makefile.am,v
retrieving revision 1.48
diff -u -r1.48 Makefile.am
--- engine/Makefile.am	14 May 2004 19:46:33 -0000	1.48
+++ engine/Makefile.am	17 Jun 2004 02:09:13 -0000
@@ -3,11 +3,7 @@
 CSC=mcs -g -warnaserror
 
 ASSEMBLIES =							\
-	-r:gtk-sharp.dll					\
-	-r:gdk-sharp.dll					\
-	-r:gnome-sharp.dll					\
-	-r:gtkhtml-sharp.dll                                    \
-	-r:glib-sharp.dll					\
+	$(BASE_DEPENDENCIES_LIBS)				\
 	-r:System.Web
 
 RESOURCES =                                                  			\
Index: engine/gnome.cs
===================================================================
RCS file: /cvs/gnome/dashboard/engine/gnome.cs,v
retrieving revision 1.8
diff -u -r1.8 gnome.cs
--- engine/gnome.cs	25 Mar 2004 04:17:13 -0000	1.8
+++ engine/gnome.cs	17 Jun 2004 02:09:14 -0000
@@ -160,14 +160,13 @@
 		{
 			Info info;
 			info = gnome_vfs_mime_get_default_application (mime_type);
-			System.Diagnostics.Process e = new System.Diagnostics.Process ();
 			if (info == null)
 			{
 				Console.WriteLine ("Unable to open " + uri);
 				// Can we please stop hard coding Nautilus!?
-				e.Start ("nautilus", "\"" + uri + "\"");
+				System.Diagnostics.Process.Start ("nautilus", "\"" + uri + "\"");
 			} else {
-				e.Start (info.command, "\"" + uri + "\"");
+				System.Diagnostics.Process.Start (info.command, "\"" + uri + "\"");
 			}
 //FIXME:  Memory leak, causes crashes, dunno why...needs fixed
 //			gnome_vfs_mime_application_free (info);
Index: util/evolution/Makefile.am
===================================================================
RCS file: /cvs/gnome/dashboard/util/evolution/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- util/evolution/Makefile.am	14 May 2004 19:46:33 -0000	1.4
+++ util/evolution/Makefile.am	17 Jun 2004 02:09:14 -0000
@@ -1,6 +1,6 @@
 CSC=mcs -g
 
-LIBFLAGS=-target:library -r:glib-sharp.dll -r:gdk-sharp.dll -r:gtk-sharp.dll -r:gnome-sharp.dll
+LIBFLAGS=-target:library $(BASE_DEPENDENCIES_LIBS)
 
 EVO_SOURCES =			\
 	$(srcdir)/camel.cs
Index: util/geo/gazetteer.cs
===================================================================
RCS file: /cvs/gnome/dashboard/util/geo/gazetteer.cs,v
retrieving revision 1.5
diff -u -r1.5 gazetteer.cs
--- util/geo/gazetteer.cs	27 Jul 2003 20:35:44 -0000	1.5
+++ util/geo/gazetteer.cs	17 Jun 2004 02:09:15 -0000
@@ -127,7 +127,7 @@
 			Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly ();
 
 			System.IO.Stream s = assembly.GetManifestResourceStream ("cities.txt.gz");
-			Load (new GZip.GZipInputStream (s));
+			Load (new ICSharpCode.SharpZipLib.GZip.GZipInputStream (s));
 		}
 
 		public void Load (System.IO.Stream s)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]