1 --- g-wrap-1.9.15/configure.ac.orig 2015-07-21 01:23:34.000000000 +0200
2 +++ g-wrap-1.9.15/configure.ac 2022-03-19 09:47:32.034820854 +0100
3 @@ -78,7 +78,7 @@ AC_DEFINE_UNQUOTED(ffi_type_ssize_t, ffi
4 [ffi type for ssize_t])
8 +GUILE_PKG([3.0 2.2 2.0])
11 GUILE_VERSION="`guile-config info guileversion | sed -r 's,\\.[[0-9]]+$,,'`"
12 --- g-wrap-1.9.15/guile/g-wrap/guile-runtime.c.orig 2014-09-22 06:42:47.000000000 +0200
13 +++ g-wrap-1.9.15/guile/g-wrap/guile-runtime.c 2022-03-19 14:09:17.473070527 +0100
14 @@ -179,14 +179,14 @@ gw_guile_add_subr_method (SCM generic, S
15 SCM var = scm_module_lookup (module, class_name);
16 specializers = scm_cons (SCM_VARIABLE_REF (var), specializers);
18 - specializers = scm_cons (scm_class_top, specializers);
19 + specializers = scm_cons (scm_variable_ref (scm_c_lookup ("<top>")), specializers);
21 all_specializers = SCM_CDR (all_specializers);
23 specializers = scm_reverse (specializers);
25 if (use_optional_args)
26 - specializers = scm_append_x (scm_list_2 (specializers, scm_class_top));
27 + specializers = scm_append_x (scm_list_2 (specializers, scm_variable_ref (scm_c_lookup ("<top>"))));
30 for (i = n_req_args; i > 0; i--)
31 @@ -222,7 +222,7 @@ gw_guile_add_subr_method (SCM generic, S
34 meth = scm_apply_0 (SCM_VARIABLE_REF (var_make),
35 - scm_list_5 (scm_class_method,
36 + scm_list_5 (scm_variable_ref (scm_c_lookup ("<method>")),
37 k_specializers, specializers,
39 scm_call_2 (SCM_VARIABLE_REF (var_add_method_x), generic, meth);
40 @@ -352,10 +352,10 @@ allocate_generic_variable (SCM module, S
41 if (scm_is_false (var)) {
42 /* Symbol unbound, make a new generic */
43 generic = scm_apply_0 (SCM_VARIABLE_REF (var_make),
44 - scm_list_3 (scm_class_generic, k_name, sym));
45 + scm_list_3 (scm_variable_ref (scm_c_lookup("<generic>")), k_name, sym));
46 return scm_make_variable (generic);
47 } else if (scm_is_true (scm_call_2 (is_a_p_proc, scm_variable_ref (var),
48 - scm_class_generic))) {
49 + (scm_variable_ref (scm_c_lookup("<generic>")))))) {
50 /* I seem to remember theq is_a_p thing is a hack around GOOPS's deficient
51 macros, but I don't remember. Anyway the existing binding is a generic,
53 @@ -364,7 +364,7 @@ allocate_generic_variable (SCM module, S
54 /* Make a generic that falls back on the original binding. NB: generics also
55 satisfy procedure?. */
56 generic = scm_apply_0 (SCM_VARIABLE_REF (var_make),
57 - scm_list_5 (scm_class_generic,
58 + scm_list_5 ((scm_variable_ref (scm_c_lookup("<generic>"))),
60 k_default, scm_variable_ref (var)));
61 return scm_make_variable (generic);
62 @@ -756,7 +756,8 @@ gw_guile_handle_wrapper_error(GWLangAren
63 scm_misc_error(func_name, error->message, *(SCM *)error->data);
66 - scm_memory_error(func_name);
67 + fprintf (stderr, "FATAL: memory error in %s\n", func_name);
71 scm_error (out_of_range_key,