[g-a-devel]Re: gnopernicus build failure

[Bill Haneman <bill haneman sun com>]

On Thu, 2002-10-10 at 13:15, Adi Dascal wrote:
> On Thursday 10 October 2002 14:59, you wrote:
> Yes, but I forgot to change those #undef/#define yestarday and commit again.
> So, mea culpa.
> 
> Please commit. Of course that is acceptabile ;-)

Done; I also remembered to change the version number in gnome-mag's
pkg-config file, so I changed gnopernicus' dependency on gnome-mag to
version 0.9.0.  That way gnopernicus HEAD will complain if the new
version of gnome-mag is not found.

The patch I just committed is attached.

-Bill

> Best regards, 
> Adi
> 
> > Adi:
> >
> > It turns out you were ahead of us here ;-)
> >
> > I see that the necessary diff just exchanges a #define/#undef pair in
> > mag_ctrl.c and mag_ctrl.h.
> >
> > Attached is the patch, should I commit this to HEAD with an appropriate
> > ChangeLog entry?
> >
> > > > This is because we are building gnome-mag from HEAD also; gnopernicus
> > > > needs to change its magnification support a bit.  I can provide a patch
> > > > that at least fixes the build (if that is acceptable).
> > > >
> > > > -Bill
> > >
> > > You're right. Please do.
> > >
> > > Thank you,
> > > Adi

? diff
? new-idl.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnopernicus/ChangeLog,v
retrieving revision 1.53
diff -u -r1.53 ChangeLog
--- ChangeLog	9 Oct 2002 15:57:09 -0000	1.53
+++ ChangeLog	10 Oct 2002 14:40:12 -0000
@@ -1,3 +1,12 @@
+2002-10-10 Bill Haneman <bill haneman sun com>
+
+	* magnifier/libmag/mag_ctrl.c, .h:
+	Changed #undef/#define so that NEW_IDL is defined 
+	instead of OLD_IDL, for compatibility with gnome-mag HEAD.
+
+	* configure.in:
+	Changed required version of gnome-mag to 0.9.0, to match HEAD.
+	
 2002-10-09 Pal Csongor Sprencz <ps baum ro>
     
 	*srconf/libsrconf/libsrconf.h:
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnopernicus/configure.in,v
retrieving revision 1.30
diff -u -r1.30 configure.in
--- configure.in	24 Sep 2002 15:02:18 -0000	1.30
+++ configure.in	10 Oct 2002 14:40:13 -0000
@@ -155,7 +155,7 @@
 LIBGNOMEUI_REQUIRED=1.106.0
 BONOBO_REQUIRED=1.107.0
 GNOME_SPEECH_REQUIRED=0.0.2
-GNOME_MAG_REQUIRED=0.2.0
+GNOME_MAG_REQUIRED=0.9.0
 LINC_REQUIRED=0.1.0
 dnl ***************************************************************************
 dnl *                       Checks for libraries                              *
Index: magnifier/libmag/mag_ctrl.c
===================================================================
RCS file: /cvs/gnome/gnopernicus/magnifier/libmag/mag_ctrl.c,v
retrieving revision 1.7
diff -u -r1.7 mag_ctrl.c
--- magnifier/libmag/mag_ctrl.c	4 Oct 2002 15:34:14 -0000	1.7
+++ magnifier/libmag/mag_ctrl.c	10 Oct 2002 14:40:14 -0000
@@ -2,8 +2,8 @@
 #include <bonobo/bonobo-exception.h>
 #include <bonobo-activation/bonobo-activation.h>
 
-#define OLD_IDL
-#undef NEW_IDL
+#undef OLD_IDL
+#define NEW_IDL
 
 #ifdef OLD_IDL
 
Index: magnifier/libmag/mag_ctrl.h
===================================================================
RCS file: /cvs/gnome/gnopernicus/magnifier/libmag/mag_ctrl.h,v
retrieving revision 1.6
diff -u -r1.6 mag_ctrl.h
--- magnifier/libmag/mag_ctrl.h	4 Oct 2002 15:34:15 -0000	1.6
+++ magnifier/libmag/mag_ctrl.h	10 Oct 2002 14:40:14 -0000
@@ -8,8 +8,8 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#undef NEW_IDL
-#define OLD_IDL
+#define NEW_IDL
+#undef OLD_IDL
 
 
 #ifdef OLD_IDL