Fix build with latest guile.

Reported by:	pointhyat via erwin

6 files changed, 126 insertions, 0 deletions

diff --git a/cad/gwave/files/patch-src_guile-compat.h b/cad/gwave/files/patch-src_guile-compat.h
new file mode 100644
index 000000000000..4934278180a9
--- /dev/null
+++ b/cad/gwave/files/patch-src_guile-compat.h
@@ -0,0 +1,13 @@
+--- src/guile-compat.h.orig	2008-03-02 16:22:11.000000000 -0500
++++ src/guile-compat.h	2008-03-02 16:22:22.000000000 -0500
+@@ -33,8 +33,8 @@ extern "C" {
+ #define DEREF_LAST_STACK scm_fluid_ref(SCM_VARIABLE_REF (scm_the_last_stack_fluid_var))
+ 
+ SCM 
+-scm_internal_cwdr_no_unwind (scm_catch_body_t body, void *body_data,
+-			     scm_catch_handler_t handler, void *handler_data,
++scm_internal_cwdr_no_unwind (scm_t_catch_body body, void *body_data,
++			     scm_t_catch_handler handler, void *handler_data,
+ 			     SCM_STACKITEM *stack_start);
+ 
+ SCM make_output_strport(char *fname);
diff --git a/cad/gwave/files/patch-src_rgeval.c b/cad/gwave/files/patch-src_rgeval.c
new file mode 100644
index 000000000000..bf337962a4ff
--- /dev/null
+++ b/cad/gwave/files/patch-src_rgeval.c
@@ -0,0 +1,29 @@
+--- src/rgeval.c.orig	2008-03-02 16:15:23.000000000 -0500
++++ src/rgeval.c	2008-03-02 16:16:35.000000000 -0500
+@@ -26,7 +26,6 @@ remote_guile_eval(char *req, char **outp
+         unsigned char *ret, *output, *error;
+         int rlen, olen, elen;
+         SCM o_port, e_port;
+-        SCM saved_def_e_port;
+         
+         /* Temporarily redirect output and error to string ports. 
+            Note that the port setting functions return the current previous
+@@ -34,10 +33,6 @@ remote_guile_eval(char *req, char **outp
+         o_port = scm_set_current_output_port(make_output_strport(FUNC_NAME));
+         e_port = scm_set_current_error_port(make_output_strport(FUNC_NAME));
+         
+-        /* Workaround for a problem with older Guiles */
+-        saved_def_e_port = scm_def_errp;
+-        scm_def_errp = scm_current_error_port();
+-        
+         /* Evaluate the request expression and free it. */
+         val = scwm_safe_eval_str((char *) req);
+ 
+@@ -48,7 +43,6 @@ remote_guile_eval(char *req, char **outp
+            below for getting the strings back */
+         o_port = scm_set_current_output_port(o_port);
+         e_port = scm_set_current_error_port(e_port);
+-        scm_def_errp = saved_def_e_port;
+         
+         /* Retrieve output and errors */
+ 	if(outp) {
diff --git a/cad/gwave/files/patch-src_scwm_guile.c b/cad/gwave/files/patch-src_scwm_guile.c
new file mode 100644
index 000000000000..102f77a9315a
--- /dev/null
+++ b/cad/gwave/files/patch-src_scwm_guile.c
@@ -0,0 +1,35 @@
+--- src/scwm_guile.c.orig	2008-03-02 16:15:27.000000000 -0500
++++ src/scwm_guile.c	2008-03-02 16:15:35.000000000 -0500
+@@ -78,9 +78,9 @@ scwm_body_apply (void *body_data)
+ struct cwssdr_data
+ {
+   SCM tag;
+-  scm_catch_body_t body;
++  scm_t_catch_body body;
+   void *data;
+-  scm_catch_handler_t handler;
++  scm_t_catch_handler handler;
+ };
+ 
+ static SCM
+@@ -92,9 +92,9 @@ cwssdr_body (void *data)
+ }
+ 
+ SCM
+-scm_internal_stack_cwdr (scm_catch_body_t body,
++scm_internal_stack_cwdr (scm_t_catch_body body,
+ 			 void *body_data,
+-			 scm_catch_handler_t handler,
++			 scm_t_catch_handler handler,
+ 			 void *handler_data,
+ 			 SCM_STACKITEM *stack_item)
+ {
+@@ -336,7 +336,7 @@ scwm_handle_error (void *ARG_IGNORE(data
+ 			   SCM_OPN | SCM_WRTNG,
+ 			   "error-handler");
+ #else
+-  SCM port = scm_def_errp;
++  SCM port = scm_i_cur_errp ();
+ #endif
+ 
+   /* GJB:FIXME:MS: is this a guile compatibility test that can be dropped
diff --git a/cad/gwave/files/patch-src_xsnarf.h b/cad/gwave/files/patch-src_xsnarf.h
new file mode 100644
index 000000000000..b99f769338db
--- /dev/null
+++ b/cad/gwave/files/patch-src_xsnarf.h
@@ -0,0 +1,29 @@
+--- src/xsnarf.h.orig	2008-03-02 16:15:31.000000000 -0500
++++ src/xsnarf.h	2008-03-02 16:15:35.000000000 -0500
+@@ -83,22 +83,22 @@ XSCM_SNARF_DOCS(concept, name, 0, 0, 0, 
+ 
+ #define XSCM_VCELL(c_name, scheme_name, docstring) \
+ XSCM_SNARF_HERE(static SCM c_name) \
+-XSCM_SNARF_INIT(c_name = scm_permanent_object (scm_intern0 (scheme_name)); SCM_SETCDR (c_name, SCM_BOOL_F)); \
++XSCM_SNARF_INIT(c_name = scm_permanent_object (scm_str2symbol (scheme_name)); SCM_SETCDR (c_name, SCM_BOOL_F)); \
+ XSCM_SNARF_DOCS(vcell, scheme_name, 0, 0, 0, 0, docstring)
+ 
+ #define XSCM_GLOBAL_VCELL(c_name, scheme_name, docstring) \
+ XSCM_SNARF_HERE(SCM c_name) \
+-XSCM_SNARF_INIT(c_name = scm_permanent_object (scm_intern0 (scheme_name)); SCM_SETCDR (c_name, SCM_BOOL_F)); \
++XSCM_SNARF_INIT(c_name = scm_permanent_object (scm_str2symbol (scheme_name)); SCM_SETCDR (c_name, SCM_BOOL_F)); \
+ XSCM_SNARF_DOCS(vcell, scheme_name, 0, 0, 0, 0, docstring)
+ 
+ #define XSCM_VCELL_INIT(c_name, scheme_name, init_val, docstring) \
+ XSCM_SNARF_HERE(static SCM c_name) \
+-XSCM_SNARF_INIT(c_name = scm_permanent_object (scm_intern0 (scheme_name)); SCM_SETCDR (c_name, init_val));\
++XSCM_SNARF_INIT(c_name = scm_permanent_object (scm_str2symbol (scheme_name)); SCM_SETCDR (c_name, init_val));\
+ XSCM_SNARF_DOCS(vcell, scheme_name, 0, 0, 0, 0, docstring)
+ 
+ #define XSCM_GLOBAL_VCELL_INIT(c_name, scheme_name, init_val, docstring) \
+ XSCM_SNARF_HERE(SCM c_name) \
+-XSCM_SNARF_INIT(c_name = scm_permanent_object (scm_intern0 (scheme_name)); SCM_SETCDR (c_name, init_val));\
++XSCM_SNARF_INIT(c_name = scm_permanent_object (scm_str2symbol (scheme_name)); SCM_SETCDR (c_name, init_val));\
+ XSCM_SNARF_DOCS(vcell, scheme_name, 0, 0, 0, 0, docstring)
+ 
+ #endif /* GUILE_EXT_H__ */
diff --git a/cad/gwave/files/patch-utilities_doc-split.in b/cad/gwave/files/patch-utilities_doc-split.in
new file mode 100644
index 000000000000..30cc244c5d91
--- /dev/null
+++ b/cad/gwave/files/patch-utilities_doc-split.in
@@ -0,0 +1,10 @@
+--- utilities/doc-split.in.orig	2008-03-02 16:20:02.000000000 -0500
++++ utilities/doc-split.in	2008-03-02 16:20:09.000000000 -0500
+@@ -9,6 +9,7 @@
+ 	     (ice-9 common-list)
+ 	     (ice-9 format)
+ 	     (ice-9 regex)
++	     (ice-9 rdelim)
+ 	     (srfi srfi-13))
+ 
+ ;(display "doc-split running\n")
diff --git a/cad/gwave/files/patch-utilities_gwave-doc-snarf.in b/cad/gwave/files/patch-utilities_gwave-doc-snarf.in
new file mode 100644
index 000000000000..2dde16af49f6
--- /dev/null
+++ b/cad/gwave/files/patch-utilities_gwave-doc-snarf.in
@@ -0,0 +1,10 @@
+--- utilities/gwave-doc-snarf.in.orig	2008-03-02 16:17:12.000000000 -0500
++++ utilities/gwave-doc-snarf.in	2008-03-02 16:17:22.000000000 -0500
+@@ -9,6 +9,7 @@
+ 	     (ice-9 common-list)
+ 	     (ice-9 format)
+ 	     (ice-9 regex)
++	     (ice-9 rdelim)
+ 	     (srfi srfi-13))
+ 
+ (debug-enable 'debug 'backtrace)