Re: modules that need releasing - status ?

[Jens Finke <jens triq net>]

On Wed, 3 Oct 2001, R.I.P. Deaddog wrote:

> On Tue, 2 Oct 2001, Michael Meeks wrote:
>
> >         It seems that a number of the modules that needed re-releasing
> > with the parallel install stuff have in fact been released:
> >
> > >  ORBit stable
> > >  ORBit2
> [......]
>
> ORBit is said to be released (0.5.10), but no tarball on gnome FTP so far.
> It is needed because GConf-1.1.1 fails to compile with ORBit 0.5.8.

No, it's not the problem of ORBit but of GConf. Apply the attached patch
and it should work even with ORBit 0.5.8. This is fixed in CVS and Havoc
said he has released a new 1.1.2 version which includes only this patch,
but I didn't test it out yet.

Regards,

   Jens

-- 
"Wer die Freiheit aufgibt, um Sicherheit zu gewinnen, wird am Ende beides
verlieren." -- Benjamin Franklin

diff -ur orig-GConf-1.1.1/configure.in GConf-1.1.1/configure.in
--- orig-GConf-1.1.1/configure.in	Thu Aug  2 07:08:25 2001
+++ GConf-1.1.1/configure.in	Thu Sep 27 16:04:10 2001
@@ -153,8 +153,12 @@
 AC_SUBST(BDB_LIBS)
 AC_SUBST(BDB_CFLAGS)
 
-AC_PATH_PROG(ORBIT_IDL, orbit-idl, no)
+AC_PATH_PROG(ORBIT_IDL, orbit-idl-2, no)
 AC_SUBST(ORBIT_IDL)
+
+if test x$ORBIT_IDL = xno; then
+  AC_MSG_ERROR([Could not find orbit-idl-2 in your path, should come with ORBit2])
+fi
 
 AC_CHECK_LIB(popt, poptGetArg, POPT_LIBS=-lpopt,
 	[AC_CHECK_HEADER(popt.h, , AC_MSG_ERROR([[
diff -ur orig-GConf-1.1.1/gconf/gconf-internals.c GConf-1.1.1/gconf/gconf-internals.c
--- orig-GConf-1.1.1/gconf/gconf-internals.c	Thu Aug  2 05:51:17 2001
+++ GConf-1.1.1/gconf/gconf-internals.c	Thu Sep 27 16:06:00 2001
@@ -2158,7 +2158,7 @@
           }
         else if (strcmp (id,"IDL:Bonobo/ActivationContext/ParseFailed:1.0") == 0)
           {
-            Bonobo_ActivationContext_ParseFailed* pe = CORBA_exception_value(ev);
+            Bonobo_Activation_ParseFailed* pe = CORBA_exception_value(ev);
             
             if (err)
               *err = gconf_error_new(GCONF_ERROR_OAF_ERROR, _("OAF parse error: %s"), pe->description);