[evolution-patches] EDS 1.0 Patch to Require Appropriate Bonobo Version (#55485)

[Rodney Dawes <dobey ximian com>]

This patch adds LIBBONOBO_REQUIRED to the configure.in and pc.in files
that include libbonobo, and requires 2.4.0 or newer. This fixes #55485.

-- dobey

Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/configure.in,v
retrieving revision 1.43
diff -u -r1.43 configure.in
--- configure.in	11 Mar 2004 10:23:19 -0000	1.43
+++ configure.in	12 Mar 2004 18:26:07 -0000
@@ -122,6 +122,10 @@
 	esac
 esac
 
+LIBBONOBO_REQUIRED="2.4.0"
+
+AC_SUBST(LIBBONOBO_REQUIRED)
+
 dnl *******************
 dnl GObject marshalling
 dnl *******************
@@ -176,13 +180,13 @@
 AC_SUBST(E_NAME_CFLAGS)
 AC_SUBST(E_NAME_LIBS)
 
-EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, libxml-2.0 libbonobo-2.0 libgnome-2.0, $THREADS_CFLAGS, $THREADS_LIBS)
+EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, libxml-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0, $THREADS_CFLAGS, $THREADS_LIBS)
 AC_SUBST(E_DATA_SERVER_CFLAGS)
 AC_SUBST(E_DATA_SERVER_LIBS)
 
 dnl --- evolution-addressbook flags
 
-EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gconf-2.0 libbonobo-2.0 libgnome-2.0 gnome-vfs-2.0"
+EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gconf-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0 gnome-vfs-2.0"
 
 EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
 AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -190,7 +194,7 @@
 
 dnl --- evolution-calendar flags
 
-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libxml-2.0 libgnome-2.0 libbonobo-2.0 gnome-vfs-2.0)
+EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libxml-2.0 libgnome-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED gnome-vfs-2.0)
 AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
 AC_SUBST(EVOLUTION_CALENDAR_LIBS)
 
Index: evolution-data-server-1.0.pc.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/evolution-data-server-1.0.pc.in,v
retrieving revision 1.1
diff -u -r1.1 evolution-data-server-1.0.pc.in
--- evolution-data-server-1.0.pc.in	7 Nov 2003 03:05:27 -0000	1.1
+++ evolution-data-server-1.0.pc.in	12 Mar 2004 18:26:07 -0000
@@ -9,4 +9,4 @@
 Name: evolution-data-server
 Description: The evolution data server for the calendar and addressbook
 Version: @VERSION@
-Requires: libgnome-2.0 libbonobo-2.0
\ No newline at end of file
+Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@
Index: ./addressbook/libebook/libebook-1.0.pc.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/libebook-1.0.pc.in,v
retrieving revision 1.2
diff -u -r1.2 libebook-1.0.pc.in
--- ./addressbook/libebook/libebook-1.0.pc.in	5 Nov 2003 22:47:29 -0000	1.2
+++ ./addressbook/libebook/libebook-1.0.pc.in	12 Mar 2004 18:26:07 -0000
@@ -11,6 +11,6 @@
 Name: libebook
 Description: Client library for evolution address books
 Version: @VERSION@
-Requires: libbonobo-2.0 libgnome-2.0 libedataserver-1.0
+Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libedataserver-1.0
 Libs: -L${libdir} -lebook
 Cflags: -I${privincludedir}
Index: ./addressbook/libedata-book/libedata-book-1.0.pc.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/libedata-book/libedata-book-1.0.pc.in,v
retrieving revision 1.3
diff -u -r1.3 libedata-book-1.0.pc.in
--- ./addressbook/libedata-book/libedata-book-1.0.pc.in	6 Nov 2003 01:37:37 -0000	1.3
+++ ./addressbook/libedata-book/libedata-book-1.0.pc.in	12 Mar 2004 18:26:07 -0000
@@ -11,6 +11,6 @@
 Name: libedatabook
 Description: Backend library for evolution address books
 Version: @VERSION@
-Requires: libbonobo-2.0 libgnome-2.0 libedataserver-1.0 libebook-1.0
+Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libedataserver-1.0 libebook-1.0
 Libs: -L${libdir} -ledata-book
 Cflags: -I${privincludedir}
Index: ./calendar/libecal/libecal-1.0.pc.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/libecal-1.0.pc.in,v
retrieving revision 1.4
diff -u -r1.4 libecal-1.0.pc.in
--- ./calendar/libecal/libecal-1.0.pc.in	5 Nov 2003 22:47:32 -0000	1.4
+++ ./calendar/libecal/libecal-1.0.pc.in	12 Mar 2004 18:26:07 -0000
@@ -11,6 +11,6 @@
 Name: libedatacal
 Description: Backend library for evolution calendars
 Version: @VERSION@
-Requires: libgnome-2.0 libbonobo-2.0 libedataserver-1.0
+Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libedataserver-1.0
 Libs: -L${libdir} -lecal
 Cflags: -I${privincludedir}
Index: ./calendar/libedata-cal/libedata-cal-1.0.pc.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libedata-cal/libedata-cal-1.0.pc.in,v
retrieving revision 1.5
diff -u -r1.5 libedata-cal-1.0.pc.in
--- ./calendar/libedata-cal/libedata-cal-1.0.pc.in	6 Nov 2003 00:33:17 -0000	1.5
+++ ./calendar/libedata-cal/libedata-cal-1.0.pc.in	12 Mar 2004 18:26:07 -0000
@@ -11,6 +11,6 @@
 Name: libecal
 Description: Client library for evolution calendars
 Version: @VERSION@
-Requires: libgnome-2.0 libbonobo-2.0 gnome-vfs-2.0 libedataserver-1.0 libecal-1.0
+Requires: libgnome-2.0 libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ gnome-vfs-2.0 libedataserver-1.0 libecal-1.0
 Libs: -L${libdir} -ledata-cal -lecal
 Cflags: -I${privincludedir}
Index: ./libedataserver/libedataserver-1.0.pc.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/libedataserver-1.0.pc.in,v
retrieving revision 1.3
diff -u -r1.3 libedataserver-1.0.pc.in
--- ./libedataserver/libedataserver-1.0.pc.in	3 Feb 2004 17:23:47 -0000	1.3
+++ ./libedataserver/libedataserver-1.0.pc.in	12 Mar 2004 18:26:07 -0000
@@ -11,6 +11,6 @@
 Name: libedataserver
 Description: Utily library for evolution data servers
 Version: @VERSION@
-Requires: libbonobo-2.0 libgnome-2.0 libxml-2.0
+Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libgnome-2.0 libxml-2.0
 Libs: -L${libdir} -ledataserver
 Cflags: -I${privincludedir}