patch: REQUIRES g-wrap 1.1.5.

[Derek Atkins]

Ok, try these patches to g-wrap.  It not only allows g-wrap 1.1.6 to
compile under RH 6.2 w/ guile 1.3, but the resulting version of g-wrap
also allows GnuCash to compile.  :)

The first one change is a fix to the GW_RETURN_NEWSMOB() macro.  The
second block fixes the call to scm_newsmob(), whose only argument is a
scm_smobfuns * but you were passing in a scm_smobfuns.  There was also
another bug in the spec-file: the g-wrap library got renumbered from
1.0.0 to 2.0.0.

--- libruntime-guile/g-wrap-runtime-guile.c~	Mon Jan 15 22:26:13 2001
+++ libruntime-guile/g-wrap-runtime-guile.c	Mon Jan 15 22:26:01 2001
@@ -44,7 +44,7 @@
 #define GW_RETURN_NEWSMOB(id, data) \
   do { \
     SCM __SCM_smob_answer; \
-    GW_NEWSMOB(__SCM_smob_answer, (tc), (data)); \
+    GW_NEWSMOB(__SCM_smob_answer, (id), (data)); \
        return __SCM_smob_answer; \
   } while (0)
 #else
@@ -298,8 +298,8 @@
         wcp_data_equal_p
       };
 
-      wct_smob_id = scm_newsmob(wct_smob_data);
-      wcp_smob_id = scm_newsmob(wcp_smob_data);
+      wct_smob_id = scm_newsmob(&wct_smob_data);
+      wcp_smob_id = scm_newsmob(&wcp_smob_data);
     }
 #else 
     wct_smob_id = scm_make_smob_type("gw:wct", sizeof(wrapped_c_type_data));

--- rpm/spec.in~	Mon Jan 15 21:57:18 2001
+++ rpm/spec		Mon Jan 15 22:36:06 2001
@@ -57,7 +59,7 @@
 
 %files
 %defattr(-,root,root)
-/usr/lib/libg-wrap-runtime-guile.so.1.0.0
+/usr/lib/libg-wrap-runtime-guile.so.2.0.0
 /usr/share/guile/g-wrap/guile-types.scm
 /usr/share/guile/g-wrap/output-file.scm
 /usr/share/guile/g-wrap/g-translate.scm


-derek

Rob Browning <rlb@cs.utexas.edu> writes:

> Derek Atkins <warlord@MIT.EDU> writes:
> 
> > Ok, I did this..  Now I get linking errors (due to smob issues, I
> > believe):
> 
> Could you try 1.1.6 (same place) ftp.gnucash.org...
> 
> It may fix your problems.  If so, then we'll need to bump the
> requirement in gnucash's configure.in.
> 
> Thanks
> 
> -- 
> Rob Browning <rlb@cs.utexas.edu> PGP=E80E0D04F521A094 532B97F5D64E3930

-- 
       Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
       Member, MIT Student Information Processing Board  (SIPB)
       URL: http://web.mit.edu/warlord/    PP-ASEL-IA     N1NWH
       warlord@MIT.EDU                        PGP key available