Re: [evolution-patches] patch to remove libwombat

[Rodrigo Moya <rodrigo ximian com>]

On Mon, 2003-06-30 at 14:49, Dan Winship wrote:
> On Mon, 2003-06-30 at 05:52, Rodrigo Moya wrote:
> > libwombat was created to add an authentication mechanism to the
> > calendar, but has never been used, so these patches removes it.
> 
> You need to remove -lwombat from evolution-calendar.pc.in too
> 
ok, updated patch attached.

> > I don't know if that should go in the 1.4 branch or just only to HEAD?
> 
> Because -lwombat was in evolution-calendar.pc.in, connector ends up
> depending on it, so removing it from evolution would essentially change
> the ABI. Since it's not hurting anything in 1.4, I'd say leave it there.
> 
ok, then, applied to HEAD only.

cheers

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1215
diff -u -p -r1.1215 ChangeLog
--- ChangeLog	25 Jun 2003 20:11:49 -0000	1.1215
+++ ChangeLog	30 Jun 2003 14:30:32 -0000
@@ -1,3 +1,10 @@
+2003-06-30  Rodrigo Moya <rodrigo ximian com>
+
+	* configure.in:
+	* Makefile.am: removed libwombat from the build.
+
+	* evolution-calendar.pc.in: removed -lwombat.
+
 == Version 1.4.1 ==
 
 2003-06-25  Ettore Perazzoli  <ettore ximian com>
Index: evolution-calendar.pc.in
===================================================================
RCS file: /cvs/gnome/evolution/evolution-calendar.pc.in,v
retrieving revision 1.3
diff -u -p -r1.3 evolution-calendar.pc.in
--- evolution-calendar.pc.in	22 May 2003 20:11:16 -0000	1.3
+++ evolution-calendar.pc.in	30 Jun 2003 14:30:32 -0000
@@ -13,5 +13,5 @@ Name: evolution-calendar
 Description: libraries needed for Evolution calendar backends
 Version: @VERSION@
 Requires: libgnome-2.0 libbonobo-2.0 gal-2.0 >= @GAL_REQUIRED@ gnome-vfs-2.0
-Libs: -L${privlibdir} -lpcs -lcal-util -lcal-client -lical-evolution -lwombat -leutil
+Libs: -L${privlibdir} -lpcs -lcal-util -lcal-client -lical-evolution -leutil
 Cflags: -I${privincludedir}
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.591
diff -u -p -r1.591 configure.in
--- configure.in	25 Jun 2003 20:11:49 -0000	1.591
+++ configure.in	30 Jun 2003 14:30:33 -0000
@@ -1362,7 +1362,6 @@ widgets/e-timezone-dialog/Makefile
 widgets/menus/Makefile
 widgets/misc/Makefile
 wombat/Makefile
-libwombat/Makefile
 calendar/Makefile
 calendar/importers/Makefile
 calendar/idl/Makefile
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/Makefile.am,v
retrieving revision 1.81
diff -u -p -r1.81 Makefile.am
--- Makefile.am	12 Jun 2003 21:22:41 -0000	1.81
+++ Makefile.am	30 Jun 2003 14:30:33 -0000
@@ -32,7 +32,6 @@ SUBDIRS = 			\
         shell                   \
 	camel			\
 	filter			\
-	libwombat		\
 	addressbook		\
 	calendar		\
 	my-evolution		\